* master:
  Restoring user v3 endpoint
  Resolve "Use one column form layout on Admin Area Settings page"
  Resolve "Participants tooltip is cutoff when too close to the window edge"
  Fix group member filter layout
  Align nav bar items
  Fix labels too large
  Added with_statsoption for GET /projects/:id/repository/commits
  Fixed IDE jobs empty state showing when loading
  Fixes Microsoft Teams notifications for pipeline events
  Migrate compare_source_branch to use only Gitaly
  Clean up stale Prometheus metrics in before_exec unicorn hook
  Remove top padding from .col-form-label

Migrate compare_source_branch to use only Gitaly

Closes gitaly#771

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

Restoring user v3 endpoint

Closes #47565

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

Resolve "Microsoft Teams notification for pipelines do not work"

Closes #42342

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

Added with_stats option to GET /projects/:id/repository/commits (API)

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

Resolve "Use one column form layout on Admin Area Settings page"

Closes #44674

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

Resolve "Groups > Members > No padding between dropdowns/input"

Closes #46702

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

Resolve "Participants tooltip is cutoff when too close to the window edge"

Closes #47551

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

Resolve "Project search in navbar is missing top margin in dev.gitlab.com"

Closes #47773

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

Clean up stale Prometheus metrics in before_exec unicorn hook

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

Resolve "Alignment of labels within two column layouts for radio and check boxes"

Closes #47265

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

Fix labels too large

Closes #47499 and #47762

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

Fixed IDE jobs empty state showing when loading

Closes #47766

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

* master:
  mergeError message has been binded using v-html directive
  Find and mark more Git disk access locations, part 2
  Ensure MR diffs always exist in the PR importer

Ensure MR diffs always exist in the PR importer

Closes #47312

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

Find and mark more Git disk access locations, part 2

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

mergeError message has been binded using v-html directive

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

Closes #47766

* master: (47 commits)
  Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
  i18n: document how to use links without splitting sentences
  Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb"
  Add CI job to check Gemfile.rails5.lock
  Add navigation theme documentation
  Move Gitaly branch/tag/ref RPC's to opt-out
  Add CI_{PIPELINE,JOB}_URL
  Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project""
  fixed/enhanced command-line documentation
  Use nip.io instead of xip.io
  [Rails5] Update Gitlab.rails5.lock
  Fix typo in doc/development/README.md
  Update import screenshot without LFS warning
  Hide overflow on hr
  Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar"
  Fix collapse sidebar button color
  Remove .row and .col-sm-12
  Relax expectation in spec/models/project_spec.rb
  fix padding in commit info
  GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong
  ...

Replace ... with ellipsis in placeholders

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

Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter

Closes #47577

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

i18n: document how to use links without splitting sentences

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

Add CI_{PIPELINE,JOB}_URL

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

Closes #42342

In rare cases it could happen that an MR was created, but creating the
MR diffs somehow failed (e.g. due to an error). This commit adds an
additional check to make sure MR diffs are always present when importing
GitHub pull requests.

Merge branch 'blackst0ne-rails5-actionview-missingtemplate-in-spec-features-projects-wiki-user_views_wiki_page_spec-rb' into 'master'

Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb"

Closes #47738

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

Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb"

Add CI job to check Gemfile.rails5.lock

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