# Conflicts:
#	app/assets/javascripts/init_legacy_filters.js
#	app/assets/javascripts/milestone_select.js
#	app/models/project_team.rb
#	doc/user/project/quick_actions.md
#	features/steps/shared/project.rb
#	qa/qa/page/menu/admin.rb
#	spec/controllers/projects/imports_controller_spec.rb
#	spec/features/issues/form_spec.rb
#	spec/features/merge_requests/edit_mr_spec.rb
#	spec/lib/gitlab/reference_extractor_spec.rb
#	spec/requests/api/issues_spec.rb
#	spec/services/git_push_service_spec.rb
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]

Skip projects filter on issues search

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

Gitaly conflict resolver

Closes gitaly#813

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

EE: QA: Add a scenario for adding a deploy key

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

Resolve "Modify the empty state of changes in MR"

Closes #41357

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

Remove unnecessary sidebar element realignment

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

Add break word wrapping to well-list

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

- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly

Fix activity inline event line height on mobile

Closes #38778

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

Update LICENSE to clean up formatting

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

Include the Namespace Id in purchase link for GL.com plans

Closes gitlab-com/customers-gitlab-com#227

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

Backport part of EE's "Remove EE-specific code from `POST /api/v4/projects/:id/members`"

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

Resolve "Add wiki total/synced/failed to prometheus metrics"

Closes #4414

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

Allow logged in user to change his password

Closes gitlab-ee#3482

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

Add documents for GitLab utilities

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

CE upstream - Saturday

Closes gitlab-ce#36970 and gitlab-qa#122

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

[ci skip]

Adjust content width for User Settings, Pipeline quota

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

[ci skip]

[ci skip]

Fix user membership destroy relation

Closes #40053

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

QA: Add a scenario for adding a deploy key

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

Ignore "lost+found" folder during backup on a volume

Closes #22672 and #17574

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

Update prometheus gem to version that publishes +Inf bucket in accordance with Prometheus docs.

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

Forking a project to a namespace with lower visibility

Closes #40022

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

* qa-add-deploy-key:
  Use heredoc so it's more clear
  Put all menus under menu module
  Introduce common project settings and just put
  Introduce Factory::Resource::DeployKey
  Introduce expand_deploy_keys
  Introduce Menu::Side
  Just add a new class to locate the expand button
  Update descriptions and names based on feedback
  Rename DeployKey to DeployKeys
  QA: Add a scenario for adding a deploy key