Notify only merge request unmergeable due to conflict

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

Added Wiki Scenario Automation gitlab-qa#263

Closes gitlab-qa#263

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

Resolve "Custom logo rendering improperly on sign-in page"

Closes #47964

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

Make the stubbed methods for SAML authorize paths more specific

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

Backport code from gitlab-ee!6182

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

Limit the action suffixes in transaction metrics

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

Remove remaining traces of the Allocations Gem

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

Highlight cluster settings message

Closes #41274

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

Resolve "Date selection dialog broken when creating a new milestone"

Closes #48153

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

Use eslint to find unused directives

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

This now can happen because can_be_merged? is called
during MR merge_status transition to cannot_be_merged.
It is possible branch_name is invalid.

Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'"

Closes #48171

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

There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.

Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.

Remove unmergeable_reason as now only conflict is notified

Update spec

Resolve "Milestone labels can be confusing"

Closes #48075

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

This reverts merge request !19873

Updates to the `gettext:updated_check`

Closes #48113

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

Move mergablility check to Gitaly

Closes gitaly#889

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

Fix: Serve favicon image always from the main GitLab domain to avoid issues with CORS

Closes #47802

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

In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we
removed use of the data produced by the Allocations Gem. However, we
never removed the code that just enables tracking of allocations. In
this commit we remove all remaining traces of this Gem.

This makes the output in static analysis a bit more verbose.

Merge branch '47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabled' into 'master'

Operations and Kubernetes option should be omitted when repository or builds are disabled

Closes #47631

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

Bump rugged to 0.27.2

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

Merge branch 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes' into 'master'

Resolve "[Rails5] Found new routes that could cause conflicts with existing namespaced routes"

Closes #48010

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

There seem to be a lot of cases where the suffix of an action (e.g.
".html") is set to bogus data, such as "*/*" or entire URLs. This can
increase cardinality of our metrics, and isn't very useful for
monitoring and filtering. To work around this, we enforce a whitelist
containing a few suffixes we actually care about. Suffixes not supported
will be grouped under the action without a suffix. This means that a
request to "FooController#bar.jpeg" will be assigned to
"FooController#bar".

Refactor the profile preferences docs

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

Docs clarify API to share project to a group

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

Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible with Tiller v2.7.0'"

Closes #48126

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

Add note about Master/Maintainer role

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