# Conflicts:
#	app/assets/javascripts/notes/components/noteable_discussion.vue
#	app/views/layouts/nav/sidebar/_project.html.haml
#	app/workers/stuck_import_jobs_worker.rb
#	doc/user/project/clusters/index.md
#	locale/gitlab.pot
#	spec/serializers/issue_serializer_spec.rb

[ci skip]

CE upstream - 2018-11-07 21:57 UTC

Closes gitlab-ce#52649, gitlab-ce#52639, gitlab-ce#48956, #6070, gitlab-ce#51737, omnibus-gitlab#3872, gitlab-runner#3515, gitlab-org/quality/nightly#32, and #8234

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

Revert "Extract code into IssueBoardEntity"

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

Parameter per_page added

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

Typo fix stoping -> stopping in the CI README.md

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

This reverts commit 8c126525.

This reverts commit 8c126525.

This reverts commit 060ce28e.

We use `if` in the serializer because weights is an EE only feature.

Add specs in addition to the feature spec to make we return weight in
the JSON response.

Adds documentation for the Group Security Dashboard

Closes #7954

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

Add documentation for gitlab:packages:migrate task

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

Allow to override the gitlab-qa ref for the downstream trigger

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

Remove GitLab UI file to match CE

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

Update related issues title typography

Closes #8323

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

Merge branch '8343-dismissed-state-not-correctly-set-in-vulnerability-modal-on-group-security-dashboard' into 'master'

Resolve "Dismissed state not correctly set in Vulnerability modal on Group Security Dashboard"

Closes #8343

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

Fix broken link

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

Remove duplicate primary button in dashboard snippets

Closes #53706

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

Replaces tooltip directive with gl-tooltip directive

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

where GSD is the group security dashbaord

Update GitLab-Workhorse to 7.1.0

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

Stop multiple discussion requests

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

Limit parallel to 50

Closes #53711

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

Resolve "Follow-up from "Resolve "Redesign activity feed"""

Closes #53640

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

Update license list

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

Update GitLab-Workhorse to 7.1.0

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

Run rake gitlab:update_templates

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

Regenerate Gitaly's config.toml each rspec run

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

Regenerate Gitaly's config.toml each rspec run

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