# Conflicts:
#	app/views/projects/blob/_editor.html.haml
#	changelogs/unreleased/50126-blocked-user-card.yml

[ci skip]

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

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

fix design artifact label to be product discovery. Was done here…

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

Bugs and regression triage and prioritization process

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

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

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

Reorganize variables.scss, Part 1

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

ee-49807 consolidate sass variables

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

Resolve "Add missing i18n strings to issue boards."

Closes #50063

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

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

Merge branch '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"

Closes #47752

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

Resolve "Group Overview list items layout regression"

Closes #50176

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

Add frozen_string_literal to recently-added files from the community

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

Resolve "Consider enforcing the use of the new Ruby safe navigation operator (aka `&.`)"

Closes #27884

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

Resolve ""Block user" section in admin area has wrong styling"

Closes #50126

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

Add correct styling for .card

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

Resolve "Clarify `List user projects` API Endpoint"

Closes #50174

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

# 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]

Signed-off-by: Rémy Coutable <remy@rymai.me>

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

fix design artifact label to be product discovery. Was done here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20862 but not merged before this was moved.

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