CE upstream - 2018-08-10 15:22 UTC

See merge request gitlab-org/gitlab-ee!6871

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

ee-49807 consolidate sass variables

See merge request gitlab-org/gitlab-ee!6862

Merge branch 'ee-47752-buttons-on-new-file-page-wrap-outside-of-container-for-long-branch-names' into 'master'

Resolve "Buttons on new file page wrap outside of container for long branch names" - EE

See merge request gitlab-org/gitlab-ee!6811

Add correct styling for .card

See merge request gitlab-org/gitlab-ee!6849

# Conflicts:
#	app/assets/javascripts/reports/components/issues_list.vue
#	app/assets/javascripts/reports/components/report_issues.vue
#	app/models/project_services/hipchat_service.rb
#	app/serializers/environment_entity.rb
#	app/services/ci/enqueue_build_service.rb
#	app/views/projects/mirrors/_instructions.html.haml
#	app/views/projects/mirrors/_mirror_repos.html.haml
#	app/views/projects/mirrors/_mirror_repos_form.html.haml
#	locale/gitlab.pot

[ci skip]

Reduce differences between CE and EE code base in reports components

See merge request gitlab-org/gitlab-ce!21128

EE port of Reduce differences between CE and EE code base in reports components

See merge request gitlab-org/gitlab-ee!6867

CE upstream - 2018-08-10 03:21 UTC

Closes gitlab-development-kit#387

See merge request gitlab-org/gitlab-ee!6863

CE Port of Protected Environments backend

See merge request gitlab-org/gitlab-ce!20859

Resolve "CI: cancel/skip a job in "created" state using a button"

Closes #48320

See merge request gitlab-org/gitlab-ce!20635

Port _mirror_repos_form.html.haml changes

See merge request gitlab-org/gitlab-ee!6855

port "Resolve "Mirroring interface improvements""

See merge request gitlab-org/gitlab-ce!20837

Resolve "GFM : provide 'project' reference in comment"

Closes #28930

See merge request gitlab-org/gitlab-ce!20285

Use `create` instead of build stubbed

Closes #7144

See merge request gitlab-org/gitlab-ee!6868

Protected Environments - Backend

See merge request gitlab-org/gitlab-ee!6672

This avoids issues when mixing stubbed models with real models.

docs: removed duplicate `git_ssh_url` field from build event example

See merge request gitlab-org/gitlab-ce!21123

Enable frozen string in rest of app/models/**/*.rb

See merge request gitlab-org/gitlab-ce!21129

Rails5 fix specs duplicate key value violates unique constraint…

See merge request gitlab-org/gitlab-ce!21119

Rails5 fix AddMilestoneToLists migration rollback deleting wrong foreign key

See merge request gitlab-org/gitlab-ee!6865