# Conflicts:
#	app/services/ci/create_pipeline_service.rb
#	lib/gitlab/shell.rb
#	spec/javascripts/notes/components/issue_comment_form_spec.js
#	spec/services/projects/count_service_spec.rb

[ci skip]

Show status of issuable links in wiki pages

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

issue note component rename

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

issue note component rename

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

Move SingleRepositoryWorker#fsck into Gitlab::Git::Repository

Closes gitaly#802

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

Elastic search support for 6.0 in the future

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

Use commit finder instead of rev parse

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

Port from CE: Optimize API /groups/:id/projects by preloading assocations

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

Optimize API /groups/:id/projects by preloading assocations

Closes #40308

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

Resolve "Upgrade Rails to 4.2.10"

Closes #40691

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

CE upstream - Thursday

Closes gitlab-ce#40671

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

Fix the fork project functionality for projects with hashed storage (EE)

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

Adds option for new project to only import protected branches

Closes #3844

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

Add notice to Gollum initializer

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

Update parser gem to remove warning about wrong ruby version

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

Remove db/fixtures/test/01_admin.rb (EE backport)

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

Port of EE translations

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

New Crowdin translations

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

Resolve "Email notifications not sent as expected"

Closes #38862

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

This backport a change made in the CE upstream MR, see
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3593Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix typo in Elasticsearch

Closes #40770

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

Port to EE: Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector.

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

For a user with the mention notification level set, the type of their
corresponding NotificationRecipient must be :mention for them to receive an
email.

We set this correctly on notes, but we weren't adding it on new issues or MRs -
perhaps because these users are also participants. But the type of the
NotificationRecipient in that case would be :participant, not mention, so we
have to add the mentioned users manually when creating an issue or MR.

When editing an issue or MR, and there are newly-mentioned users to email, we
still use the :new_issue and :new_merge_request actions, so this works for that
case as well.

Fix the fork project functionality for projects with hashed storage

Closes #40711

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

See
https://gitlab.com/gitlab-org/gitlab-ce/commit/53da3d976f3705a87edc50dca41748b5e479fc83
and https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/43012757Signed-off-by: Rémy Coutable <remy@rymai.me>

Add version that the mermaid support was introduced

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

Instead of using the factories. Since the factories might be using
columns that aren't available in the schema at version the particular
spec is running in.