# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb

Update QA Nokogiri to 1.8.1

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

Resolve "Prometheus graphs occasionally have incorrect Y scale"

Closes #38789

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

Resolves three security advisories from bundle-audit

Remove 'Repo' prefix from API entities

Closes #28417

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

Resolve "Hover and legend data should be linked"

Closes #38036

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

[ci skip]

Merge branch '37111-monitoring-graph-empty-states-are-gigantic-on-screen-sm-viewport-sizes' into 'master'

Resolve "Monitoring graph empty states are gigantic on `screen-sm` viewport sizes"

Closes #37111

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

Clarify where the artifacts metadata .gz is generated

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

Fix inconsistent use of sentence case

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

Fix username and ID not logging in production_json.log for Git activity

Closes gitlab-ee#3611

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

improve merge request widget status icon UX

Closes #37229

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

[ci skip]

Cleanup Select2 dropdown styles

Closes #37279

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

Makes `@mentions links` have a different styling for better separation

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

Devise sets `current_user`, but not all controllers authenticate users by
session tokens. Try to use the controller-defined `authenticated_user` if
`current_user` is not available.

Closes gitlab-org/gitlab-ee#3611

Update unf_ext from 0.0.7.2 to 0.0.7.4 (#38368)

Closes #38368

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

Add link to OpenID Connect documentation

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

Adjusts tag link to avoid underlining spaces

Closes #38122

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

Sidekiq::MemoryKiller: Add missing space in log message

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

explain target_project_id vs project_id

Closes #38539

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

Fix edit project service cancel button position

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

Cleanup the fork layout

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

Fix the default branches sorting to actually be 'Last updated'

Closes #26890

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

Update images

Closes #38487

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

Include RevList error messages in exceptions

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

Let fetch_ref pull from Gitaly instead of from disk

Closes gitaly#585

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

Add missing exception variable

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

Use a UNION ALL for getting merge request notes

Closes #38508

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