# Conflicts:
#	app/assets/stylesheets/pages/profile.scss

[ci skip]

CE upstream - 2018-08-07 18:21 UTC

Closes gitlab-org/quality/nightly#6 and gitlab-org/quality/team-tasks#36

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

Update Issue boards and API docs regarding milestone and assignee lists

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

Porting MR Vue Memory Fixes to current master

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

Sync mr_widget_options.vue to show test reports in mr widget. Fix redandant issue items from issues_list.vue

Resolve "Group dashboard > Line height is too tall for group names"

Closes #46703 and #50064

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

Keep project CI/CD settings sections expanded after submitting form

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

Merge branch '6766-performance-mr-widget-is-expandable-even-when-there-are-no-changes' into 'master'

Resolve "Performance MR widget is expandable even when there are no changes"

Closes #6766

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

Usage data for security products

Closes #5621

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

Don't set gon variables in JSON requests

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

Resolve "Mirroring interface improvements"

Closes #3959

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

Restyle status message input on profile settings

Closes #49645

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

Restyle status message input on profile settings (EE-port)

Closes gitlab-ce#49645

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

Enable verbose query logging

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

(cherry picked from commit 497593e297c1ed4708ff7e5faf2d90a37d8b2be9)

Conflicts:
	app/assets/stylesheets/pages/profile.scss

Merge branch '44127-board-label-edit-drop-down-is-showing-incorrect-selected-labels-summary' into 'master'

Resolve "Board label edit drop down is showing incorrect selected labels summary"

Closes #44127

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

Fix UI error whereby prometheus application status is updated

Closes #47154

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

Regenerated via `bundle exec rake gettext:regenerate`

Fix missing and duplicates on project milestone listing page

Closes #37078

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