# Conflicts:
#	app/assets/javascripts/boards/boards_bundle.js
#	app/assets/javascripts/boards/filtered_search_boards.js
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/environments/stores/environments_store.js
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	app/controllers/autocomplete_controller.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/services/ci/create_pipeline_service.rb
#	app/services/git_push_service.rb
#	app/services/git_tag_push_service.rb
#	app/views/projects/jobs/_sidebar.html.haml
#	app/views/projects/jobs/show.html.haml
#	db/schema.rb
#	doc/api/projects.md
#	lib/gitlab/etag_caching/router.rb
#	lib/gitlab/utils.rb
#	spec/controllers/autocomplete_controller_spec.rb
#	spec/features/issues/form_spec.rb
#	spec/features/projects/jobs_spec.rb
#	spec/javascripts/environments/environments_store_spec.js
#	spec/lib/gitlab/utils_spec.rb
#	spec/services/git_push_service_spec.rb
#	spec/support/test_env.rb
[ci skip]

Update GITLAB_SHELL_VERSION

See merge request !11835

fix IE11 error from sentry

Closes #32538

See merge request !11586

Show current user immediately in issuable filters

Closes #22921

See merge request !11630

MR approval placeholders same size as images

Closes #2491

See merge request !2007

Add new Rake task to simplify the compilation of PO files

See merge request !11864

Document how to create a migration for the Geo tracking DB

[ci skip]

See merge request !1994

Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`

See merge request !11772

CE Upstream - Monday

Closes gitlab-ce#32888 and gitlab-ce#32801

See merge request !1997

Fix GeoRepositorySyncWorker spec

See merge request !2005

Realtime env list

Closes #31701

See merge request !11333

Fix race condition between pipeline creation and MR diff_head_sha update

Closes #33219

See merge request !11859

Ee fix kubernetes namespace

See merge request !2014

Create a push rule to check branch name

Closes #2293

See merge request !1896

Maintain notes avatar at smaller breakpoint

Closes #32985

See merge request !11841

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Add fog-aliyun as backup storage provider

See merge request !11849

Add username parameter to gravatar URL

Closes #24472

See merge request !11741

Implementation for protected variables

Closes #24196

See merge request !11688

Resolve "Improve Container Registry description"

Closes #30651

See merge request !11816

Fix replying to a commit discussion displayed in the context of an MR

Closes #33201

See merge request !11847

Fix title of discussion jump button at top of page

See merge request !11768

It was broken, because we introduced a default namespace, which was not used by terminal methods.

Fix data inconsistency issue for old artifacts by moving them to a currently used path

Closes #32036

See merge request !11824

Update session cookie key name to be unique to instance in development

Closes #31644

See merge request !11839

When a new deployment is created, this will trigger the invalidation on
the etag cache on the environment. This flow is now explicitly tested.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Update diff discussion position per discussion instead of per note

Closes #33157

See merge request !11833