* upstream/master: (106 commits)
  Remove callback as we already update accordingly on services
  added missing imports
  correctly imports performance bar
  Added imports for dispatcher routes
  Make the exposing of the Application secret more explicit
  Add documentation about when the application API was added
  Add application create API
  Return a blank JSON response for a missing .js file to prevent Rails CSRF errors
  add CHANGELOG.md entry for !15804
  disable CopyAsGFM on iOS due to bug in webkit
  Update changelog
  GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
  Return more consistent values for merge_status on MR API
  Fix a migration spec messing up the MergeRequestDiff DB schema
  Backport changes to Gitlab::Checks::ChangeAccess from EE
  remove webpack bundle tag for monitoring:environments:metrics
  Set timezone for karma to UTC
  Upgrade jasmine + raven to newer versions
  Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location
  Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze
  ...

Return more consistent values for merge_status on V4 MR APIs

Closes #20639

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

Add application create API

Closes #24035

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

Added dispatcher imports for groups webpack bundle

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

Return a blank JSON response for a missing .js file to prevent Rails CSRF errors

Closes #40771

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

Added imports for dispatcher routes

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

Use restore() instead of reset() for removing axios MockAdapter

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

Speed-up setup-test-env

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

GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side

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

Scrap the deploy key title and match it in test

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

Resolve "Cannot copy/paste on iOS"

Closes #32546

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

To make it more clear to developers that the entity exposes the
application secret, define a separate entity that only should be used
when the secret is needed (probably only on creation).

The default 404 handler would return the Content-Type format based on the
given format extension. This would cause the Rails CSRF protection to flag an
error, since the .js extension gets mapped to text/javascript format.

Closes #40771

Set timezone for karma CI job to Etc/UTC (UTC+0)

Closes #42251

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

Resolve "CI failing on MergeRequestDiff#commits_count="

Closes #42340

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

Fix docs for GIT_CHECKOUT Gitlab Runner configuration

Closes gitlab-runner#2652

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

Backport changes to Gitlab::Checks::ChangeAccess from EE

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

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

Refactor dispatcher milestones show path

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

remove webpack bundle tag for monitoring:environments:metrics

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

Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze

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

Adjust layout width for fixed layout #41830

Closes #41830

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

consistent function exports for Labels edit/new pages

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

Upgrade jasmine + raven to newer versions

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