* upstream/master: (149 commits)
  Revert change to design. Go back to scrollable page
  Fixes the column widths for the new navigation options in settings
  Migrate #submodule_url_for to Gitaly
  Add test example for external commit status retries
  Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rb
  Fix build for !12300.
  Log rescued exceptions to Sentry
  Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths
  Revert "Merge branch 'revert-12499' into 'master'"
  Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion
  Improve the overall UX for the new monitoring dashboard
  Document that GitLab 9.3 requires the TRIGGER permission on MySQL
  Instrument Unicorn with Ruby exporter
  Remove group modal like remove project modal. Closes #33130
  Update prometheus client gem
  Enables the option in user preferences to turn on the new navigation
  Add Jasmine tests for `OAuthRememberMe`
  Simplify authentication logic in the v4 users API for !12445.
  Use stub_application_setting when testing ApplicationHelper#support_url
  wait_for_requests is not needed when AJAX is not in play
  ...

Fix API Scoping

Closes #33580 and #33022

See merge request !12300

Honor the "Remember me" parameter for OAuth-based login

Closes #18000

See merge request !11963

Use stub_application_setting when testing ApplicationHelper#support_url

Closes #34648

See merge request !12627

Fixes the column widths for the new navigation option

See merge request !12644

Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rb

See merge request !12641

Log rescued exceptions to Sentry

See merge request !12638

Add test example for external commit status retries

See merge request !12642

Improve stage_id foreign key migration

Closes #34495

See merge request !12617

Revert change to design. Go back to scrollable page

Closes #34531

See merge request !12587

Migrate #submodule_url_for to Gitaly

See merge request !12629

Update sentry-raven from 2.4.0 to 2.5.3

See merge request !12605

Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths

Closes #34529

See merge request !12636

Improve the overall UX for the new monitoring dashboard

See merge request !12616

- The `/users` and `/users/:id` APIs are now accessible without
  authentication (!12445), and so scopes are not relevant for these endpoints.

- Previously, we were testing our scope declaration against these two methods.
  This commit moves these tests to other `GET` user endpoints which still
  require authentication.

Support noticed that a number of exceptions, such as
"Encoding::CompatibilityError (incompatible character encodings: UTF-8 and
ASCII-8BIT)", failed to report to Sentry. The `rescue_from` in the
ApplicationController prevented these exceptions from being recorded.
This change ensures that these exceptions are properly captured.

Add Italian translation of Cycle Analytics Page & Project Page & Repository Page

Closes #34544

See merge request !12578

Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion

Closes #34456

See merge request !12574

Revert "Merge branch 'revert-12499' into 'master'"

See merge request !12633

Update prometheus client gem

See merge request !12632

Document that GitLab 9.3 requires the TRIGGER permission on MySQL

Closes #34358

See merge request !12573

no trailing / leading hyphens in CI_COMMIT_REF_SLUG.

Closes #32035

See merge request !11218

Enables the option in user preferences to turn on the new navigation

See merge request !12630

This reverts merge request !12557

# Conflicts:
#   Gemfile.lock

Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion

Instrument Unicorn with Ruby exporter

Closes #33410

See merge request !12115

Add documentation for extended docker configuration options for CI

See merge request !12164