small change to make less conflict with EE version

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

Resolve merge conflicts with dev.gitlab.org/master after security release

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

Remove allocation tracking code from InfluxDB sampler for performance

Closes gitlab-com/infrastructure#3250

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

Remove issues.assignee_id column

Closes #30453

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

Bugfix: User can't change the access level of an access requester

Closes #40743

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

Properly bump prometheus-client-mmap gem versions

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

The endpoint was returning 404 because it was only searching on the
current members of a Group or Project and not the access requesters.

This migration also needs to be a post-deployment migration, as it removes a
column.

Remove a header level in the new 'Automatic CE->EE merge' doc

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

Keep track of the circuit breaker access check timings

Closes #39698

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

Do not raise when downstream pipeline is created

Closes #40987

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

Pick 10.2.4 security fixes into master

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

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

Add recaptcha_check_if_spammable for issualbes than arent spammables

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

Using update_column_in_batches means that we can chunk the updates.

Todo count calculations now expired quicker for top bar stats

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

Turn" push a file" into a scenario

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

Fix image view mode

Closes #40945

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

Convert Compare and CompareAutocomplete classes into ES module syntax

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

Fix gitlab:import:repos Rake task moving repositories into the wrong location

Closes #40765

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

On GitLab.com, InfluxSampler#sample_objects appears to take 1.2 s or so to
iterate through 1059 objects. This had led to delays of a couple hundred
milliseconds in processing in the main thread. Remove this code since it's not
really being used.

Closes gitlab-com/infrastructure#3250

Only the Gemfile.lock was updated before.

If the source import directory were different from the destination directory,
GitLab would first create a blank repository and then erroneously move the
original one into a subdirectory. Adding an import type prevents this the project
from being initialized in the first place. It was accidentally removed in
1f917cbd49.

Closes #40765

prevent potential XSS when editing comment

See merge request gitlab/gitlabhq!2238

(cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c)

7480e462 prevent potential XSS when editing comment

Prevent creating issues through API without having permissions

See merge request gitlab/gitlabhq!2225

(cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c)

915b97c5 Prevent creating issues through API without having permissions