# Conflicts:
#   db/schema.rb

Commenting on image diffs

Closes #35873 and #38559

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

Backport protected_branches_spec improvements from EE

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

Removes unnecessary load of LinkedTabs, Pipelines and MiniPipelineGraph classes

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

Resolve "Metrics that do not have a complete history are not shown at all"

Closes #36255

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

Show confirmation modal before deleting account

Closes #13482 and #38754

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

* master: (136 commits)
  Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener spec
  Gitaly feature flag metadata
  Add delete issue docs
  Adjust tooltips to adhere to 8px grid and make them more readable
  Fix JS lock issue specs
  Improve redirect uri state and fix all remaining tests
  Add 1000+ counters (instead of inifnite) to jobs controller
  Use short path project_clusters_url
  Change Clusters to Cluster in sidebar
  Security fix: redirection in google_api/authorizations_controller
  UX review
  Fix sidebar title Fix fixture
  Fix margins in edit form
  Use utc for time comparision
  Good old dangling comma
  Fix wording in the js messages
  Resetting of active Line + setting it for the async display functions
  Add some empty spaces
  Fix failing spec
  Refactor discussion lock docs
  ...

Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener spec

Closes #38872

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

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

Repo Editor : Fixes Back Button for files + line number jumping for preview and editor

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

Gitaly feature flag metadata

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

Scrollable tabs on top on Admin Jobs/Projects

Closes #38775

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

Add 1000 plus counters for jobs page

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

Create Kubernetes cluster on GKE from k8s service

Closes #35954

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

Resolve "Lock issue and merge request"

Closes #18608

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

Add delete issue docs

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

Fixed the navbar title hover style being applied outside the navbar

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

Replace the 'project/merge_requests.feature' spinach test with an rspec analog

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

Adjust tooltips to adhere to 8px grid and make them more readable

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

Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service

Send API parameters as extra data for sentry errors

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

Prevent branches or tags from starting with invalid characters (e.g. -, .)

Closes #38817

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

Add support for GPG subkeys in signature verification

Closes #36829

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

Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service