# Conflicts:
#	app/assets/javascripts/merge_request_widget.js
#	app/assets/javascripts/notes.js
#	app/assets/javascripts/pipelines/components/stage.js
#	app/assets/javascripts/pipelines/components/stage.vue
#	app/assets/javascripts/project_new.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
#	app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
#	app/assets/javascripts/vue_shared/components/memory_graph.js
#	app/assets/stylesheets/framework/lists.scss
#	app/assets/stylesheets/framework/memory_graph.scss
#	app/assets/stylesheets/pages/merge_requests.scss
#	app/controllers/projects/branches_controller.rb
#	app/controllers/projects/merge_requests_controller.rb
#	app/helpers/merge_requests_helper.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/presenters/merge_request_presenter.rb
#	app/serializers/environment_entity.rb
#	app/serializers/merge_request_basic_entity.rb
#	app/serializers/merge_request_entity.rb
#	app/services/ci/create_pipeline_service.rb
#	app/views/projects/blob/_header.html.haml
#	app/views/projects/merge_requests/_show.html.haml
#	app/views/projects/tree/_tree_content.html.haml
#	app/views/shared/issuable/_sidebar.html.haml
#	app/views/shared/issuable/form/_merge_params.html.haml
#	app/views/shared/issuable/form/_metadata.html.haml
#	config/webpack.config.js
#	db/schema.rb
#	doc/intro/README.md
#	doc/user/project/issues/index.md
#	doc/user/project/issues/issues_functionalities.md
#	features/steps/project/forked_merge_requests.rb
#	features/steps/project/merge_requests.rb
#	features/support/env.rb
#	lib/gitlab/checks/change_access.rb
#	spec/controllers/groups_controller_spec.rb
#	spec/controllers/projects/merge_requests_controller_spec.rb
#	spec/controllers/projects_controller_spec.rb
#	spec/features/merge_requests/closes_issues_spec.rb
#	spec/features/security/project/private_access_spec.rb
#	spec/fixtures/api/schemas/entities/merge_request.json
#	spec/fixtures/api/schemas/entities/merge_request_basic.json
#	spec/helpers/merge_requests_helper_spec.rb
#	spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js
#	spec/presenters/merge_request_presenter_spec.rb
#	spec/serializers/merge_request_entity_spec.rb
#	spec/serializers/pipeline_serializer_spec.rb
[ci skip]

Resolve "Delete `Projects::IssuesController#redirect_old`"

Closes #20517

See merge request !11135

Fix broken test - load correct data

Closes #32074

See merge request !11237

Fix icons path and mappings

See merge request !1862

Use vue file for table pagination component

Closes #31349

See merge request !11210

Spec fix: Add :redis keyword to some specs clear state of trackable attributes

Closes #32041

See merge request !11221

Fix transient job failures relating to "unhandled Promise rejection" in issue boards

Closes #32030

See merge request !11222

CE upstream

Closes omnibus-gitlab#2234 and gitlab-ce#31271

See merge request !1837

Adds left connector class to the rendered graph

Closes #31053

See merge request !11179

Fix test failure in job vue componenFix test failure in job vue componentt

Closes #32021

See merge request !11208

Make tree, blob and blame pages more consistent

See merge request !11194

This reverts commit 8785aa64.

This reverts commit 73f448e5.

Add German translation for Cycle Analytics

See merge request !11161

The specs that rely on a correct value of the trackable attributes, should
include the `:redis` keyword in the spec to ensure the state is reset between
various specs.

The trackable attributes being:

- sign_in_count      : Increased every time a sign in is made (by form, openid, oauth)
- current_sign_in_at : A timestamp updated when the user signs in
- last_sign_in_at    : Holds the timestamp of the previous sign in
- current_sign_in_ip : The remote ip updated when the user sign in
- last_sign_in_ip    : Holds the remote ip of the previous sign in

The limiting of writing trackable attributes was introduced in
gitlab-org/gitlab-ce!11053.

Fix OpenID spec failure that assumed current_sign_in_at would be set

Closes #32041

See merge request !11219

Due to 6a915d6f, the `current_sign_in_at` may not actually be set due
to an ExclusiveLease in other jobs. To fix this spec, manually set
the value in the setup.

Closes #32041

Remove needless bind and indexOf polyfills

See merge request !11187

Kubernetes Helm Chart Install docs

See merge request !11139

Fix Timecop not unfreezing after spec

Closes #2362

See merge request !1847

Make pipeline widget padding consistent between MR and commit pages

See merge request !11193

Remove unused CSS and view

See merge request !11190

Add screenshots to Triggered Build docs

See merge request !11211

Fix links in code review docs

See merge request !11207

Remove CI/CD models directory from `eager_load_paths`

Closes #31841

See merge request !11129

Don't use DiffCollection for deltas

See merge request !11201

Add Prometheus memory sparkline to MR widget

Closes #26944

See merge request !11209