The conflicts are simple enought to resolve that we don't need to bother
developers with those.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Decouple more of Repository from Rugged

Closes gitaly#969

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

Make pagination optional for issuables

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

Check MR state before submitting queries for discussion state

Closes #42236

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

Port changes from gitlab-org/gitlab-ee!4064 to CE

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

On epics roadmap page we list all epics in the given time frame
without pagination (at least for the first iteration), in this
case it would be nice to use the existing issuables index logic
except pagination (see MR gitlab-ee!4281). For this reason this
patch allows to easily disable pagination.

Related gitlab-ee!4281

Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job

Closes #42569

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

More $.ajax conversions to axios

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

Add `createNewItemFromValue` option and `clearDropdown` method to `create_item_dropdown`

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

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

Replace $.get in single file diff with axios

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

Replace $.post in label manager with axios

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

doc: Correct example responses in repository_files.md

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

Update index.md

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

Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

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

Fix grape-route-helper route shadowing

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

Resolve "Missing space between edit and delete buttons in tag list"

Closes #41802

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

[ci skip]

Add noData empty state to Prometheus graphs

Closes #42558

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

Fix JIRA not working when a trailing slash is included

Closes #42494

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

Leaving a trailing slash in the context option causes the jira-ruby
gem to add an extra slash in HTTP requests to the URL, preventing
JIRA from working properly.

Closes #42494

Bringing in https://github.com/reprah/grape-route-helpers/pull/21 as a
monkey patch since the grape-route-helpers project seems to be abandoned

Fail static-analysis if there's output to stderr

Closes #41972

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

Return more consistent values for merge_status on MR API

Closes #20639

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

Replace $.post in edit blob with axios

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

Fix cache clear windows

Closes #42487

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

Resolve "Intermittent spec failure in spec/models/commit_spec.rb"

Closes #42553

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

Close and do not reload MR diffs when source branch is deleted

Closes #37775

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

Move mr_widget_merged into a vue file

Closes #42486

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

Don't allow Repository#log with limit zero

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