CE upstream - Tuesday

Closes gitaly#915

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

Resolve "Icons on forks page are to big"

Closes #42046

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

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

Update auto-deployed prometheus scrape config

Closes #41796

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

Small clarification to setting up the database password

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

Resolve "Cannot search with keyword "merge""

Closes #41666

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

Refactor of buttons _dropdown partial

Closes #41921

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

Fix typo in doc_styleguide.md

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

Change user settings column width

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

Fix top-area inconsistent capitalization

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

[ci skip]

# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/models/ci/pipeline.rb

[ci skip]

CE upstream - Monday

Closes gitaly#907

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

Geo Logger should use the same log level defined in Rails

Closes #4497

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

Resolve "Enable Project Milestone Deletion via the API"

Closes #41476

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

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

Enables project milestone deletion via DELETE /projects/:id/milestones/:milestone_id

Fix error on changes tab when merge request cannot be created

Closes #41460

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

EE port of dispatcher-milestones

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

Added imports for milestone dispatcher routes

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

Merge branch '42074-rspec-spec-lib-gitlab-background_migration-deserialize_merge_request_diffs_and_commits_spec-rb-spec-services-system_note_service_spec-rb-fails' into 'master'

Resolve "rspec spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb spec/services/system_note_service_spec.rb fails"

Closes #42074

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

We should use this limit everywhere, but especially in project search results,
where we could be highlighting very long single lines. (Typical examples:
minified JavaScript, and JSON data files.)

A file containing /:\d+:/ in its contents would break the search results if
those contents were part of the results, because we were splitting on colons,
which can't work with untrusted input.

Changing to use the null byte as a separator is much safer.

Fixed merge request status badge not updating after merging

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

EE projects tree tags dispatcher refactor

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

Add system notes when moving issues between epics

Closes #4261

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

Migrate Commit#uri_type to Gitaly

Closes gitaly#915

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

Resolve "Error while searching for text starting with slash "/""

Closes #36571

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

Update 'removed assignee' note to include old assignee reference

Closes #30101

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

Merge branch '41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runner' into 'master'

Include updated AutoDevOps template with Browser Performance using DinD

Closes #41809

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

If the schema changes after 20171114162227 for any of these models, and specs
after this one use factories, then those factories will use the models with
outdated column information cached.

We shouldn't really use factories in migration specs, but this is a special case
because there is a lot of git-related setup code in the model that would be
painful to copy to the migration. Instead, we just manually reset the column
information for the models we could pollute.

Docs: document new redirect for Disqus comments

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

Update marked to 0.3.12

Closes #42055

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

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