# Conflicts:
#	app/assets/javascripts/main.js
#	app/assets/javascripts/project.js
#	app/assets/javascripts/repo/lib/editor_options.js
#	app/helpers/button_helper.rb
#	app/models/environment.rb
#	spec/javascripts/repo/lib/editor_options_spec.js
#	spec/javascripts/repo/lib/editor_spec.js
#	spec/models/project_spec.rb

[ci skip]

Add link to Gitaly conversion

[ci skip]

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

Use `push` web hook events for pull mirroring

Closes #3821

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

CE upstream - Wednesday

Closes gitaly#730, gitaly#656, gitlab-ce#38962, gitlab-ce#40373 et gitlab-ce#40534

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

This endpoint still has to be migrated, and this comment makes sure
everyone knows we are aware of this one.

[ci skip]

EE port of multi-file-editor-dirty-diff-indicator

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

Update google.md to reflect changes in the new Google APIs Library

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

Pin seed-fu to 2.3.6 since 2.3.7 is broken and add a fixture file that uses seed-fu in the test env

Closes #40690

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

Fix broadcast message not showing up on login page

Closes #13634

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

Set an artificial $HOME for gitaly in test

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

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

See https://gitlab.com/gitlab-org/gitlab-ce/issues/40690 and
https://github.com/mbleigh/seed-fu/issues/123 for details.
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>

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

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

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

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

Multi-file editor dirty diff indicator

Closes #40046

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

Update installation.md with receive.advertisePushOptions

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

fix for special charecter in file names

Closes #40146

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

Count the commits directly

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

Handle outdated replicas in the DB load balancer

Closes #2197

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

Only load branch names for protected branch checks

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

EE counterpart for Resolve "Clone dropdown should not have a tooltip"

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

Resolve "Clone dropdown should not have a tooltip"

Closes #39455

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

Remove blank/empty flash messages caused by nil

Closes #40671

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

EE port of multi-file-editor-css-fixes

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

Port of "Refactor 'copy_to_clipboard.js'" to EE

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

Refactor 'copy-to-clipboard.js'

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

fix icon colors in commit list

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40671

See
https://gitlab.com/gitlab-org/gitlab-ce/blob/f7254a4060b30e3134c6cf932eaba0fc8e249e9a/app/controllers/sessions_controller.rb#L42
for an example of where we set `flash[:notice] = nil`