Fix for copy paste formatted text
Add merged mrs list to milestone page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'milestone-merged-mr-list' into 'master'

Milestone merged mr list

Part of #1207
Move gitlab-ssl nginx config from gitlab-recipes
Merge branch 'gitlab-ssl-nginx' into 'master'

Move nginx ssl config from gitlab recipes

I removed references to puma and did a minor cleanup :)

Also updated the README in gitlab-recipes to point here. Once this gets merged I'll remove it from there.
Merge pull request #7081 from cirosantilli/conflict-artifact

Remove conflict artifact.
Add GroupFinder for collection all groups user has access to

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Refactor some search scopes to prevent wierd behaviour and PG::Error issues

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Revert "Fix for failing specs"

This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock
Merge branch 'improve-projects-collecting' into 'master'

Improve projects collecting

Refactor code that cause unexpected AR behaviour.

For example this works fine:

    @projects = Project.personal(@user).accessible_to(current_user)
    @groups = @user.groups.accessible_to(current_user) # OK

But

    @projects = Project.all
    @groups = @user.groups.accessible_to(current_user) # PG:Error
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Merge pull request #7086 from jvanbaarsen/revert-rspec-fix

Revert "Fix for failing specs"
Merge pull request #7075 from jvanbaarsen/split-spinach-tests

Splitted the Spinach tests to prevent time-outs
Gemfile fix

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Merge pull request #7087 from jvanbaarsen/gemfilefix

Gemfile fix
API: ability to set an import url when creating project for a specified user
update API docs
fix permissions for files API
Revert "Gemfile fix"

This reverts commit 9bca8ae8f2feefe42acbdb61004ff5c3ec2a8a65.