# Conflicts:
#   config/webpack.config.js

This manually merges https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10874
into master after resolving conflicts.

Decrease ABC threshold to 57.08

See merge request !10724

Decrease Cyclomatic Complexity threshold to 16

See merge request !10928

Don't expect underlying DB data to be updated in feature spec

Closes #31437

See merge request !10934

Assignee filter on group issues/merge requests only loads group users

Closes #29490

See merge request !10884

Change issues sentence to use natural sorting

Closes #20378

See merge request !7110

Skip issuable without a project in IssuableExtractor#extract

Closes #31280

See merge request !10906

Ensures that OAuth/LDAP/SAML users don't need to be confirmed

Closes #31294

See merge request !10926

Only assert that the page shows something, this waits for requests
to be completed.
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>

Bump gitlab-shell version to 5.0.3

See merge request !10922

Merge branch '30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-page' into 'master'

Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling for specific branches

Closes #30692

See merge request !10916

Update MR diff blob_fork_suggestion after jQuery update

See merge request !10921

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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

`.init()` was added in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10858

We need to add it the MR diff instance that was added in a separate MR
and of course didn't add a conflict because it is a completely different
piece

Metrics graph error fix

Closes #30840

See merge request !10839

Show correct size when MR diff overflows

Closes #26560

See merge request !10827

Resolve "Clean up padding with Markdown headers"

Closes #27827

See merge request !10350

Upgrade Sidekiq to 4.2.10

See merge request !10899

Add sub-nav for Project Integration Services edit page

Closes #31174

See merge request !10813

Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled

Closes #31294

See merge request !10896

The problem is that we often go via a diff object constructed from the diffs
stored in the DB. Those diffs, by definition, don't overflow, so we don't have
access to the 'correct' `real_size` - that is stored on the MR diff object
iself.

Add index to webhooks type column

Closes #31232

See merge request !10883