# Conflicts:
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/job_details_bundle.js
#	app/assets/javascripts/jobs/store/getters.js
#	app/views/projects/_import_project_pane.html.haml
#	app/views/projects/_new_project_fields.html.haml
#	app/views/projects/jobs/show.html.haml
#	app/views/projects/project_templates/_built_in_templates.html.haml
#	app/views/shared/_visibility_radios.html.haml
#	config/routes/project.rb
#	config/routes/user.rb
#	lib/api/commits.rb
#	locale/gitlab.pot
#	spec/javascripts/jobs/components/job_app_spec.js

[ci skip]

Instance Configuration page now displays correct SSH fingerprints

Closes #40636

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

Show percentage of language detection on the language bar

Closes #51457

See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22056

Fix todo cops

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

Simplify runner registration token resetting

Closes #41922

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

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

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

Adds MR reference in job sidebar

Closes #52191

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

Remove :rbac_clusters feature flag

Closes #51009

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

Resolve "Persist Prometheus alert events"

Closes #7756

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

Add pipeline.default_branch? mehod

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

A change in CE added another open MR to this project.

These can be triggered by project creation in the setup phase if a spec uses the
RequestStore, but we really don't care about that - it's not an N+1, it's just
several projects being created!

This isn't called from anywhere.

In the refactor the `!` reference was missed
This commit adds it back and adds coverage for it.

Resolve "Add status message from within user menu"

Closes #51393 and #49075

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

Docs lock/unlock quick action

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

Create labels_as_hash_ concern

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

Port of create labels_as_hash_ concern, modify params for method

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

docs: moving repositories cleanup

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

[ci skip]

Update environment item empty state

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

[ci skip]

[ci skip]

Resolve "Add new "Overview" tab on user profile page"

Closes #49801

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

(EE Port) Adds overview tab to user profile page

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

Update stop_review job to handle script located in a subdirectory

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

Fix MR discussion not loaded issue

Closes #51958

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

Includes commit stats in POST project commits API

Closes #51803

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

This icommit adds several changes related to the same topic
- resetting a Runner registration token:

1. On Project settings page it adds a button for resetting the
   registration token and it removes the Runner token field
   that was confusing all GitLab users.

2. On Group settings page it adds the same button for resetting
   the registration token.

3. On Admin Runners settings page it moves the button to the same
   place as in Project and Group settings and it changes slightly
   the page layout to make it more similar to Group and Project
   setting pages.

4. It refactorizes a little the partial that prints runner
   registration description. Thanks to this Project, Group
   and Admin settings of the Runner are re-using the same
   code to generate the button.

5. Updates the translations of changed text.

Helps to know if the pipeline ref matches  the project's default branch

Display helpful feedback when proxying an SSH git push to secondary request

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

Now that Auto DevOps can run in a RBAC enabled cluster from
https://gitlab.com/gitlab-org/gitlab-ce/issues/51942, we can now remove
the FF.

As the flag only governed if UI elements would appear or not when
creating/adding existing clusters; the effect of removing the FF would
be that the checkbox to choose to enable RBAC clusters will now always
appear.

Remove FF stubs from specs

Improve spec context names