Merge remote-tracking branch 'upstream/master' into...

Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-merge-request-due-to-nil-commit_email_hostname * upstream/master: (115 commits) [CE] Speed up login page usage Add new line and comments Fix the seeder 24_forks.rb cannot find public project Milestones on community contribution issues Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rb Fix and move specs into admin_disables_git_access_protocol_spec.rb Fix HTTP/SSH clone panel for mobile Add spec for HTTP/SSH clone panel Fix missing Git clone button when protocol restriction setting enabled Fix deprecation: Using positional arguments in integration tests Extend override check to also check arity Update tm cli version Bump Gitaly version to v1.12.0 Add @dbalexandre to CODEOWNERS Update verbiage for clarity Change group-cluster beta to regular note Change alpha states to use note instead of warning Update registry section. Update serverless.yaml formatting Clarify obtaining application URL Add @godfat to CODEOWNERS ...

Merge remote-tracking branch 'upstream/master' into...
Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-merge-request-due-to-nil-commit_email_hostname * upstream/master: (115 commits) [CE] Speed up login page usage Add new line and comments Fix the seeder 24_forks.rb cannot find public project Milestones on community contribution issues Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rb Fix and move specs into admin_disables_git_access_protocol_spec.rb Fix HTTP/SSH clone panel for mobile Add spec for HTTP/SSH clone panel Fix missing Git clone button when protocol restriction setting enabled Fix deprecation: Using positional arguments in integration tests Extend override check to also check arity Update tm cli version Bump Gitaly version to v1.12.0 Add @dbalexandre to CODEOWNERS Update verbiage for clarity Change group-cluster beta to regular note Change alpha states to use note instead of warning Update registry section. Update serverless.yaml formatting Clarify obtaining application URL Add @godfat to CODEOWNERS ...
82bf55c8 · Lin Jen-Shin · cc06bb2c · 145079b3 · 82bf55c8 · 82bf55c8
Commit 82bf55c8 authored Dec 26, 2018 by Lin Jen-Shin
588 changed files
--- a/.gitlab/CODEOWNERS.disabled
+++ b/.gitlab/CODEOWNERS.disabled
 # Backend Maintainers are the default for all ruby files
-*.rb @ayufan @DouweM @dzaporozhets @grzesiek @nick.thomas @rspeicher @rymai @smcgivern
-*.rake @ayufan @DouweM @dzaporozhets @grzesiek @nick.thomas @rspeicher @rymai @smcgivern
+*.rb @ayufan @dbalexandre @DouweM @dzaporozhets @godfat @grzesiek @nick.thomas @rspeicher @rymai @smcgivern
+*.rake @ayufan @dbalexandre @DouweM @dzaporozhets @godfat @grzesiek @nick.thomas @rspeicher @rymai @smcgivern

 # Technical writing team are the default reviewers for everything in `doc/`
 /doc/ @axil @marcia

--- a/.gitlab/issue_templates/Feature proposal.md
+++ b/.gitlab/issue_templates/Feature proposal.md
@@ -4,7 +4,7 @@

 ### Target audience

-<!--- For whom are we doing this? Include either a persona from https://design.gitlab.com/#/getting-started/personas or define a specific company role. e.a. "Release Manager" or "Security Analyst" -->
+<!--- For whom are we doing this? Include either a persona from https://design.gitlab.com/getting-started/personas or define a specific company role. e.a. "Release Manager" or "Security Analyst" -->

 ### Further details


--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-1.9.0
+1.12.0
--- a/Gemfile
+++ b/Gemfile
@@ -130,7 +130,7 @@ gem 'asciidoctor-plantuml', '0.0.8'
 gem 'rouge', '~> 3.1'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.2'
+gem 'nokogiri', '~> 1.8.4'
 gem 'escape_utils', '~> 1.1'

 # Calendar rendering
@@ -165,7 +165,7 @@ gem 'acts-as-taggable-on', '~> 5.0'
 gem 'sidekiq', '~> 5.2.1'
 gem 'sidekiq-cron', '~> 0.6.0'
 gem 'redis-namespace', '~> 1.6.0'
-gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch'
+gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'

 # Cron Parser
 gem 'rufus-scheduler', '~> 3.4'
@@ -419,7 +419,7 @@ group :ed25519 do
 end

 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
 gem 'grpc', '~> 1.15.0'

 gem 'google-protobuf', '~> 3.6'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,13 +274,13 @@ GEM
      gettext_i18n_rails (>= 0.7.1)
      po_to_json (>= 1.0.0)
      rails (>= 3.2.0)
-    gitaly-proto (1.3.0)
+    gitaly-proto (1.5.0)
      grpc (~> 1.0)
    github-markup (1.7.0)
    gitlab-default_value_for (3.1.1)
      activerecord (>= 3.2.0, < 6.0)
    gitlab-markup (1.6.5)
-    gitlab-sidekiq-fetcher (0.1.0)
+    gitlab-sidekiq-fetcher (0.4.0)
      sidekiq (~> 5)
    gitlab-styles (2.4.1)
      rubocop (~> 0.54.0)
@@ -1008,11 +1008,11 @@ DEPENDENCIES
  gettext (~> 3.2.2)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 1.3.0)
+  gitaly-proto (~> 1.5.0)
  github-markup (~> 1.7.0)
  gitlab-default_value_for (~> 3.1.1)
  gitlab-markup (~> 1.6.5)
-  gitlab-sidekiq-fetcher (~> 0.1.0)
+  gitlab-sidekiq-fetcher (~> 0.4.0)
  gitlab-styles (~> 2.4)
  gitlab_omniauth-ldap (~> 2.0.4)
  gon (~> 6.2)
@@ -1059,7 +1059,7 @@ DEPENDENCIES
  nakayoshi_fork (~> 0.0.4)
  net-ldap
  net-ssh (~> 5.0)
-  nokogiri (~> 1.8.2)
+  nokogiri (~> 1.8.4)
  oauth2 (~> 1.4)
  octokit (~> 4.9)
  omniauth (~> 1.8)

--- a/PROCESS.md
+++ b/PROCESS.md
@@ -58,6 +58,18 @@ their contributions accepted by meeting our [Definition of done][done].

 What you can expect from them is described at https://about.gitlab.com/roles/merge-request-coach/.

+### Milestones on community contribution issues
+
+The milestone of an issue that is currently being worked on by a community contributor
+should not be set to a named GitLab milestone (e.g. 11.7, 11.8), until the associated
+merge request is very close to being merged, and we will likely know in which named
+GitLab milestone the issue will land. There are many factors that influence when
+a community contributor finishes an issue, or even at all. So we should set this 
+milestone only when we have more certainty.
+
+Note this only applies to issues currently assigned to community contributors. For
+issues assigned to GitLabbers, we are [ambitious in assigning milestones to issues](https://about.gitlab.com/direction/#how-we-plan-releases).
+
 ## Assigning issues

 If an issue is complex and needs the attention of a specific person, assignment is a good option but assigning issues might discourage other people from contributing to that issue. We need all the contributions we can get so this should never be discouraged. Also, an assigned person might not have time for a few weeks, so others should feel free to takeover.

--- a/VERSION
+++ b/VERSION
-11.6.0-pre
+11.7.0-pre
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -29,6 +29,7 @@ const Api = {
  commitPipelinesPath: '/:project_id/commit/:sha/pipelines',
  branchSinglePath: '/api/:version/projects/:id/repository/branches/:branch',
  createBranchPath: '/api/:version/projects/:id/repository/branches',
+  releasesPath: '/api/:version/projects/:id/releases',

  group(groupId, callback) {
    const url = Api.buildUrl(Api.groupPath).replace(':id', groupId);
@@ -307,6 +308,12 @@ const Api = {
    });
  },

+  releases(id) {
+    const url = Api.buildUrl(this.releasesPath).replace(':id', encodeURIComponent(id));
+
+    return axios.get(url);
+  },
+
  buildUrl(url) {
    let urlRoot = '';
    if (gon.relative_url_root != null) {

--- a/app/assets/javascripts/ci_variable_list/ci_variable_list.js
+++ b/app/assets/javascripts/ci_variable_list/ci_variable_list.js
@@ -36,7 +36,9 @@ export default class VariableList {
      },
      protected: {
        selector: '.js-ci-variable-input-protected',
-        default: 'false',
+        // use `attr` instead of `data` as we don't want the value to be
+        // converted. we need the value as a string.
+        default: $('.js-ci-variable-input-protected').attr('data-default'),
      },
      environment_scope: {
        // We can't use a `.js-` class here because

--- a/app/assets/javascripts/diffs/components/inline_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue
@@ -49,7 +49,7 @@ export default {
          :is-bottom="index + 1 === diffLinesLength"
        />
        <inline-diff-comment-row
-          :key="`icr-${index}`"
+          :key="`icr-${line.line_code || index}`"
          :diff-file-hash="diffFile.file_hash"
          :line="line"
          :help-page-path="helpPagePath"

--- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue
@@ -43,14 +43,14 @@ export default {
      <tbody>
        <template v-for="(line, index) in diffLines">
          <parallel-diff-table-row
-            :key="index"
+            :key="line.line_code"
            :file-hash="diffFile.file_hash"
            :context-lines-path="diffFile.context_lines_path"
            :line="line"
            :is-bottom="index + 1 === diffLinesLength"
          />
          <parallel-diff-comment-row
-            :key="`dcr-${index}`"
+            :key="`dcr-${line.line_code || index}`"
            :line="line"
            :diff-file-hash="diffFile.file_hash"
            :line-index="index"

--- a/app/assets/javascripts/diffs/store/utils.js
+++ b/app/assets/javascripts/diffs/store/utils.js
@@ -196,6 +196,15 @@ export function trimFirstCharOfLineContent(line = {}) {
  return parsedLine;
 }

+function getLineCode({ left, right }, index) {
+  if (left && left.line_code) {
+    return left.line_code;
+  } else if (right && right.line_code) {
+    return right.line_code;
+  }
+  return index;
+}
+
 // This prepares and optimizes the incoming diff data from the server
 // by setting up incremental rendering and removing unneeded data
 export function prepareDiffData(diffData) {
@@ -208,6 +217,8 @@ export function prepareDiffData(diffData) {
      const linesLength = file.parallel_diff_lines.length;
      for (let u = 0; u < linesLength; u += 1) {
        const line = file.parallel_diff_lines[u];
+
+        line.line_code = getLineCode(line, u);
        if (line.left) {
          line.left = trimFirstCharOfLineContent(line.left);
          line.left.hasForm = false;

--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -14,6 +14,7 @@ import MonitoringButtonComponent from './environment_monitoring.vue';
 import CommitComponent from '../../vue_shared/components/commit.vue';
 import eventHub from '../event_hub';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import { CLUSTER_TYPE } from '~/clusters/constants';

 /**
 * Environment Item Component
@@ -84,6 +85,15 @@ export default {
      return this.model && this.model.is_protected;
    },

+    /**
+     * Hide group cluster features which are not currently implemented.
+     *
+     * @returns {Boolean}
+     */
+    disableGroupClusterFeatures() {
+      return this.model && this.model.cluster_type === CLUSTER_TYPE.GROUP;
+    },
+
    /**
     * Returns whether the environment can be stopped.
     *
@@ -547,6 +557,7 @@ export default {
        <terminal-button-component
          v-if="model && model.terminal_path"
          :terminal-path="model.terminal_path"
+          :disabled="disableGroupClusterFeatures"
        />

        <rollback-component

--- a/app/assets/javascripts/environments/components/environment_terminal_button.vue
+++ b/app/assets/javascripts/environments/components/environment_terminal_button.vue
@@ -19,6 +19,11 @@ export default {
      required: false,
      default: '',
    },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
  },
  computed: {
    title() {
@@ -33,6 +38,7 @@ export default {
    :title="title"
    :aria-label="title"
    :href="terminalPath"
+    :class="{ disabled: disabled }"
    class="btn terminal-button d-none d-sm-none d-md-block"
  >
    <icon name="terminal" />

--- a/app/assets/javascripts/jobs/components/artifacts_block.vue
+++ b/app/assets/javascripts/jobs/components/artifacts_block.vue
@@ -28,27 +28,29 @@ export default {
 </script>
 <template>
  <div class="block">
-    <div class="title">{{ s__('Job|Job artifacts') }}</div>
+    <div class="title font-weight-bold">{{ s__('Job|Job artifacts') }}</div>

-    <p v-if="isExpired" class="js-artifacts-removed build-detail-row">
-      {{ s__('Job|The artifacts were removed') }}
+    <p
+      v-if="isExpired || willExpire"
+      :class="{
+        'js-artifacts-removed': isExpired,
+        'js-artifacts-will-be-removed': willExpire,
+      }"
+      class="build-detail-row"
+    >
+      <span v-if="isExpired">{{ s__('Job|The artifacts were removed') }}</span>
+      <span v-if="willExpire">{{ s__('Job|The artifacts will be removed') }}</span>
+      <timeago-tooltip v-if="artifact.expire_at" :time="artifact.expire_at" />
    </p>

-    <p v-else-if="willExpire" class="js-artifacts-will-be-removed build-detail-row">
-      {{ s__('Job|The artifacts will be removed in') }}
-    </p>
-
-    <timeago-tooltip v-if="artifact.expire_at" :time="artifact.expire_at" />
-
-    <div class="btn-group d-flex" role="group">
+    <div class="btn-group d-flex prepend-top-10" role="group">
      <gl-link
        v-if="artifact.keep_path"
        :href="artifact.keep_path"
        class="js-keep-artifacts btn btn-sm btn-default"
        data-method="post"
+        >{{ s__('Job|Keep') }}</gl-link
      >
-        {{ s__('Job|Keep') }}
-      </gl-link>

      <gl-link
        v-if="artifact.download_path"
@@ -56,17 +58,15 @@ export default {
        class="js-download-artifacts btn btn-sm btn-default"
        download
        rel="nofollow"
+        >{{ s__('Job|Download') }}</gl-link
      >
-        {{ s__('Job|Download') }}
-      </gl-link>

      <gl-link
        v-if="artifact.browse_path"
        :href="artifact.browse_path"
        class="js-browse-artifacts btn btn-sm btn-default"
+        >{{ s__('Job|Browse') }}</gl-link
      >
-        {{ s__('Job|Browse') }}
-      </gl-link>
    </div>
  </div>
 </template>
--- a/app/assets/javascripts/jobs/components/commit_block.vue
+++ b/app/assets/javascripts/jobs/components/commit_block.vue
@@ -31,12 +31,12 @@ export default {
      block: !isLastBlock,
    }"
  >
-    <p>
-      {{ __('Commit') }}
+    <p class="append-bottom-5">
+      <span class="font-weight-bold">{{ __('Commit') }}</span>

-      <gl-link :href="commit.commit_path" class="js-commit-sha commit-sha link-commit">{{
-        commit.short_id
-      }}</gl-link>
+      <gl-link :href="commit.commit_path" class="js-commit-sha commit-sha link-commit">
+        {{ commit.short_id }}
+      </gl-link>

      <clipboard-button
        :text="commit.short_id"
@@ -44,11 +44,14 @@ export default {
        css-class="btn btn-clipboard btn-transparent"
      />

-      <gl-link v-if="mergeRequest" :href="mergeRequest.path" class="js-link-commit link-commit"
-        >!{{ mergeRequest.iid }}</gl-link
-      >
+      <span v-if="mergeRequest">
+        {{ __('in') }}
+        <gl-link :href="mergeRequest.path" class="js-link-commit link-commit"
+          >!{{ mergeRequest.iid }}</gl-link
+        >
+      </span>
    </p>

-    <p class="build-light-text append-bottom-0">{{ commit.title }}</p>
+    <p class="append-bottom-0">{{ commit.title }}</p>
  </div>
 </template>
--- a/app/assets/javascripts/jobs/components/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/sidebar.vue
@@ -110,22 +110,20 @@ export default {
  <aside class="right-sidebar build-sidebar" data-offset-top="101" data-spy="affix">
    <div class="sidebar-container">
      <div class="blocks-container">
-        <div class="block">
-          <strong class="inline prepend-top-8"> {{ job.name }} </strong>
+        <div class="block d-flex align-items-center">
+          <h4 class="flex-grow-1 prepend-top-8 m-0">{{ job.name }}</h4>
          <gl-link
            v-if="job.retry_path"
            :class="retryButtonClass"
            :href="job.retry_path"
            data-method="post"
            rel="nofollow"
+            >{{ __('Retry') }}</gl-link
          >
-            {{ __('Retry') }}
-          </gl-link>
          <gl-link
            v-if="job.terminal_path"
            :href="job.terminal_path"
-            class="js-terminal-link pull-right btn btn-primary
-      btn-inverted visible-md-block visible-lg-block"
+            class="js-terminal-link pull-right btn btn-primary btn-inverted visible-md-block visible-lg-block"
            target="_blank"
          >
            {{ __('Debug') }} <icon name="external-link" />
@@ -133,8 +131,7 @@ export default {
          <gl-button
            :aria-label="__('Toggle Sidebar')"
            type="button"
-            class="btn btn-blank gutter-toggle
-        float-right d-block d-md-none js-sidebar-build-toggle"
+            class="btn btn-blank gutter-toggle float-right d-block d-md-none js-sidebar-build-toggle"
            @click="toggleSidebar"
          >
            <i aria-hidden="true" data-hidden="true" class="fa fa-angle-double-right"></i>
@@ -145,25 +142,18 @@ export default {
            v-if="job.new_issue_path"
            :href="job.new_issue_path"
            class="js-new-issue btn btn-success btn-inverted"
+            >{{ __('New issue') }}</gl-link
          >
-            {{ __('New issue') }}
-          </gl-link>
          <gl-link
            v-if="job.retry_path"
            :href="job.retry_path"
            class="js-retry-job btn btn-inverted-secondary"
            data-method="post"
            rel="nofollow"
+            >{{ __('Retry') }}</gl-link
          >
-            {{ __('Retry') }}
-          </gl-link>
        </div>
        <div :class="{ block: renderBlock }">
-          <p v-if="job.merge_request" class="build-detail-row js-job-mr">
-            <span class="build-light-text"> {{ __('Merge Request:') }} </span>
-            <gl-link :href="job.merge_request.path"> !{{ job.merge_request.iid }} </gl-link>
-          </p>
-
          <detail-row
            v-if="job.duration"
            :value="duration"
@@ -198,10 +188,10 @@ export default {
            title="Coverage"
          />
          <p v-if="job.tags.length" class="build-detail-row js-job-tags">
-            <span class="build-light-text"> {{ __('Tags:') }} </span>
-            <span v-for="(tag, i) in job.tags" :key="i" class="badge badge-primary">
-              {{ tag }}
-            </span>
+            <span class="font-weight-bold">{{ __('Tags:') }}</span>
+            <span v-for="(tag, i) in job.tags" :key="i" class="badge badge-primary mr-1">{{
+              tag
+            }}</span>
          </p>

          <div v-if="job.cancel_path" class="btn-group prepend-top-5" role="group">
@@ -210,9 +200,8 @@ export default {
              class="js-cancel-job btn btn-sm btn-default"
              data-method="post"
              rel="nofollow"
+              >{{ __('Cancel') }}</gl-link
            >
-              {{ __('Cancel') }}
-            </gl-link>
          </div>
        </div>


--- a/app/assets/javascripts/jobs/components/sidebar_detail_row.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_detail_row.vue
@@ -34,8 +34,7 @@ export default {
 </script>
 <template>
  <p class="build-detail-row">
-    <span v-if="hasTitle" class="build-light-text"> {{ title }}: </span> {{ value }}
-
+    <span v-if="hasTitle" class="font-weight-bold">{{ title }}:</span> {{ value }}
    <span v-if="hasHelpURL" class="help-button float-right">
      <gl-link :href="helpUrl" target="_blank" rel="noopener noreferrer nofollow">
        <i class="fa fa-question-circle" aria-hidden="true"></i>

--- a/app/assets/javascripts/jobs/components/stages_dropdown.vue
+++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue
@@ -38,11 +38,11 @@ export default {
  <div class="block-last dropdown">
    <ci-icon :status="pipeline.details.status" class="vertical-align-middle" />

-    {{ __('Pipeline') }}
-    <a :href="pipeline.path" class="js-pipeline-path link-commit"> #{{ pipeline.id }} </a>
+    <span class="font-weight-bold">{{ __('Pipeline') }}</span>
+    <a :href="pipeline.path" class="js-pipeline-path link-commit">#{{ pipeline.id }}</a>
    <template v-if="hasRef">
      {{ __('from') }}
-      <a :href="pipeline.ref.path" class="link-commit ref-name"> {{ pipeline.ref.name }} </a>
+      <a :href="pipeline.ref.path" class="link-commit ref-name">{{ pipeline.ref.name }}</a>
    </template>

    <button

--- a/app/assets/javascripts/jobs/components/trigger_block.vue
+++ b/app/assets/javascripts/jobs/components/trigger_block.vue
@@ -43,23 +43,24 @@ export default {

 <template>
  <div class="build-widget block">
-    <h4 class="title">{{ __('Trigger') }}</h4>
-
    <p
      v-if="trigger.short_token"
      class="js-short-token"
-      :class="{ 'append-bottom-0': !hasVariables }"
+      :class="{ 'append-bottom-5': hasVariables, 'append-bottom-0': !hasVariables }"
    >
-      <span class="build-light-text"> {{ __('Token') }} </span> {{ trigger.short_token }}
+      <span class="font-weight-bold">{{ __('Trigger token:') }}</span> {{ trigger.short_token }}
    </p>

    <template v-if="hasVariables">
      <p class="trigger-variables-btn-container">
-        <span class="build-light-text"> {{ __('Variables:') }} </span>
+        <span class="font-weight-bold">{{ __('Trigger variables:') }}</span>

-        <gl-button v-if="hasValues" class="group js-reveal-variables" @click="toggleValues">
-          {{ getToggleButtonText }}
-        </gl-button>
+        <gl-button
+          v-if="hasValues"
+          class="btn-sm group js-reveal-variables trigger-variables-btn"
+          @click="toggleValues"
+          >{{ getToggleButtonText }}</gl-button
+        >
      </p>

      <table class="js-build-variables trigger-build-variables">

--- a/app/assets/javascripts/lib/utils/text_markdown.js
+++ b/app/assets/javascripts/lib/utils/text_markdown.js
@@ -82,7 +82,7 @@ export function insertMarkdownText({
  tag,
  cursorOffset,
  blockTag,
-  selected,
+  selected = '',
  wrap,
  select,
 }) {
@@ -212,7 +212,7 @@ export function addMarkdownListeners(form) {
        blockTag: $this.data('mdBlock'),
        wrap: !$this.data('mdPrepend'),
        select: $this.data('mdSelect'),
-        tagContent: $this.data('mdTagContent').toString(),
+        tagContent: $this.data('mdTagContent'),
      });
    });
 }

--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -178,31 +178,32 @@ export default {
        commitId = `<span class="commit-sha">${truncateSha(commitId)}</span>`;
      }

-      let text = s__('MergeRequests|started a discussion');
+      const {
+        for_commit: isForCommit,
+        diff_discussion: isDiffDiscussion,
+        active: isActive,
+      } = this.discussion;

-      if (this.discussion.for_commit) {
+      let text = s__('MergeRequests|started a discussion');
+      if (isForCommit) {
        text = s__(
          'MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}',
        );
-      } else if (this.discussion.diff_discussion) {
-        if (this.discussion.active) {
-          text = s__('MergeRequests|started a discussion on %{linkStart}the diff%{linkEnd}');
-        } else {
-          text = s__(
-            'MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}',
-          );
-        }
+      } else if (isDiffDiscussion && commitId) {
+        text = isActive
+          ? s__('MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}')
+          : s__(
+              'MergeRequests|started a discussion on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}',
+            );
+      } else if (isDiffDiscussion) {
+        text = isActive
+          ? s__('MergeRequests|started a discussion on %{linkStart}the diff%{linkEnd}')
+          : s__(
+              'MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}',
+            );
      }

-      return sprintf(
-        text,
-        {
-          commitId,
-          linkStart,
-          linkEnd,
-        },
-        false,
-      );
+      return sprintf(text, { commitId, linkStart, linkEnd }, false);
    },
    diffLine() {
      if (this.discussion.diff_discussion && this.discussion.truncated_diff_lines) {

--- a/app/assets/javascripts/pages/projects/releases/index/index.js
+++ b/app/assets/javascripts/pages/projects/releases/index/index.js
+import initReleases from '~/releases';
+
+document.addEventListener('DOMContentLoaded', initReleases);
--- a/app/assets/javascripts/releases/components/app.vue
+++ b/app/assets/javascripts/releases/components/app.vue
+<script>
+import { mapState, mapActions } from 'vuex';
+import { GlLoadingIcon, GlEmptyState } from '@gitlab/ui';
+import ReleaseBlock from './release_block.vue';
+
+export default {
+  name: 'ReleasesApp',
+  components: {
+    GlLoadingIcon,
+    GlEmptyState,
+    ReleaseBlock,
+  },
+  props: {
+    projectId: {
+      type: String,
+      required: true,
+    },
+    documentationLink: {
+      type: String,
+      required: true,
+    },
+    illustrationPath: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    ...mapState(['isLoading', 'releases', 'hasError']),
+    shouldRenderEmptyState() {
+      return !this.releases.length && !this.hasError && !this.isLoading;
+    },
+    shouldRenderSuccessState() {
+      return this.releases.length && !this.isLoading && !this.hasError;
+    },
+  },
+  created() {
+    this.fetchReleases(this.projectId);
+  },
+  methods: {
+    ...mapActions(['fetchReleases']),
+  },
+};
+</script>
+<template>
+  <div class="prepend-top-default">
+    <gl-loading-icon v-if="isLoading" :size="2" class="js-loading prepend-top-20" />
+
+    <gl-empty-state
+      v-else-if="shouldRenderEmptyState"
+      class="js-empty-state"
+      :title="__('Getting started with releases')"
+      :svg-path="illustrationPath"
+      :description="
+        __(
+          'Releases mark specific points in a project\'s development history, communicate information about the type of change, and deliver on prepared, often compiled, versions of the software to be reused elsewhere. Currently, releases can only be created through the API.',
+        )
+      "
+      :primary-button-link="documentationLink"
+      :primary-button-text="__('Open Documentation')"
+    />
+
+    <div v-else-if="shouldRenderSuccessState" class="js-success-state">
+      <release-block
+        v-for="(release, index) in releases"
+        :key="release.tag_name"
+        :release="release"
+        :class="{ 'linked-card': releases.length > 1 && index !== releases.length - 1 }"
+      />
+    </div>
+  </div>
+</template>
+<style>
+.linked-card::after {
+  width: 1px;
+  content: ' ';
+  border: 1px solid #e5e5e5;
+  height: 17px;
+  top: 100%;
+  position: absolute;
+  left: 32px;
+}
+</style>
--- a/app/assets/javascripts/releases/components/release_block.vue
+++ b/app/assets/javascripts/releases/components/release_block.vue
 <script>
+import _ from 'underscore';
 import { GlTooltipDirective, GlLink } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
@@ -17,52 +18,16 @@ export default {
  },
  mixins: [timeagoMixin],
  props: {
-    name: {
-      type: String,
-      required: true,
-    },
-    tag: {
-      type: String,
-      required: true,
-    },
-    commit: {
-      type: Object,
-      required: true,
-    },
-    description: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    author: {
+    release: {
      type: Object,
      required: true,
-    },
-    createdAt: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    assetsCount: {
-      type: Number,
-      required: false,
-      default: 0,
-    },
-    sources: {
-      type: Array,
-      required: false,
-      default: () => [],
-    },
-    links: {
-      type: Array,
-      required: false,
-      default: () => [],
+      default: () => ({}),
    },
  },
  computed: {
    releasedTimeAgo() {
      return sprintf('released %{time}', {
-        time: this.timeFormated(this.createdAt),
+        time: this.timeFormated(this.release.created_at),
      });
    },
    userImageAltDescription() {
@@ -70,13 +35,25 @@ export default {
        ? sprintf("%{username}'s avatar", { username: this.author.username })
        : null;
    },
+    commit() {
+      return this.release.commit || {};
+    },
+    assets() {
+      return this.release.assets || {};
+    },
+    author() {
+      return this.release.author || {};
+    },
+    hasAuthor() {
+      return _.isEmpty(this.author);
+    },
  },
 };
 </script>
 <template>
  <div class="card">
    <div class="card-body">
-      <h2 class="card-title mt-0">{{ name }}</h2>
+      <h2 class="card-title mt-0">{{ release.name }}</h2>

      <div class="card-subtitle d-flex flex-wrap text-secondary">
        <div class="append-right-8">
@@ -86,15 +63,17 @@ export default {

        <div class="append-right-8">
          <icon name="tag" class="align-middle" />
-          <span v-gl-tooltip.bottom :title="__('Tag')">{{ tag }}</span>
+          <span v-gl-tooltip.bottom :title="__('Tag')">{{ release.tag_name }}</span>
        </div>

        <div class="append-right-4">
          &bull;
-          <span v-gl-tooltip.bottom :title="tooltipTitle(createdAt)">{{ releasedTimeAgo }}</span>
+          <span v-gl-tooltip.bottom :title="tooltipTitle(release.created_at)">{{
+            releasedTimeAgo
+          }}</span>
        </div>

-        <div class="d-flex">
+        <div v-if="hasAuthor" class="d-flex">
          by
          <user-avatar-link
            class="prepend-left-4"
@@ -106,20 +85,25 @@ export default {
        </div>
      </div>

-      <div class="card-text prepend-top-default">
+      <div
+        v-if="assets.links.length || assets.sources.length"
+        Sclass="card-text prepend-top-default"
+      >
        <b>
-          {{ __('Assets') }} <span class="js-assets-count badge badge-pill">{{ assetsCount }}</span>
+          {{ __('Assets') }}
+          <span class="js-assets-count badge badge-pill">{{ assets.count }}</span>
        </b>

-        <ul class="pl-0 mb-0 prepend-top-8 list-unstyled js-assets-list">
-          <li v-for="link in links" :key="link.name" class="append-bottom-8">
+        <ul v-if="assets.links.length" class="pl-0 mb-0 prepend-top-8 list-unstyled js-assets-list">
+          <li v-for="link in assets.links" :key="link.name" class="append-bottom-8">
            <gl-link v-gl-tooltip.bottom :title="__('Download asset')" :href="link.url">
-              <icon name="package" class="align-middle append-right-4" /> {{ link.name }}
+              <icon name="package" class="align-middle append-right-4 align-text-bottom" />
+              {{ link.name }}
            </gl-link>
          </li>
        </ul>

-        <div class="dropdown">
+        <div v-if="assets.sources.length" class="dropdown">
          <button
            type="button"
            class="btn btn-link"
@@ -132,14 +116,14 @@ export default {
          </button>

          <div class="js-sources-dropdown dropdown-menu">
-            <li v-for="asset in sources" :key="asset.url">
+            <li v-for="asset in assets.sources" :key="asset.url">
              <gl-link :href="asset.url">{{ __('Download') }} {{ asset.format }}</gl-link>
            </li>
          </div>
        </div>
      </div>

-      <div class="card-text prepend-top-default"><div v-html="description"></div></div>
+      <div class="card-text prepend-top-default"><div v-html="release.description_html"></div></div>
    </div>
  </div>
 </template>
--- a/app/assets/javascripts/releases/index.js
+++ b/app/assets/javascripts/releases/index.js
+import Vue from 'vue';
+import App from './components/app.vue';
+import createStore from './store';
+
+export default () => {
+  const element = document.getElementById('js-releases-page');
+
+  return new Vue({
+    el: element,
+    store: createStore(),
+    components: {
+      App,
+    },
+    render(createElement) {
+      return createElement('app', {
+        props: {
+          projectId: element.dataset.projectId,
+          documentationLink: element.dataset.documentationPath,
+          illustrationPath: element.dataset.illustrationPath,
+        },
+      });
+    },
+  });
+};
--- a/app/assets/javascripts/releases/store/actions.js
+++ b/app/assets/javascripts/releases/store/actions.js
+import * as types from './mutation_types';
+import createFlash from '~/flash';
+import { __ } from '~/locale';
+import api from '~/api';
+
+/**
+ * Commits a mutation to update the state while the main endpoint is being requested.
+ */
+export const requestReleases = ({ commit }) => commit(types.REQUEST_RELEASES);
+
+/**
+ * Fetches the main endpoint.
+ * Will dispatch requestNamespace action before starting the request.
+ * Will dispatch receiveNamespaceSuccess if the request is successfull
+ * Will dispatch receiveNamesapceError if the request returns an error
+ *
+ * @param {String} projectId
+ */
+export const fetchReleases = ({ dispatch }, projectId) => {
+  dispatch('requestReleases');
+
+  api
+    .releases(projectId)
+    .then(({ data }) => dispatch('receiveReleasesSuccess', data))
+    .catch(() => dispatch('receiveReleasesError'));
+};
+
+export const receiveReleasesSuccess = ({ commit }, data) =>
+  commit(types.RECEIVE_RELEASES_SUCCESS, data);
+
+export const receiveReleasesError = ({ commit }) => {
+  commit(types.RECEIVE_RELEASES_ERROR);
+  createFlash(__('An error occured while fetching the releases. Please try again.'));
+};
+
+// prevent babel-plugin-rewire from generating an invalid default during karma tests
+export default () => {};
--- a/app/assets/javascripts/releases/store/index.js
+++ b/app/assets/javascripts/releases/store/index.js
+import Vue from 'vue';
+import Vuex from 'vuex';
+import state from './state';
+import * as actions from './actions';
+import mutations from './mutations';
+
+Vue.use(Vuex);
+
+export default () =>
+  new Vuex.Store({
+    actions,
+    mutations,
+    state: state(),
+  });
--- a/app/assets/javascripts/releases/store/mutation_types.js
+++ b/app/assets/javascripts/releases/store/mutation_types.js
+export const REQUEST_RELEASES = 'REQUEST_RELEASES';
+export const RECEIVE_RELEASES_SUCCESS = 'RECEIVE_RELEASES_SUCCESS';
+export const RECEIVE_RELEASES_ERROR = 'RECEIVE_RELEASES_ERROR';
--- a/app/assets/javascripts/releases/store/mutations.js
+++ b/app/assets/javascripts/releases/store/mutations.js
+import * as types from './mutation_types';
+
+export default {
+  /**
+   * Sets isLoading to true while the request is being made.
+   * @param {Object} state
+   */
+  [types.REQUEST_RELEASES](state) {
+    state.isLoading = true;
+  },
+
+  /**
+   * Sets isLoading to false.
+   * Sets hasError to false.
+   * Sets the received data
+   * @param {Object} state
+   * @param {Object} data
+   */
+  [types.RECEIVE_RELEASES_SUCCESS](state, data) {
+    state.hasError = false;
+    state.isLoading = false;
+    state.releases = data;
+  },
+
+  /**
+   * Sets isLoading to false.
+   * Sets hasError to true.
+   * Resets the data
+   * @param {Object} state
+   * @param {Object} data
+   */
+  [types.RECEIVE_RELEASES_ERROR](state) {
+    state.isLoading = false;
+    state.releases = [];
+    state.hasError = true;
+  },
+};
--- a/app/assets/javascripts/releases/store/state.js
+++ b/app/assets/javascripts/releases/store/state.js
+export default () => ({
+  isLoading: false,
+  hasError: false,
+  releases: [],
+});
--- a/app/assets/javascripts/right_sidebar.js
+++ b/app/assets/javascripts/right_sidebar.js
@@ -79,11 +79,12 @@ Sidebar.prototype.sidebarToggleClicked = function(e, triggered) {
 Sidebar.prototype.toggleTodo = function(e) {
  var $btnText, $this, $todoLoading, ajaxType, url;
  $this = $(e.currentTarget);
-  ajaxType = $this.attr('data-delete-path') ? 'delete' : 'post';
-  if ($this.attr('data-delete-path')) {
-    url = '' + $this.attr('data-delete-path');
+  ajaxType = $this.data('deletePath') ? 'delete' : 'post';
+
+  if ($this.data('deletePath')) {
+    url = '' + $this.data('deletePath');
  } else {
-    url = '' + $this.data('url');
+    url = '' + $this.data('createPath');
  }

  $this.tooltip('hide');
@@ -119,14 +120,14 @@ Sidebar.prototype.todoUpdateDone = function(data) {
      .removeClass('is-loading')
      .enable()
      .attr('aria-label', $el.data(`${attrPrefix}Text`))
-      .attr('data-delete-path', deletePath)
-      .attr('title', $el.data(`${attrPrefix}Text`));
+      .attr('title', $el.data(`${attrPrefix}Text`))
+      .data('deletePath', deletePath);

    if ($el.hasClass('has-tooltip')) {
      $el.tooltip('_fixTitle');
    }

-    if ($el.data(`${attrPrefix}Icon`)) {
+    if (typeof $el.data('isCollapsed') !== 'undefined') {
      $elText.html($el.data(`${attrPrefix}Icon`));
    } else {
      $elText.text($el.data(`${attrPrefix}Text`));

--- a/app/assets/javascripts/serverless/components/functions.vue
+++ b/app/assets/javascripts/serverless/components/functions.vue
@@ -81,7 +81,7 @@ export default {
          </p>
          <ul>
            <li>Your repository does not have a corresponding <code>serverless.yml</code> file.</li>
-            <li>Your <code>gitlab-ci.yml</code> file is not properly configured.</li>
+            <li>Your <code>.gitlab-ci.yml</code> file is not properly configured.</li>
            <li>
              The functions listed in the <code>serverless.yml</code> file don't match the namespace
              of your cluster.

--- a/app/assets/javascripts/sidebar/stores/sidebar_store.js
+++ b/app/assets/javascripts/sidebar/stores/sidebar_store.js
@@ -71,7 +71,7 @@ export default class SidebarStore {
  }

  findAssignee(findAssignee) {
-    return this.assignees.filter(assignee => assignee.id === findAssignee.id)[0];
+    return this.assignees.find(assignee => assignee.id === findAssignee.id);
  }

  removeAssignee(removeAssignee) {

--- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
 <script>
 import { GlPopover, GlSkeletonLoading } from '@gitlab/ui';
-import { __, sprintf } from '~/locale';
 import UserAvatarImage from '../user_avatar/user_avatar_image.vue';
 import { glEmojiTag } from '../../../emoji';

@@ -28,23 +27,6 @@ export default {
    },
  },
  computed: {
-    jobLine() {
-      if (this.user.bio && this.user.organization) {
-        return sprintf(
-          __('%{bio} at %{organization}'),
-          {
-            bio: this.user.bio,
-            organization: this.user.organization,
-          },
-          false,
-        );
-      } else if (this.user.bio) {
-        return this.user.bio;
-      } else if (this.user.organization) {
-        return this.user.organization;
-      }
-      return null;
-    },
    statusHtml() {
      if (this.user.status.emoji && this.user.status.message) {
        return `${glEmojiTag(this.user.status.emoji)} ${this.user.status.message}`;
@@ -86,7 +68,8 @@ export default {
          <gl-skeleton-loading v-else :lines="1" class="animation-container-small mb-1" />
        </div>
        <div class="text-secondary">
-          {{ jobLine }}
+          <div v-if="user.bio" class="js-bio">{{ user.bio }}</div>
+          <div v-if="user.organization" class="js-organization">{{ user.organization }}</div>
          <gl-skeleton-loading
            v-if="jobInfoIsLoading"
            :lines="1"

--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -24,7 +24,7 @@
    }
  }

-  &:not(.use-csslab) table {
+  table {
    @extend .table;
  }


--- a/app/assets/stylesheets/framework/highlight.scss
+++ b/app/assets/stylesheets/framework/highlight.scss
@@ -42,7 +42,6 @@
    padding: 10px;
    text-align: right;
    float: left;
-    line-height: 1;

    a {
      font-family: $monospace-font;
@@ -69,3 +68,9 @@
    }
  }
 }
+
+// Vertically aligns <table> line numbers (eg. blame view)
+// see https://gitlab.com/gitlab-org/gitlab-ce/issues/54048
+td.line-numbers {
+  line-height: 1;
+}
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -25,8 +25,8 @@
    &.w-100 {
      // after upgrading to Bootstrap 4.2 we can use $modal-header-padding-x here
      // https://github.com/twbs/bootstrap/pull/26976
-      margin-right: -2rem;
-      padding-right: 2rem;
+      margin-right: -28px;
+      padding-right: 28px;
    }
  }


--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -198,7 +198,7 @@ $well-light-text-color: #5b6169;
 $gl-font-size: 14px;
 $gl-font-size-xs: 11px;
 $gl-font-size-small: 12px;
-$gl-font-size-medium: 1.43rem;
+$gl-font-size-medium: 20px;
 $gl-font-size-large: 16px;
 $gl-font-weight-normal: 400;
 $gl-font-weight-bold: 600;

--- a/app/assets/stylesheets/framework/variables_overrides.scss
+++ b/app/assets/stylesheets/framework/variables_overrides.scss
@@ -28,3 +28,9 @@ $popover-border-width: 1px;
 $popover-border-color: $border-color;
 $popover-box-shadow: 0 $border-radius-small $border-radius-default 0 $shadow-color;
 $popover-arrow-outer-color: $shadow-color;
+$h1-font-size: 14px * 2.5;
+$h2-font-size: 14px * 2;
+$h3-font-size: 14px * 1.75;
+$h4-font-size: 14px * 1.5;
+$h5-font-size: 14px * 1.25;
+$h6-font-size: 14px;
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -135,6 +135,7 @@
  .build-loader-animation {
    @include build-loader-animation;
    float: left;
+    padding-left: $gl-padding-8;
  }
 }

@@ -232,6 +233,11 @@
    @extend .d-flex;
    justify-content: space-between;
    align-items: center;
+
+    .trigger-variables-btn {
+      margin-top: -5px;
+      margin-bottom: -5px;
+    }
  }

  .trigger-build-variables {

--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -403,7 +403,7 @@ class ApplicationController < ActionController::Base
  end

  def manifest_import_enabled?
-    Group.supports_nested_groups? && Gitlab::CurrentSettings.import_sources.include?('manifest')
+    Group.supports_nested_objects? && Gitlab::CurrentSettings.import_sources.include?('manifest')
  end

  # U2F (universal 2nd factor) devices need a unique identifier for the application

--- a/app/controllers/concerns/group_tree.rb
+++ b/app/controllers/concerns/group_tree.rb
@@ -32,14 +32,14 @@ module GroupTree
  def filtered_groups_with_ancestors(groups)
    filtered_groups = groups.search(params[:filter]).page(params[:page])

-    if Group.supports_nested_groups?
+    if Group.supports_nested_objects?
      # We find the ancestors by ID of the search results here.
      # Otherwise the ancestors would also have filters applied,
      # which would cause them not to be preloaded.
      #
      # Pagination needs to be applied before loading the ancestors to
      # make sure ancestors are not cut off by pagination.
-      Gitlab::GroupHierarchy.new(Group.where(id: filtered_groups.select(:id)))
+      Gitlab::ObjectHierarchy.new(Group.where(id: filtered_groups.select(:id)))
        .base_and_ancestors
    else
      filtered_groups

--- a/app/controllers/concerns/issuable_actions.rb
+++ b/app/controllers/concerns/issuable_actions.rb
@@ -5,7 +5,6 @@ module IssuableActions
  include Gitlab::Utils::StrongMemoize

  included do
-    before_action :labels, only: [:show, :new, :edit]
    before_action :authorize_destroy_issuable!, only: :destroy
    before_action :authorize_admin_issuable!, only: :bulk_update
  end
@@ -25,7 +24,10 @@ module IssuableActions

  def show
    respond_to do |format|
-      format.html
+      format.html do
+        @issuable_sidebar = serializer.represent(issuable, serializer: 'sidebar') # rubocop:disable Gitlab/ModuleWithInstanceVariables
+      end
+
      format.json do
        render json: serializer.represent(issuable, serializer: params[:serializer])
      end
@@ -168,10 +170,6 @@ module IssuableActions
    end
  end

-  def labels
-    @labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute # rubocop:disable Gitlab/ModuleWithInstanceVariables
-  end
-
  def authorize_destroy_issuable!
    unless can?(current_user, :"destroy_#{issuable.to_ability_name}", issuable)
      return access_denied!

--- a/app/controllers/concerns/lfs_request.rb
+++ b/app/controllers/concerns/lfs_request.rb
@@ -94,6 +94,7 @@ module LfsRequest
  def lfs_upload_access?
    return false unless project.lfs_enabled?
    return false unless has_authentication_ability?(:push_code)
+    return false if limit_exceeded?

    lfs_deploy_token? || can?(user, :push_code, project)
  end
@@ -121,4 +122,9 @@ module LfsRequest
  def has_authentication_ability?(capability)
    (authentication_abilities || []).include?(capability)
  end
+
+  # Overriden in EE
+  def limit_exceeded?
+    false
+  end
 end
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -24,7 +24,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
  end

  def create
-    @key = DeployKeys::CreateService.new(current_user, create_params).execute
+    @key = DeployKeys::CreateService.new(current_user, create_params).execute(project: @project)

    unless @key.valid?
      flash[:alert] = @key.errors.full_messages.join(', ').html_safe

--- a/app/controllers/projects/merge_requests/conflicts_controller.rb
+++ b/app/controllers/projects/merge_requests/conflicts_controller.rb
@@ -8,7 +8,7 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
  def show
    respond_to do |format|
      format.html do
-        labels
+        @issuable_sidebar = serializer.represent(@merge_request, serializer: 'sidebar')
      end

      format.json do
@@ -60,9 +60,15 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
    end
  end

+  private
+
  def authorize_can_resolve_conflicts!
    @conflicts_list = ::MergeRequests::Conflicts::ListService.new(@merge_request)

    return render_404 unless @conflicts_list.can_be_resolved_by?(current_user)
  end
+
+  def serializer
+    MergeRequestSerializer.new(current_user: current_user, project: project)
+  end
 end
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -22,8 +22,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
      format.html
      format.json do
        render json: {
-          html: view_to_html_string("projects/merge_requests/_merge_requests"),
-          labels: @labels.as_json(methods: :text_color)
+          html: view_to_html_string("projects/merge_requests/_merge_requests")
        }
      end
    end
@@ -43,8 +42,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo

        @noteable = @merge_request
        @commits_count = @merge_request.commits_count
-
-        labels
+        @issuable_sidebar = serializer.represent(@merge_request, serializer: 'sidebar')

        set_pipeline_variables


--- a/app/finders/group_descendants_finder.rb
+++ b/app/finders/group_descendants_finder.rb
@@ -112,7 +112,7 @@ class GroupDescendantsFinder
  # rubocop: disable CodeReuse/ActiveRecord
  def ancestors_of_groups(base_for_ancestors)
    group_ids = base_for_ancestors.except(:select, :sort).select(:id)
-    Gitlab::GroupHierarchy.new(Group.where(id: group_ids))
+    Gitlab::ObjectHierarchy.new(Group.where(id: group_ids))
      .base_and_ancestors(upto: parent_group.id)
  end
  # rubocop: enable CodeReuse/ActiveRecord
@@ -132,7 +132,7 @@ class GroupDescendantsFinder
  end

  def subgroups
-    return Group.none unless Group.supports_nested_groups?
+    return Group.none unless Group.supports_nested_objects?

    # When filtering subgroups, we want to find all matches withing the tree of
    # descendants to show to the user
@@ -183,7 +183,7 @@ class GroupDescendantsFinder

  # rubocop: disable CodeReuse/ActiveRecord
  def hierarchy_for_parent
-    @hierarchy ||= Gitlab::GroupHierarchy.new(Group.where(id: parent_group.id))
+    @hierarchy ||= Gitlab::ObjectHierarchy.new(Group.where(id: parent_group.id))
  end
  # rubocop: enable CodeReuse/ActiveRecord
 end
--- a/app/finders/groups_finder.rb
+++ b/app/finders/groups_finder.rb
@@ -46,7 +46,7 @@ class GroupsFinder < UnionFinder
    return [Group.all] if current_user&.full_private_access? && all_available?

    groups = []
-    groups << Gitlab::GroupHierarchy.new(groups_for_ancestors, groups_for_descendants).all_groups if current_user
+    groups << Gitlab::ObjectHierarchy.new(groups_for_ancestors, groups_for_descendants).all_objects if current_user
    groups << Group.unscoped.public_to_user(current_user) if include_public_groups?
    groups << Group.none if groups.empty?
    groups
@@ -66,7 +66,7 @@ class GroupsFinder < UnionFinder
      .groups
      .where('members.access_level >= ?', params[:min_access_level])

-    Gitlab::GroupHierarchy
+    Gitlab::ObjectHierarchy
      .new(groups)
      .base_and_descendants
  end

--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -26,6 +26,18 @@ module ApplicationSettingsHelper
    end
  end

+  def all_protocols_enabled?
+    Gitlab::CurrentSettings.enabled_git_access_protocol.blank?
+  end
+
+  def ssh_enabled?
+    all_protocols_enabled? || enabled_protocol == 'ssh'
+  end
+
+  def http_enabled?
+    all_protocols_enabled? || enabled_protocol == 'http'
+  end
+
  def enabled_project_button(project, protocol)
    case protocol
    when 'ssh'
@@ -218,7 +230,8 @@ module ApplicationSettingsHelper
      :version_check_enabled,
      :web_ide_clientside_preview_enabled,
      :diff_max_patch_bytes,
-      :commit_email_hostname
+      :commit_email_hostname,
+      :protected_ci_variables
    ]
  end


--- a/app/helpers/ci_variables_helper.rb
+++ b/app/helpers/ci_variables_helper.rb
+# frozen_string_literal: true
+
+module CiVariablesHelper
+  def ci_variable_protected_by_default?
+    Gitlab::CurrentSettings.current_application_settings.protected_ci_variables
+  end
+
+  def ci_variable_protected?(variable, only_key_value)
+    if variable && !only_key_value
+      variable.protected
+    else
+      ci_variable_protected_by_default?
+    end
+  end
+end
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -126,7 +126,7 @@ module GroupsHelper
  end

  def supports_nested_groups?
-    Group.supports_nested_groups?
+    Group.supports_nested_objects?
  end

  private

--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -23,30 +23,41 @@ module IssuablesHelper
    end
  end

-  def sidebar_due_date_tooltip_label(issuable)
-    if issuable.due_date
-      "#{_('Due date')}<br />#{due_date_remaining_days(issuable)}"
-    else
-      _('Due date')
-    end
+  def sidebar_milestone_tooltip_label(milestone)
+    return _('Milestone') unless milestone.present?
+
+    [milestone[:title], sidebar_milestone_remaining_days(milestone) || _('Milestone')].join('<br/>')
+  end
+
+  def sidebar_milestone_remaining_days(milestone)
+    due_date_with_remaining_days(milestone[:due_date], milestone[:start_date])
+  end
+
+  def sidebar_due_date_tooltip_label(due_date)
+    [_('Due date'), due_date_with_remaining_days(due_date)].compact.join('<br/>')
  end

-  def due_date_remaining_days(issuable)
-    remaining_days_in_words = remaining_days_in_words(issuable)
+  def due_date_with_remaining_days(due_date, start_date = nil)
+    return unless due_date

-    "#{issuable.due_date.to_s(:medium)} (#{remaining_days_in_words})"
+    "#{due_date.to_s(:medium)} (#{remaining_days_in_words(due_date, start_date)})"
+  end
+
+  def sidebar_label_filter_path(base_path, label_name)
+    query_params = { label_name: [label_name] }.to_query
+
+    "#{base_path}?#{query_params}"
  end

  def multi_label_name(current_labels, default_label)
-    if current_labels && current_labels.any?
-      title = current_labels.first.try(:title)
-      if current_labels.size > 1
-        "#{title} +#{current_labels.size - 1} more"
-      else
-        title
-      end
+    return default_label if current_labels.blank?
+
+    title = current_labels.first.try(:title) || current_labels.first[:title]
+
+    if current_labels.size > 1
+      "#{title} +#{current_labels.size - 1} more"
    else
-      default_label
+      title
    end
  end

@@ -197,19 +208,11 @@ module IssuablesHelper
    output.join.html_safe
  end

-  # rubocop: disable CodeReuse/ActiveRecord
-  def issuable_todo(issuable)
-    if current_user
-      current_user.todos.find_by(target: issuable, state: :pending)
-    end
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
-
  def issuable_labels_tooltip(labels, limit: 5)
    first, last = labels.partition.with_index { |_, i| i < limit  }

    if labels && labels.any?
-      label_names = first.collect(&:name)
+      label_names = first.collect { |label| label.fetch(:title) }
      label_names << "and #{last.size} more" unless last.empty?

      label_names.join(', ')
@@ -356,12 +359,6 @@ module IssuablesHelper
    issuable.model_name.human.downcase
  end

-  def selected_labels
-    Array(params[:label_name]).map do |label_name|
-      Label.new(title: label_name)
-    end
-  end
-
  def has_filter_bar_param?
    finder.class.scalar_params.any? { |p| params[p].present? }
  end
@@ -386,19 +383,20 @@ module IssuablesHelper
    params[:issuable_template] if issuable_templates(issuable).any? { |template| template[:name] == params[:issuable_template] }
  end

-  def issuable_todo_button_data(issuable, todo, is_collapsed)
+  def issuable_todo_button_data(issuable, is_collapsed)
    {
-      todo_text: "Add todo",
-      mark_text: "Mark todo as done",
-      todo_icon: (is_collapsed ? sprite_icon('todo-add') : nil),
-      mark_icon: (is_collapsed ? sprite_icon('todo-done', css_class: 'todo-undone') : nil),
-      issuable_id: issuable.id,
-      issuable_type: issuable.class.name.underscore,
-      url: project_todos_path(@project),
-      delete_path: (dashboard_todo_path(todo) if todo),
-      placement: (is_collapsed ? 'left' : nil),
-      container: (is_collapsed ? 'body' : nil),
-      boundary: 'viewport'
+      todo_text: _('Add todo'),
+      mark_text: _('Mark todo as done'),
+      todo_icon: sprite_icon('todo-add'),
+      mark_icon: sprite_icon('todo-done', css_class: 'todo-undone'),
+      issuable_id: issuable[:id],
+      issuable_type: issuable[:type],
+      create_path: issuable[:create_todo_path],
+      delete_path: issuable.dig(:current_user, :todo, :delete_path),
+      placement: is_collapsed ? 'left' : nil,
+      container: is_collapsed ? 'body' : nil,
+      boundary: 'viewport',
+      is_collapsed: is_collapsed
    }
  end

@@ -418,27 +416,20 @@ module IssuablesHelper
    end
  end

-  def issuable_sidebar_options(issuable, can_edit_issuable)
+  def issuable_sidebar_options(issuable)
    {
-      endpoint: "#{issuable_json_path(issuable)}?serializer=sidebar",
-      toggleSubscriptionEndpoint: toggle_subscription_path(issuable),
-      moveIssueEndpoint: move_namespace_project_issue_path(namespace_id: issuable.project.namespace.to_param, project_id: issuable.project, id: issuable),
-      projectsAutocompleteEndpoint: autocomplete_projects_path(project_id: @project.id),
-      editable: can_edit_issuable,
-      currentUser: UserSerializer.new.represent(current_user),
+      endpoint: "#{issuable[:issuable_json_path]}?serializer=sidebar_extras",
+      toggleSubscriptionEndpoint: issuable[:toggle_subscription_path],
+      moveIssueEndpoint: issuable[:move_issue_path],
+      projectsAutocompleteEndpoint: issuable[:projects_autocomplete_path],
+      editable: issuable.dig(:current_user, :can_edit),
+      currentUser: issuable[:current_user],
      rootPath: root_path,
-      fullPath: @project.full_path
+      fullPath: issuable[:project_full_path]
    }
  end

  def parent
    @project || @group
  end
-
-  def issuable_milestone_tooltip_title(issuable)
-    if issuable.milestone
-      milestone_tooltip = milestone_tooltip_title(issuable.milestone)
-      _('Milestone') + (milestone_tooltip ? ': ' + milestone_tooltip : '')
-    end
-  end
 end
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -114,12 +114,6 @@ module MilestonesHelper
    end
  end

-  def milestone_tooltip_title(milestone)
-    if milestone
-      "#{milestone.title}<br />#{milestone_tooltip_due_date(milestone)}"
-    end
-  end
-
  def milestone_time_for(date, date_type)
    title = date_type == :start ? "Start date" : "End date"

@@ -173,7 +167,7 @@ module MilestonesHelper

  def milestone_tooltip_due_date(milestone)
    if milestone.due_date
-      "#{milestone.due_date.to_s(:medium)} (#{remaining_days_in_words(milestone)})"
+      "#{milestone.due_date.to_s(:medium)} (#{remaining_days_in_words(milestone.due_date, milestone.start_date)})"
    else
      _('Milestone')
    end

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -271,6 +271,20 @@ module ProjectsHelper
    params[:legacy_render] ? { markdown_engine: :redcarpet } : {}
  end

+  def explore_projects_tab?
+    current_page?(explore_projects_path) ||
+      current_page?(trending_explore_projects_path) ||
+      current_page?(starred_explore_projects_path)
+  end
+
+  def show_merge_request_count?(disabled: false, compact_mode: false)
+    !disabled && !compact_mode && Feature.enabled?(:project_list_show_mr_count, default_enabled: true)
+  end
+
+  def show_issue_count?(disabled: false, compact_mode: false)
+    !disabled && !compact_mode && Feature.enabled?(:project_list_show_issue_count, default_enabled: true)
+  end
+
  private

  def get_project_nav_tabs(project, current_user)
@@ -515,20 +529,6 @@ module ProjectsHelper
    end
  end

-  def explore_projects_tab?
-    current_page?(explore_projects_path) ||
-      current_page?(trending_explore_projects_path) ||
-      current_page?(starred_explore_projects_path)
-  end
-
-  def show_merge_request_count?(merge_requests, compact_mode)
-    merge_requests && !compact_mode && Feature.enabled?(:project_list_show_mr_count, default_enabled: true)
-  end
-
-  def show_issue_count?(issues, compact_mode)
-    issues && !compact_mode && Feature.enabled?(:project_list_show_issue_count, default_enabled: true)
-  end
-
  def sidebar_projects_paths
    %w[
      projects#show

--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -56,7 +56,9 @@ module Emails

      @milestone = milestone
      @milestone_url = milestone_url(@milestone)
-      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id, reason))
+      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id, reason).merge({
+        template_name: 'changed_milestone_email'
+      }))
    end

    def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id, reason = nil)

--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -51,7 +51,9 @@ module Emails

      @milestone = milestone
      @milestone_url = milestone_url(@milestone)
-      mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason))
+      mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason).merge({
+        template_name: 'changed_milestone_email'
+      }))
    end

    def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil)

--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -16,6 +16,7 @@ class Notify < BaseMailer
  include Emails::AutoDevops
  include Emails::RemoteMirrors

+  helper MilestonesHelper
  helper MergeRequestsHelper
  helper DiffHelper
  helper BlobHelper

--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -302,7 +302,8 @@ class ApplicationSetting < ActiveRecord::Base
      user_show_add_ssh_key_message: true,
      usage_stats_set_by_user_id: nil,
      diff_max_patch_bytes: Gitlab::Git::Diff::DEFAULT_MAX_PATCH_BYTES,
-      commit_email_hostname: default_commit_email_hostname
+      commit_email_hostname: default_commit_email_hostname,
+      protected_ci_variables: false
    }
  end


--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
@@ -22,49 +22,30 @@ class BroadcastMessage < ActiveRecord::Base
  after_commit :flush_redis_cache

  def self.current
-    raw_messages = Rails.cache.fetch(CACHE_KEY, expires_in: cache_expires_in) do
+    messages = cache.fetch(CACHE_KEY, as: BroadcastMessage, expires_in: cache_expires_in) do
      remove_legacy_cache_key
-      current_and_future_messages.to_json
+      current_and_future_messages
    end

-    messages = decode_messages(raw_messages)
-
    return [] unless messages&.present?

    now_or_future = messages.select(&:now_or_future?)

    # If there are cached entries but none are to be displayed we'll purge the
    # cache so we don't keep running this code all the time.
-    Rails.cache.delete(CACHE_KEY) if now_or_future.empty?
+    cache.expire(CACHE_KEY) if now_or_future.empty?

    now_or_future.select(&:now?)
  end

-  def self.decode_messages(raw_messages)
-    return unless raw_messages&.present?
-
-    message_list = ActiveSupport::JSON.decode(raw_messages)
-
-    return unless message_list.is_a?(Array)
-
-    valid_attr = BroadcastMessage.attribute_names
-
-    message_list.map do |raw|
-      BroadcastMessage.new(raw) if valid_cache_entry?(raw, valid_attr)
-    end.compact
-  rescue ActiveSupport::JSON.parse_error
-  end
-
-  def self.valid_cache_entry?(raw, valid_attr)
-    return false unless raw.is_a?(Hash)
-
-    (raw.keys - valid_attr).empty?
-  end
-
  def self.current_and_future_messages
    where('ends_at > :now', now: Time.zone.now).order_id_asc
  end

+  def self.cache
+    Gitlab::JsonCache.new(cache_key_with_version: false)
+  end
+
  def self.cache_expires_in
    nil
  end
@@ -74,7 +55,7 @@ class BroadcastMessage < ActiveRecord::Base
  # environment a one-shot migration would not work because the cache
  # would be repopulated by a node that has not been upgraded.
  def self.remove_legacy_cache_key
-    Rails.cache.delete(LEGACY_CACHE_KEY)
+    cache.expire(LEGACY_CACHE_KEY)
  end

  def active?
@@ -102,7 +83,7 @@ class BroadcastMessage < ActiveRecord::Base
  end

  def flush_redis_cache
-    Rails.cache.delete(CACHE_KEY)
+    self.class.cache.expire(CACHE_KEY)
    self.class.remove_legacy_cache_key
  end
 end
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -66,7 +66,7 @@ module Ci

    scope :belonging_to_parent_group_of_project, -> (project_id) {
      project_groups = ::Group.joins(:projects).where(projects: { id: project_id })
-      hierarchy_groups = Gitlab::GroupHierarchy.new(project_groups).base_and_ancestors
+      hierarchy_groups = Gitlab::ObjectHierarchy.new(project_groups).base_and_ancestors

      joins(:groups).where(namespaces: { id: hierarchy_groups })
    }

--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -228,7 +228,7 @@ module Clusters
        return unless namespace_changed?

        run_after_commit do
-          ClusterPlatformConfigureWorker.perform_async(cluster_id)
+          ClusterConfigureWorker.perform_async(cluster_id)
        end
      end
    end

--- a/app/models/concerns/avatarable.rb
+++ b/app/models/concerns/avatarable.rb
@@ -43,7 +43,18 @@ module Avatarable
  end

  def avatar_path(only_path: true, size: nil)
-    return unless self[:avatar].present?
+    unless self.try(:id)
+      return uncached_avatar_path(only_path: only_path, size: size)
+    end
+
+    # Cache this avatar path only within the request because avatars in
+    # object storage may be generated with time-limited, signed URLs.
+    key = "#{self.class.name}:#{self.id}:#{only_path}:#{size}"
+    Gitlab::SafeRequestStore[key] ||= uncached_avatar_path(only_path: only_path, size: size)
+  end
+
+  def uncached_avatar_path(only_path: true, size: nil)
+    return unless self.try(:avatar).present?

    asset_host = ActionController::Base.asset_host
    use_asset_host = asset_host.present?

--- a/app/models/concerns/descendant.rb
+++ b/app/models/concerns/descendant.rb
+# frozen_string_literal: true
+
+module Descendant
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def supports_nested_objects?
+      Gitlab::Database.postgresql?
+    end
+  end
+end
--- a/app/models/concerns/discussion_on_diff.rb
+++ b/app/models/concerns/discussion_on_diff.rb
@@ -39,6 +39,7 @@ module DiscussionOnDiff

  # Returns an array of at most 16 highlighted lines above a diff note
  def truncated_diff_lines(highlight: true, diff_limit: nil)
+    return [] unless on_text?
    return [] if diff_line.nil? && first_note.is_a?(LegacyDiffNote)

    diff_limit = [diff_limit, NUMBER_OF_TRUNCATED_DIFF_LINES].compact.min

--- a/app/models/dashboard_group_milestone.rb
+++ b/app/models/dashboard_group_milestone.rb
@@ -5,7 +5,6 @@ class DashboardGroupMilestone < GlobalMilestone

  attr_reader :group_name

-  override :initialize
  def initialize(milestone)
    super(milestone.title, Array(milestone))


--- a/app/models/environment.rb
+++ b/app/models/environment.rb
 # frozen_string_literal: true

 class Environment < ActiveRecord::Base
+  include Gitlab::Utils::StrongMemoize
  # Used to generate random suffixes for the slug
  LETTERS = 'a'..'z'
  NUMBERS = '0'..'9'
@@ -231,7 +232,9 @@ class Environment < ActiveRecord::Base
  end

  def deployment_platform
-    project.deployment_platform(environment: self.name)
+    strong_memoize(:deployment_platform) do
+      project.deployment_platform(environment: self.name)
+    end
  end

  private

--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -10,6 +10,7 @@ class Group < Namespace
  include Referable
  include SelectForProjectAuthorization
  include LoadedInGroupList
+  include Descendant
  include GroupDescendant
  include TokenAuthenticatable
  include WithUploads
@@ -63,10 +64,6 @@ class Group < Namespace
  after_update :path_changed_hook, if: :path_changed?

  class << self
-    def supports_nested_groups?
-      Gitlab::Database.postgresql?
-    end
-
    def sort_by_attribute(method)
      if method == 'storage_size_desc'
        # storage_size is a virtual column so we need to

--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -175,16 +175,16 @@ class Namespace < ActiveRecord::Base

  # Returns all ancestors, self, and descendants of the current namespace.
  def self_and_hierarchy
-    Gitlab::GroupHierarchy
+    Gitlab::ObjectHierarchy
      .new(self.class.where(id: id))
-      .all_groups
+      .all_objects
  end

  # Returns all the ancestors of the current namespaces.
  def ancestors
    return self.class.none unless parent_id

-    Gitlab::GroupHierarchy
+    Gitlab::ObjectHierarchy
      .new(self.class.where(id: parent_id))
      .base_and_ancestors
  end
@@ -192,27 +192,27 @@ class Namespace < ActiveRecord::Base
  # returns all ancestors upto but excluding the given namespace
  # when no namespace is given, all ancestors upto the top are returned
  def ancestors_upto(top = nil, hierarchy_order: nil)
-    Gitlab::GroupHierarchy.new(self.class.where(id: id))
+    Gitlab::ObjectHierarchy.new(self.class.where(id: id))
      .ancestors(upto: top, hierarchy_order: hierarchy_order)
  end

  def self_and_ancestors
    return self.class.where(id: id) unless parent_id

-    Gitlab::GroupHierarchy
+    Gitlab::ObjectHierarchy
      .new(self.class.where(id: id))
      .base_and_ancestors
  end

  # Returns all the descendants of the current namespace.
  def descendants
-    Gitlab::GroupHierarchy
+    Gitlab::ObjectHierarchy
      .new(self.class.where(parent_id: id))
      .base_and_descendants
  end

  def self_and_descendants
-    Gitlab::GroupHierarchy
+    Gitlab::ObjectHierarchy
      .new(self.class.where(id: id))
      .base_and_descendants
  end
@@ -293,7 +293,7 @@ class Namespace < ActiveRecord::Base
  end

  def force_share_with_group_lock_on_descendants
-    return unless Group.supports_nested_groups?
+    return unless Group.supports_nested_objects?

    # We can't use `descendants.update_all` since Rails will throw away the WITH
    # RECURSIVE statement. We also can't use WHERE EXISTS since we can't use
@@ -306,6 +306,7 @@ class Namespace < ActiveRecord::Base
  def write_projects_repository_config
    all_projects.find_each do |project|
      project.write_repository_config
+      project.track_project_repository
    end
  end
 end
--- a/app/models/pool_repository.rb
+++ b/app/models/pool_repository.rb
@@ -18,6 +18,7 @@ class PoolRepository < ActiveRecord::Base
    state :scheduled
    state :ready
    state :failed
+    state :obsolete

    event :schedule do
      transition none: :scheduled
@@ -31,6 +32,10 @@ class PoolRepository < ActiveRecord::Base
      transition all => :failed
    end

+    event :mark_obsolete do
+      transition all => :obsolete
+    end
+
    state all - [:ready] do
      def joinable?
        false
@@ -54,6 +59,12 @@ class PoolRepository < ActiveRecord::Base
        ::ObjectPool::ScheduleJoinWorker.perform_async(pool.id)
      end
    end
+
+    after_transition any => :obsolete do |pool, _|
+      pool.run_after_commit do
+        ::ObjectPool::DestroyWorker.perform_async(pool.id)
+      end
+    end
  end

  def create_object_pool
@@ -71,10 +82,10 @@ class PoolRepository < ActiveRecord::Base
  end

  # This RPC can cause data loss, as not all objects are present the local repository
-  # No execution path yet, will be added through:
-  # https://gitlab.com/gitlab-org/gitaly/issues/1415
-  def delete_repository_alternate(repository)
+  def unlink_repository(repository)
    object_pool.unlink_repository(repository.raw)
+
+    mark_obsolete unless member_projects.where.not(id: repository.project.id).exists?
  end

  def object_pool

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -256,7 +256,7 @@ class Project < ActiveRecord::Base
  # other pipelines, like webide ones, that we won't retrieve
  # if we use this relation.
  has_many :ci_pipelines,
-          -> { Feature.enabled?(:pipeline_ci_sources_only, default_enabled: true) ? ci_sources : all },
+          -> { ci_sources },
          class_name: 'Ci::Pipeline',
          inverse_of: :project
  has_many :stages, class_name: 'Ci::Stage', inverse_of: :project
@@ -570,7 +570,7 @@ class Project < ActiveRecord::Base
  # returns all ancestor-groups upto but excluding the given namespace
  # when no namespace is given, all ancestors upto the top are returned
  def ancestors_upto(top = nil, hierarchy_order: nil)
-    Gitlab::GroupHierarchy.new(Group.where(id: namespace_id))
+    Gitlab::ObjectHierarchy.new(Group.where(id: namespace_id))
      .base_and_ancestors(upto: top, hierarchy_order: hierarchy_order)
  end

@@ -1244,10 +1244,8 @@ class Project < ActiveRecord::Base
  end

  def track_project_repository
-    return unless hashed_storage?(:repository)
-
-    project_repo = project_repository || build_project_repository
-    project_repo.update!(shard_name: repository_storage, disk_path: disk_path)
+    repository = project_repository || build_project_repository
+    repository.update!(shard_name: repository_storage, disk_path: disk_path)
  end

  def create_repository(force: false)
@@ -2004,6 +2002,10 @@ class Project < ActiveRecord::Base
      Feature.enabled?(:object_pools, self)
  end

+  def leave_pool_repository
+    pool_repository&.unlink_repository(repository)
+  end
+
  private

  def create_new_pool_repository

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -709,13 +709,13 @@ class User < ActiveRecord::Base

  # Returns the groups a user is a member of, either directly or through a parent group
  def membership_groups
-    Gitlab::GroupHierarchy.new(groups).base_and_descendants
+    Gitlab::ObjectHierarchy.new(groups).base_and_descendants
  end

  # Returns a relation of groups the user has access to, including their parent
  # and child groups (recursively).
  def all_expanded_groups
-    Gitlab::GroupHierarchy.new(groups).all_groups
+    Gitlab::ObjectHierarchy.new(groups).all_objects
  end

  def expanded_groups_requiring_two_factor_authentication
@@ -1153,7 +1153,7 @@ class User < ActiveRecord::Base
  end

  def manageable_groups
-    Gitlab::GroupHierarchy.new(owned_or_maintainers_groups).base_and_descendants
+    Gitlab::ObjectHierarchy.new(owned_or_maintainers_groups).base_and_descendants
  end

  def namespaces
@@ -1422,6 +1422,10 @@ class User < ActiveRecord::Base
    todos.where(id: ids)
  end

+  def pending_todo_for(target)
+    todos.find_by(target: target, state: :pending)
+  end
+
  # @deprecated
  alias_method :owned_or_masters_groups, :owned_or_maintainers_groups


--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -16,7 +16,7 @@ class GroupPolicy < BasePolicy
  condition(:maintainer) { access_level >= GroupMember::MAINTAINER }
  condition(:reporter) { access_level >= GroupMember::REPORTER }

-  condition(:nested_groups_supported, scope: :global) { Group.supports_nested_groups? }
+  condition(:nested_groups_supported, scope: :global) { Group.supports_nested_objects? }

  condition(:has_parent, scope: :subject) { @subject.has_parent? }
  condition(:share_with_group_locked, scope: :subject) { @subject.share_with_group_lock? }

--- a/app/serializers/entity_date_helper.rb
+++ b/app/serializers/entity_date_helper.rb
@@ -44,14 +44,14 @@ module EntityDateHelper
  # It returns "Upcoming" for upcoming entities
  # If due date is provided, it returns "# days|weeks|months remaining|ago"
  # If start date is provided and elapsed, with no due date, it returns "# days elapsed"
-  def remaining_days_in_words(entity)
-    if entity.try(:expired?)
+  def remaining_days_in_words(due_date, start_date = nil)
+    if due_date&.past?
      content_tag(:strong, 'Past due')
-    elsif entity.try(:upcoming?)
+    elsif start_date&.future?
      content_tag(:strong, 'Upcoming')
-    elsif entity.due_date
-      is_upcoming = (entity.due_date - Date.today).to_i > 0
-      time_ago = time_ago_in_words(entity.due_date)
+    elsif due_date
+      is_upcoming = (due_date - Date.today).to_i > 0
+      time_ago = time_ago_in_words(due_date)

      # https://gitlab.com/gitlab-org/gitlab-ce/issues/49440
      #
@@ -63,8 +63,8 @@ module EntityDateHelper
      remaining_or_ago = is_upcoming ? _("remaining") : _("ago")

      "#{content} #{remaining_or_ago}".html_safe
-    elsif entity.start_date && entity.start_date.past?
-      days = entity.elapsed_days
+    elsif start_date&.past?
+      days = (Date.today - start_date).to_i
      "#{content_tag(:strong, days)} #{'day'.pluralize(days)} elapsed".html_safe
    end
  end

--- a/app/serializers/environment_entity.rb
+++ b/app/serializers/environment_entity.rb
@@ -23,6 +23,10 @@ class EnvironmentEntity < Grape::Entity
    stop_project_environment_path(environment.project, environment)
  end

+  expose :cluster_type, if: ->(environment, _) { cluster_platform_kubernetes? } do |environment|
+    cluster.cluster_type
+  end
+
  expose :terminal_path, if: ->(*) { environment.has_terminals? && can_access_terminal? } do |environment|
    terminal_project_environment_path(environment.project, environment)
  end
@@ -48,4 +52,16 @@ class EnvironmentEntity < Grape::Entity
  def can_access_terminal?
    can?(request.current_user, :create_environment_terminal, environment)
  end
+
+  def cluster_platform_kubernetes?
+    deployment_platform && deployment_platform.is_a?(Clusters::Platforms::Kubernetes)
+  end
+
+  def deployment_platform
+    environment.deployment_platform
+  end
+
+  def cluster
+    deployment_platform.cluster
+  end
 end
--- a/app/serializers/issuable_sidebar_basic_entity.rb
+++ b/app/serializers/issuable_sidebar_basic_entity.rb
+# frozen_string_literal: true
+
+class IssuableSidebarBasicEntity < Grape::Entity
+  include RequestAwareEntity
+
+  expose :id
+  expose :type do |issuable|
+    issuable.to_ability_name
+  end
+  expose :author_id
+  expose :project_id do |issuable|
+    issuable.project.id
+  end
+  expose :discussion_locked
+  expose :reference do |issuable|
+    issuable.to_reference(issuable.project, full: true)
+  end
+
+  expose :milestone, using: ::API::Entities::Milestone
+  expose :labels, using: LabelEntity
+
+  expose :current_user, if: lambda { |_issuable| current_user } do
+    expose :current_user, merge: true, using: API::Entities::UserBasic
+
+    expose :todo, using: IssuableSidebarTodoEntity do |issuable|
+      current_user.pending_todo_for(issuable)
+    end
+
+    expose :can_edit do |issuable|
+      can?(current_user, :"admin_#{issuable.to_ability_name}", issuable.project)
+    end
+
+    expose :can_move do |issuable|
+      issuable.can_move?(current_user)
+    end
+
+    expose :can_admin_label do |issuable|
+      can?(current_user, :admin_label, issuable.project)
+    end
+  end
+
+  expose :issuable_json_path do |issuable|
+    if issuable.is_a?(MergeRequest)
+      project_merge_request_path(issuable.project, issuable.iid, :json)
+    else
+      project_issue_path(issuable.project, issuable.iid, :json)
+    end
+  end
+
+  expose :namespace_path do |issuable|
+    issuable.project.namespace.full_path
+  end
+
+  expose :project_path do |issuable|
+    issuable.project.path
+  end
+
+  expose :project_full_path do |issuable|
+    issuable.project.full_path
+  end
+
+  expose :project_issuables_path do |issuable|
+    project = issuable.project
+    namespace = project.namespace
+
+    if issuable.is_a?(MergeRequest)
+      namespace_project_merge_requests_path(namespace, project)
+    else
+      namespace_project_issues_path(namespace, project)
+    end
+  end
+
+  expose :create_todo_path do |issuable|
+    project_todos_path(issuable.project)
+  end
+
+  expose :project_milestones_path do |issuable|
+    project_milestones_path(issuable.project, :json)
+  end
+
+  expose :project_labels_path do |issuable|
+    project_labels_path(issuable.project, :json, include_ancestor_groups: true)
+  end
+
+  expose :toggle_subscription_path do |issuable|
+    toggle_subscription_path(issuable)
+  end
+
+  expose :move_issue_path do |issuable|
+    move_namespace_project_issue_path(
+      namespace_id: issuable.project.namespace.to_param,
+      project_id: issuable.project,
+      id: issuable
+    )
+  end
+
+  expose :projects_autocomplete_path do |issuable|
+    autocomplete_projects_path(project_id: issuable.project.id)
+  end
+
+  private
+
+  def current_user
+    request.current_user
+  end
+end
--- a/app/serializers/issuable_sidebar_entity.rb
+++ b/app/serializers/issuable_sidebar_entity.rb
 # frozen_string_literal: true

-class IssuableSidebarEntity < Grape::Entity
-  include TimeTrackableEntity
+class IssuableSidebarExtrasEntity < Grape::Entity
  include RequestAwareEntity
+  include TimeTrackableEntity

  expose :participants, using: ::API::Entities::UserBasic do |issuable|
    issuable.participants(request.current_user)

--- a/app/serializers/issuable_sidebar_todo_entity.rb
+++ b/app/serializers/issuable_sidebar_todo_entity.rb
+# frozen_string_literal: true
+
+class IssuableSidebarTodoEntity < Grape::Entity
+  include Gitlab::Routing
+
+  expose :id
+
+  expose :delete_path do |todo|
+    dashboard_todo_path(todo) if todo
+  end
+end
--- a/app/serializers/issue_board_entity.rb
+++ b/app/serializers/issue_board_entity.rb
@@ -37,7 +37,7 @@ class IssueBoardEntity < Grape::Entity
  end

  expose :issue_sidebar_endpoint, if: -> (issue) { issue.project } do |issue|
-    project_issue_path(issue.project, issue, format: :json, serializer: 'sidebar')
+    project_issue_path(issue.project, issue, format: :json, serializer: 'sidebar_extras')
  end

  expose :toggle_subscription_endpoint, if: -> (issue) { issue.project } do |issue|

--- a/app/serializers/issue_serializer.rb
+++ b/app/serializers/issue_serializer.rb
@@ -2,13 +2,15 @@

 class IssueSerializer < BaseSerializer
  # This overrided method takes care of which entity should be used
-  # to serialize the `issue` based on `basic` key in `opts` param.
+  # to serialize the `issue` based on `serializer` key in `opts` param.
  # Hence, `entity` doesn't need to be declared on the class scope.
  def represent(issue, opts = {})
    entity =
      case opts[:serializer]
      when 'sidebar'
-        IssueSidebarEntity
+        IssueSidebarBasicEntity
+      when 'sidebar_extras'
+        IssueSidebarExtrasEntity
      when 'board'
        IssueBoardEntity
      else

--- a/app/serializers/issue_sidebar_basic_entity.rb
+++ b/app/serializers/issue_sidebar_basic_entity.rb
+# frozen_string_literal: true
+
+class IssueSidebarBasicEntity < IssuableSidebarBasicEntity
+  expose :due_date
+  expose :confidential
+end
--- a/app/serializers/issue_sidebar_entity.rb
+++ b/app/serializers/issue_sidebar_entity.rb
 # frozen_string_literal: true

-class IssueSidebarEntity < IssuableSidebarEntity
+class IssueSidebarExtrasEntity < IssuableSidebarExtrasEntity
  expose :assignees, using: API::Entities::UserBasic
 end
--- a/app/serializers/merge_request_basic_entity.rb
+++ b/app/serializers/merge_request_basic_entity.rb
 # frozen_string_literal: true

-class MergeRequestBasicEntity < IssuableSidebarEntity
+class MergeRequestBasicEntity < Grape::Entity
  expose :assignee_id
  expose :merge_status
  expose :merge_error

--- a/app/serializers/merge_request_basic_serializer.rb
+++ b/app/serializers/merge_request_basic_serializer.rb
-# frozen_string_literal: true
-
-class MergeRequestBasicSerializer < BaseSerializer
-  entity MergeRequestBasicEntity
-end
--- a/app/serializers/merge_request_serializer.rb
+++ b/app/serializers/merge_request_serializer.rb
@@ -7,9 +7,14 @@ class MergeRequestSerializer < BaseSerializer
  def represent(merge_request, opts = {})
    entity =
      case opts[:serializer]
-      when 'basic', 'sidebar'
+      when 'sidebar'
+        MergeRequestSidebarBasicEntity
+      when 'sidebar_extras'
+        IssuableSidebarExtrasEntity
+      when 'basic'
        MergeRequestBasicEntity
-      else # It's 'widget'
+      else
+        # fallback to widget for old poll requests without `serializer` set
        MergeRequestWidgetEntity
      end


--- a/app/serializers/merge_request_sidebar_basic_entity.rb
+++ b/app/serializers/merge_request_sidebar_basic_entity.rb
+# frozen_string_literal: true
+
+class MergeRequestSidebarBasicEntity < IssuableSidebarBasicEntity
+  expose :assignee, if: lambda { |issuable| issuable.assignee } do
+    expose :assignee, merge: true, using: API::Entities::UserBasic
+
+    expose :can_merge do |issuable|
+      issuable.can_be_merged_by?(issuable.assignee)
+    end
+  end
+end
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -118,7 +118,7 @@ module Ci
      # Workaround for weird Rails bug, that makes `runner.groups.to_sql` to return `runner_id = NULL`
      groups = ::Group.joins(:runner_namespaces).merge(runner.runner_namespaces)

-      hierarchy_groups = Gitlab::GroupHierarchy.new(groups).base_and_descendants
+      hierarchy_groups = Gitlab::ObjectHierarchy.new(groups).base_and_descendants
      projects = Project.where(namespace_id: hierarchy_groups)
        .with_group_runners_enabled
        .with_builds_enabled

--- a/app/services/clusters/gcp/finalize_creation_service.rb
+++ b/app/services/clusters/gcp/finalize_creation_service.rb
@@ -13,7 +13,7 @@ module Clusters
        configure_kubernetes
        cluster.save!

-        ClusterPlatformConfigureWorker.perform_async(cluster.id)
+        ClusterConfigureWorker.perform_async(cluster.id)

      rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
        log_service_error(e.class.name, provider.id, e.message)

--- a/app/services/deploy_keys/create_service.rb
+++ b/app/services/deploy_keys/create_service.rb
@@ -2,7 +2,7 @@

 module DeployKeys
  class CreateService < Keys::BaseService
-    def execute
+    def execute(project: nil)
      DeployKey.create(params.merge(user: user))
    end
  end

--- a/app/services/groups/nested_create_service.rb
+++ b/app/services/groups/nested_create_service.rb
@@ -18,7 +18,7 @@ module Groups
        return namespace
      end

-      if group_path.include?('/') && !Group.supports_nested_groups?
+      if group_path.include?('/') && !Group.supports_nested_objects?
        raise 'Nested groups are not supported on MySQL'
      end


--- a/app/services/groups/transfer_service.rb
+++ b/app/services/groups/transfer_service.rb
@@ -40,7 +40,7 @@ module Groups

    def ensure_allowed_transfer
      raise_transfer_error(:group_is_already_root) if group_is_already_root?
-      raise_transfer_error(:database_not_supported) unless Group.supports_nested_groups?
+      raise_transfer_error(:database_not_supported) unless Group.supports_nested_objects?
      raise_transfer_error(:same_parent_as_current) if same_parent?
      raise_transfer_error(:invalid_policies) unless valid_policies?
      raise_transfer_error(:namespace_with_same_path) if namespace_with_same_path?

--- a/app/services/projects/after_rename_service.rb
+++ b/app/services/projects/after_rename_service.rb
@@ -81,6 +81,7 @@ module Projects
    def update_repository_configuration
      project.reload_repository!
      project.write_repository_config
+      project.track_project_repository
    end

    def rename_transferred_documents

--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -137,6 +137,8 @@ module Projects
        raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.')
      end

+      project.leave_pool_repository
+
      Project.transaction do
        log_destroy_event
        trash_repositories!

--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -81,7 +81,7 @@ module Projects

        project.old_path_with_namespace = @old_path

-        write_repository_config(@new_path)
+        update_repository_configuration(@new_path)

        execute_system_hooks
      end
@@ -106,8 +106,9 @@ module Projects
      project.save!
    end

-    def write_repository_config(full_path)
+    def update_repository_configuration(full_path)
      project.write_repository_config(gl_full_path: full_path)
+      project.track_project_repository
    end

    def refresh_permissions
@@ -123,7 +124,7 @@ module Projects
      rollback_folder_move
      project.reload
      update_namespace_and_visibility(@old_namespace)
-      write_repository_config(@old_path)
+      update_repository_configuration(@old_path)
    end

    def rollback_folder_move

--- a/app/services/users/refresh_authorized_projects_service.rb
+++ b/app/services/users/refresh_authorized_projects_service.rb
@@ -102,7 +102,7 @@ module Users
    end

    def fresh_authorizations
-      klass = if Group.supports_nested_groups?
+      klass = if Group.supports_nested_objects?
                Gitlab::ProjectAuthorizations::WithNestedGroups
              else
                Gitlab::ProjectAuthorizations::WithoutNestedGroups

--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -49,5 +49,12 @@
        Once that time passes, the jobs will be archived and no longer able to be
        retried. Make it empty to never expire jobs. It has to be no less than 1 day,
        for example: <code>15 days</code>, <code>1 month</code>, <code>2 years</code>.
+    .form-group
+      .form-check
+        = f.check_box :protected_ci_variables, class: 'form-check-input'
+        = f.label :protected_ci_variables, class: 'form-check-label' do
+          = s_('AdminSettings|Environment variables are protected by default')
+      .form-text.text-muted
+        = s_('AdminSettings|When creating a new environment variable it will be protected by default.')

  = f.submit 'Save changes', class: "btn btn-success"
--- a/app/views/ci/variables/_content.html.haml
+++ b/app/views/ci/variables/_content.html.haml
-= _('Variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. You can use variables for passwords, secret keys, or whatever you want.')
+= _('Environment variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. You can use environment variables for passwords, secret keys, or whatever you want.')
--- a/app/views/ci/variables/_header.html.haml
+++ b/app/views/ci/variables/_header.html.haml
+- expanded = local_assigns.fetch(:expanded)
+
+%h4
+  = _('Environment variables')
+  = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'variables'), target: '_blank', rel: 'noopener noreferrer'
+
+%button.btn.btn-default.js-settings-toggle{ type: 'button' }
+  = expanded ? _('Collapse') : _('Expand')
+
+%p.append-bottom-0
+  = render "ci/variables/content"
--- a/app/views/ci/variables/_index.html.haml
+++ b/app/views/ci/variables/_index.html.haml
--- a/app/views/ci/variables/_variable_row.html.haml
+++ b/app/views/ci/variables/_variable_row.html.haml
--- a/app/views/groups/settings/ci_cd/show.html.haml
+++ b/app/views/groups/settings/ci_cd/show.html.haml
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
--- a/app/views/layouts/header/_new_dropdown.haml
+++ b/app/views/layouts/header/_new_dropdown.haml
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
--- a/app/views/notify/_note_email.html.haml
+++ b/app/views/notify/_note_email.html.haml
--- a/app/views/notify/_note_email.text.erb
+++ b/app/views/notify/_note_email.text.erb
--- a/app/views/notify/changed_milestone_merge_request_email.html.haml
+++ b/app/views/notify/changed_milestone_merge_request_email.html.haml
--- a/app/views/notify/changed_milestone_email.text.erb
+++ b/app/views/notify/changed_milestone_email.text.erb
--- a/app/views/notify/changed_milestone_issue_email.html.haml
+++ b/app/views/notify/changed_milestone_issue_email.html.haml
--- a/app/views/notify/changed_milestone_issue_email.text.erb
+++ b/app/views/notify/changed_milestone_issue_email.text.erb
--- a/app/views/notify/changed_milestone_merge_request_email.text.erb
+++ b/app/views/notify/changed_milestone_merge_request_email.text.erb
--- a/app/views/projects/buttons/_clone.html.haml
+++ b/app/views/projects/buttons/_clone.html.haml
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
--- a/app/views/projects/merge_requests/conflicts.html.haml
+++ b/app/views/projects/merge_requests/conflicts.html.haml
--- a/app/views/projects/merge_requests/conflicts/show.html.haml
+++ b/app/views/projects/merge_requests/conflicts/show.html.haml
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
--- a/app/views/projects/releases/index.html.haml
+++ b/app/views/projects/releases/index.html.haml
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
--- a/app/views/shared/_mobile_clone_panel.html.haml
+++ b/app/views/shared/_mobile_clone_panel.html.haml
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
--- a/app/views/shared/issuable/_sidebar_assignees.html.haml
+++ b/app/views/shared/issuable/_sidebar_assignees.html.haml
--- a/app/views/shared/issuable/_sidebar_todo.html.haml
+++ b/app/views/shared/issuable/_sidebar_todo.html.haml
--- a/app/views/shared/issuable/form/_metadata.html.haml
+++ b/app/views/shared/issuable/form/_metadata.html.haml
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
--- a/app/workers/cluster_platform_configure_worker.rb
+++ b/app/workers/cluster_platform_configure_worker.rb
--- a/app/workers/cluster_provision_worker.rb
+++ b/app/workers/cluster_provision_worker.rb
--- a/app/workers/object_pool/destroy_worker.rb
+++ b/app/workers/object_pool/destroy_worker.rb
--- a/app/workers/stuck_merge_jobs_worker.rb
+++ b/app/workers/stuck_merge_jobs_worker.rb
--- a/changelogs/unreleased/19376-post-bfg-cleanup.yml
+++ b/changelogs/unreleased/19376-post-bfg-cleanup.yml
--- a/changelogs/unreleased/1979-redesign-mr-widget-approvals-ce.yml
+++ b/changelogs/unreleased/1979-redesign-mr-widget-approvals-ce.yml
--- a/changelogs/unreleased/20422-hide-ui-variables-by-default.yml
+++ b/changelogs/unreleased/20422-hide-ui-variables-by-default.yml
--- a/changelogs/unreleased/22548-reopen-error-message.yml
+++ b/changelogs/unreleased/22548-reopen-error-message.yml
--- a/changelogs/unreleased/23367-clarify-docs-allow-failure.yml
+++ b/changelogs/unreleased/23367-clarify-docs-allow-failure.yml
--- a/changelogs/unreleased/33705-merge-request-rebase-api.yml
+++ b/changelogs/unreleased/33705-merge-request-rebase-api.yml
--- a/changelogs/unreleased/34758-deployment-cluster.yml
+++ b/changelogs/unreleased/34758-deployment-cluster.yml
--- a/changelogs/unreleased/34758-group-cluster-controller.yml
+++ b/changelogs/unreleased/34758-group-cluster-controller.yml
--- a/changelogs/unreleased/38495-calendar-activities-in-timezone.yml
+++ b/changelogs/unreleased/38495-calendar-activities-in-timezone.yml
--- a/changelogs/unreleased/39849_controller_sorts.yml
+++ b/changelogs/unreleased/39849_controller_sorts.yml
--- a/changelogs/unreleased/40085-add-a-create_merge_request-quick-action.yml
+++ b/changelogs/unreleased/40085-add-a-create_merge_request-quick-action.yml
--- a/changelogs/unreleased/40260-reduce-gitaly-calls-project-pipeline-status.yml
+++ b/changelogs/unreleased/40260-reduce-gitaly-calls-project-pipeline-status.yml
--- a/changelogs/unreleased/40270-remove-gitlab-upgrader-completely.yml
+++ b/changelogs/unreleased/40270-remove-gitlab-upgrader-completely.yml
--- a/changelogs/unreleased/40385-prohibit_impersonation.yml
+++ b/changelogs/unreleased/40385-prohibit_impersonation.yml
--- a/changelogs/unreleased/41766-vuex-store.yml
+++ b/changelogs/unreleased/41766-vuex-store.yml
--- a/changelogs/unreleased/41875-allow-pipelines-to-be-deleted-by-project-owners.yml
+++ b/changelogs/unreleased/41875-allow-pipelines-to-be-deleted-by-project-owners.yml
--- a/changelogs/unreleased/52370-filter-by-none-any-for-labels-in-issues-mrs-boards.yml
+++ b/changelogs/unreleased/52370-filter-by-none-any-for-labels-in-issues-mrs-boards.yml
--- a/changelogs/unreleased/44984-use-serializer-for-issuable-sidebar.yml
+++ b/changelogs/unreleased/44984-use-serializer-for-issuable-sidebar.yml
--- a/changelogs/unreleased/46544-webide-ctrl-enter-commit-shortcut.yml
+++ b/changelogs/unreleased/46544-webide-ctrl-enter-commit-shortcut.yml
--- a/changelogs/unreleased/46950-systemcheck-ruby-version.yml
+++ b/changelogs/unreleased/46950-systemcheck-ruby-version.yml
--- a/changelogs/unreleased/48475-gitlab-pages-settings-regressions.yml
+++ b/changelogs/unreleased/48475-gitlab-pages-settings-regressions.yml
--- a/changelogs/unreleased/48496-merge-request-refactor-does-not-highlight-selected-line.yml
+++ b/changelogs/unreleased/48496-merge-request-refactor-does-not-highlight-selected-line.yml
--- a/changelogs/unreleased/48889-populate-merge_commit_sha.yml
+++ b/changelogs/unreleased/48889-populate-merge_commit_sha.yml
--- a/changelogs/unreleased/49479-hide-unmerged-env-perf-stats.yml
+++ b/changelogs/unreleased/49479-hide-unmerged-env-perf-stats.yml
--- a/changelogs/unreleased/49565-ssh-push-mirroring.yml
+++ b/changelogs/unreleased/49565-ssh-push-mirroring.yml
--- a/changelogs/unreleased/49713-main-navbar-is-broken-in-certain-viewport-widths.yml
+++ b/changelogs/unreleased/49713-main-navbar-is-broken-in-certain-viewport-widths.yml
--- a/changelogs/unreleased/49726-upgrade-helm-to-2-11.yml
+++ b/changelogs/unreleased/49726-upgrade-helm-to-2-11.yml
--- a/changelogs/unreleased/50157-extended-user-centric-tooltips.yml
+++ b/changelogs/unreleased/50157-extended-user-centric-tooltips.yml
--- a/changelogs/unreleased/50264-add-border-around-the-repository-file-tree.yml
+++ b/changelogs/unreleased/50264-add-border-around-the-repository-file-tree.yml
--- a/changelogs/unreleased/50341-cleanup-useless-project-import-attributes.yml
+++ b/changelogs/unreleased/50341-cleanup-useless-project-import-attributes.yml
--- a/changelogs/unreleased/50626-searching-users-by-the-admin-panel-wipes-query-when-using-sort.yml
+++ b/changelogs/unreleased/50626-searching-users-by-the-admin-panel-wipes-query-when-using-sort.yml
--- a/changelogs/unreleased/50839-webide-mr-dropdown-filter.yml
+++ b/changelogs/unreleased/50839-webide-mr-dropdown-filter.yml
--- a/changelogs/unreleased/51029-status-emoji-currently-replaces-avatar-on-mobile.yml
+++ b/changelogs/unreleased/51029-status-emoji-currently-replaces-avatar-on-mobile.yml
--- a/changelogs/unreleased/51061-readme-url-n-1-rpc-call-resolved.yml
+++ b/changelogs/unreleased/51061-readme-url-n-1-rpc-call-resolved.yml
--- a/changelogs/unreleased/51083-fix-move-api.yml
+++ b/changelogs/unreleased/51083-fix-move-api.yml
--- a/changelogs/unreleased/51101-can-add-an-existing-group-member-into-a-group-project-with-new-permissions-but-permissions-are-not-overridde.yml
+++ b/changelogs/unreleased/51101-can-add-an-existing-group-member-into-a-group-project-with-new-permissions-but-permissions-are-not-overridde.yml
--- a/changelogs/unreleased/51122-fix-navigating-discussions.yml
+++ b/changelogs/unreleased/51122-fix-navigating-discussions.yml
--- a/changelogs/unreleased/51138-54026-breadcrumb-subgroups-ellipsis.yml
+++ b/changelogs/unreleased/51138-54026-breadcrumb-subgroups-ellipsis.yml
--- a/changelogs/unreleased/51243-further-improvements-to-project-overview-ui.yml
+++ b/changelogs/unreleased/51243-further-improvements-to-project-overview-ui.yml
--- a/changelogs/unreleased/51259-ci-cd-gitlab-ui-1.yml
+++ b/changelogs/unreleased/51259-ci-cd-gitlab-ui-1.yml
--- a/changelogs/unreleased/51259-ci-cd-tooltips.yml
+++ b/changelogs/unreleased/51259-ci-cd-tooltips.yml
--- a/changelogs/unreleased/51606-expanding-a-diff-while-having-an-open-comment-form-will-always-scroll-down-to-the-comment.yml
+++ b/changelogs/unreleased/51606-expanding-a-diff-while-having-an-open-comment-form-will-always-scroll-down-to-the-comment.yml
--- a/changelogs/unreleased/52828-inconsistency-in-fonts-used-for-branch-name-and-create-from-fields-when-creating-new-branch-from-ui.yml
+++ b/changelogs/unreleased/52828-inconsistency-in-fonts-used-for-branch-name-and-create-from-fields-when-creating-new-branch-from-ui.yml
--- a/changelogs/unreleased/51792-dont-delete-failed-install-pods.yml
+++ b/changelogs/unreleased/51792-dont-delete-failed-install-pods.yml
--- a/changelogs/unreleased/51959-branch-and-tag-name-links.yml
+++ b/changelogs/unreleased/51959-branch-and-tag-name-links.yml
--- a/changelogs/unreleased/52007-frontmatter-toml-json.yml
+++ b/changelogs/unreleased/52007-frontmatter-toml-json.yml
--- a/changelogs/unreleased/52276-jump-to-top-in-merge-request.yml
+++ b/changelogs/unreleased/52276-jump-to-top-in-merge-request.yml
--- a/changelogs/unreleased/52285-omniauth-jwt-ppk-support.yml
+++ b/changelogs/unreleased/52285-omniauth-jwt-ppk-support.yml
--- a/changelogs/unreleased/52371-filter-by-none-any-for-labels-in-issues-mrs-api.yml
+++ b/changelogs/unreleased/52371-filter-by-none-any-for-labels-in-issues-mrs-api.yml
--- a/changelogs/unreleased/52371-removes-patially-matching-no-label-and-makes-it-case-insensitive.yml
+++ b/changelogs/unreleased/52371-removes-patially-matching-no-label-and-makes-it-case-insensitive.yml
--- a/changelogs/unreleased/52385-search-bar-for-dashboard-list.yml
+++ b/changelogs/unreleased/52385-search-bar-for-dashboard-list.yml
--- a/changelogs/unreleased/52453-show-subgroups-in-group-create-issue.yml
+++ b/changelogs/unreleased/52453-show-subgroups-in-group-create-issue.yml
--- a/changelogs/unreleased/52620-fix-loader-animation-alignment.yml
+++ b/changelogs/unreleased/52620-fix-loader-animation-alignment.yml
--- a/changelogs/unreleased/52712-further-ui-improvements-to-profile-overview-tab.yml
+++ b/changelogs/unreleased/52712-further-ui-improvements-to-profile-overview-tab.yml
--- a/changelogs/unreleased/52774-fix-svgs-in-ie-11.yml
+++ b/changelogs/unreleased/52774-fix-svgs-in-ie-11.yml
--- a/changelogs/unreleased/52940-fix-internal-email-pattern-not-respected.yml
+++ b/changelogs/unreleased/52940-fix-internal-email-pattern-not-respected.yml
--- a/changelogs/unreleased/53289-update-haml_lint-to-0-28-0.yml
+++ b/changelogs/unreleased/53289-update-haml_lint-to-0-28-0.yml
--- a/changelogs/unreleased/53290-incorrect-project-list-order-select-default-label.yml
+++ b/changelogs/unreleased/53290-incorrect-project-list-order-select-default-label.yml
--- a/changelogs/unreleased/53291-update-ffaker-to-2-10-0.yml
+++ b/changelogs/unreleased/53291-update-ffaker-to-2-10-0.yml
--- a/changelogs/unreleased/53326-improve-issues-empty-state.yml
+++ b/changelogs/unreleased/53326-improve-issues-empty-state.yml
--- a/changelogs/unreleased/53400-unstar-icon-button-is-misaligned.yml
+++ b/changelogs/unreleased/53400-unstar-icon-button-is-misaligned.yml
--- a/changelogs/unreleased/53578-fe-deployment-status.yml
+++ b/changelogs/unreleased/53578-fe-deployment-status.yml
--- a/changelogs/unreleased/53626-update-config-map-on-install-retry.yml
+++ b/changelogs/unreleased/53626-update-config-map-on-install-retry.yml
--- a/changelogs/unreleased/53640-follow-up-from-resolve-redesign-activity-feed.yml
+++ b/changelogs/unreleased/53640-follow-up-from-resolve-redesign-activity-feed.yml
--- a/changelogs/unreleased/53659-use-padded-key-for-gcm-ciphers.yml
+++ b/changelogs/unreleased/53659-use-padded-key-for-gcm-ciphers.yml
--- a/changelogs/unreleased/53700-hashed-storagemigration.yml
+++ b/changelogs/unreleased/53700-hashed-storagemigration.yml
--- a/changelogs/unreleased/53728-warn-in-web-editor-when-user-navigates-away.yml
+++ b/changelogs/unreleased/53728-warn-in-web-editor-when-user-navigates-away.yml
--- a/changelogs/unreleased/53816-empty-label-menu-if-not-logged-in.yml
+++ b/changelogs/unreleased/53816-empty-label-menu-if-not-logged-in.yml
--- a/changelogs/unreleased/53874-navbar-lowres.yml
+++ b/changelogs/unreleased/53874-navbar-lowres.yml
--- a/changelogs/unreleased/53933-include-dates-in-milestone-change-email.yml
+++ b/changelogs/unreleased/53933-include-dates-in-milestone-change-email.yml
--- a/changelogs/unreleased/53988-remove-notes-index-on-updated-at.yml
+++ b/changelogs/unreleased/53988-remove-notes-index-on-updated-at.yml
--- a/changelogs/unreleased/53992-add-events-index-on-project-id-and-created-at.yml
+++ b/changelogs/unreleased/53992-add-events-index-on-project-id-and-created-at.yml
--- a/changelogs/unreleased/53994-add-missing-ci_builds-partial-indices.yml
+++ b/changelogs/unreleased/53994-add-missing-ci_builds-partial-indices.yml
--- a/changelogs/unreleased/54004-update-asana-to-0-8-1.yml
+++ b/changelogs/unreleased/54004-update-asana-to-0-8-1.yml
--- a/changelogs/unreleased/54010-update-asciidoctor-to-1-5-8.yml
+++ b/changelogs/unreleased/54010-update-asciidoctor-to-1-5-8.yml
--- a/changelogs/unreleased/54015-Markdown-Editor-improve-Cursor-placement.yml
+++ b/changelogs/unreleased/54015-Markdown-Editor-improve-Cursor-placement.yml
--- a/changelogs/unreleased/54021-empty-button.yml
+++ b/changelogs/unreleased/54021-empty-button.yml
--- a/changelogs/unreleased/54032-reply-shortcut-only-discussion-text.yml
+++ b/changelogs/unreleased/54032-reply-shortcut-only-discussion-text.yml
--- a/changelogs/unreleased/54048-Line-numbers-are-misaligned-in-file-blame-view.yml
+++ b/changelogs/unreleased/54048-Line-numbers-are-misaligned-in-file-blame-view.yml
--- a/changelogs/unreleased/54093-the-default_value_for-gem-doesn-t-handle-actioncontroller-parameters-correctly.yml
+++ b/changelogs/unreleased/54093-the-default_value_for-gem-doesn-t-handle-actioncontroller-parameters-correctly.yml
--- a/changelogs/unreleased/54160-use-reports-syntax-for-sast-in-auto-devops.yml
+++ b/changelogs/unreleased/54160-use-reports-syntax-for-sast-in-auto-devops.yml
--- a/changelogs/unreleased/54201-update-rack-to-2-0-6.yml
+++ b/changelogs/unreleased/54201-update-rack-to-2-0-6.yml
--- a/changelogs/unreleased/54218-fix-mergeUrlParams.yml
+++ b/changelogs/unreleased/54218-fix-mergeUrlParams.yml
--- a/changelogs/unreleased/54336-include-tags-into-pipeline-detail-view.yml
+++ b/changelogs/unreleased/54336-include-tags-into-pipeline-detail-view.yml
--- a/changelogs/unreleased/54391-tag.yml
+++ b/changelogs/unreleased/54391-tag.yml
--- a/changelogs/unreleased/54407-fix-limited-intersection-observers.yml
+++ b/changelogs/unreleased/54407-fix-limited-intersection-observers.yml
--- a/changelogs/unreleased/54571-runner-tags.yml
+++ b/changelogs/unreleased/54571-runner-tags.yml
--- a/changelogs/unreleased/54626-able-to-download-a-single-archive-file-with-api-by-ref-name.yml
+++ b/changelogs/unreleased/54626-able-to-download-a-single-archive-file-with-api-by-ref-name.yml
--- a/changelogs/unreleased/54648-fix-order-by-dropdown-tablet-screens.yml
+++ b/changelogs/unreleased/54648-fix-order-by-dropdown-tablet-screens.yml
--- a/changelogs/unreleased/54814-sidebar-styling-updates.yml
+++ b/changelogs/unreleased/54814-sidebar-styling-updates.yml
--- a/changelogs/unreleased/54826-use-read_repository-scope-on-read-only-files-endpoints.yml
+++ b/changelogs/unreleased/54826-use-read_repository-scope-on-read-only-files-endpoints.yml
--- a/changelogs/unreleased/54857-fix-templates-path-traversal.yml
+++ b/changelogs/unreleased/54857-fix-templates-path-traversal.yml
--- a/changelogs/unreleased/54953-fix-commit_email_hostname-accessor-in-fake_application_settings.yml
+++ b/changelogs/unreleased/54953-fix-commit_email_hostname-accessor-in-fake_application_settings.yml
--- a/changelogs/unreleased/54975-fix-web-hooks-rake-task.yml
+++ b/changelogs/unreleased/54975-fix-web-hooks-rake-task.yml
--- a/changelogs/unreleased/55103-hide-group-cluster-features.yml
+++ b/changelogs/unreleased/55103-hide-group-cluster-features.yml
--- a/changelogs/unreleased/55104-frozenerror-can-t-modify-frozen-string.yml
+++ b/changelogs/unreleased/55104-frozenerror-can-t-modify-frozen-string.yml
--- a/changelogs/unreleased/55116-runtimeerror-can-t-modify-frozen-string.yml
+++ b/changelogs/unreleased/55116-runtimeerror-can-t-modify-frozen-string.yml
--- a/changelogs/unreleased/55138-fix-mr-discussions-count.yml
+++ b/changelogs/unreleased/55138-fix-mr-discussions-count.yml
--- a/changelogs/unreleased/55183-frozenerror-can-t-modify-frozen-string-in-app-mailers-notify-rb.yml
+++ b/changelogs/unreleased/55183-frozenerror-can-t-modify-frozen-string-in-app-mailers-notify-rb.yml
--- a/changelogs/unreleased/55293-split-bio-into-individual-line-in-extended-user-tooltips.yml
+++ b/changelogs/unreleased/55293-split-bio-into-individual-line-in-extended-user-tooltips.yml
--- a/changelogs/unreleased/55402-broken-master-karma-test-failing-in-spec-javascripts-boards-components-issue_due_date_spec-js.yml
+++ b/changelogs/unreleased/55402-broken-master-karma-test-failing-in-spec-javascripts-boards-components-issue_due_date_spec-js.yml
--- a/changelogs/unreleased/_acet-fix-flash-styling.yml
+++ b/changelogs/unreleased/_acet-fix-flash-styling.yml
--- a/changelogs/unreleased/ab-approximate-counts.yml
+++ b/changelogs/unreleased/ab-approximate-counts.yml
--- a/changelogs/unreleased/added-glob-for-ci-changes-detection.yml
+++ b/changelogs/unreleased/added-glob-for-ci-changes-detection.yml
--- a/changelogs/unreleased/an-gitaly-version-0-133-0.yml
+++ b/changelogs/unreleased/an-gitaly-version-0-133-0.yml
--- a/changelogs/unreleased/ashmckenzie-hmac-token-decode-and-tests.yml
+++ b/changelogs/unreleased/ashmckenzie-hmac-token-decode-and-tests.yml
--- a/changelogs/unreleased/auto_devops_kubernetes_active.yml
+++ b/changelogs/unreleased/auto_devops_kubernetes_active.yml
--- a/changelogs/unreleased/blackst0ne-add-discord-service.yml
+++ b/changelogs/unreleased/blackst0ne-add-discord-service.yml
--- a/changelogs/unreleased/bump_gpgme_gem.yml
+++ b/changelogs/unreleased/bump_gpgme_gem.yml
--- a/changelogs/unreleased/bvl-use-shell-writeref.yml
+++ b/changelogs/unreleased/bvl-use-shell-writeref.yml
--- a/changelogs/unreleased/ce-52811-fix_namespaces_api_routing.yml
+++ b/changelogs/unreleased/ce-52811-fix_namespaces_api_routing.yml
--- a/changelogs/unreleased/ce-54109-fix_user_by_any_email.yml
+++ b/changelogs/unreleased/ce-54109-fix_user_by_any_email.yml
--- a/changelogs/unreleased/cert-manager-email.yml
+++ b/changelogs/unreleased/cert-manager-email.yml
--- a/changelogs/unreleased/certmanager-temp.yml
+++ b/changelogs/unreleased/certmanager-temp.yml
--- a/changelogs/unreleased/check-if-fetched-data-does-is-complete.yml
+++ b/changelogs/unreleased/check-if-fetched-data-does-is-complete.yml
--- a/changelogs/unreleased/commit-badge-style-fix.yml
+++ b/changelogs/unreleased/commit-badge-style-fix.yml
--- a/changelogs/unreleased/define-default-value-for-only-except-keys.yml
+++ b/changelogs/unreleased/define-default-value-for-only-except-keys.yml
--- a/changelogs/unreleased/depracated-migration-inheritance.yml
+++ b/changelogs/unreleased/depracated-migration-inheritance.yml
--- a/changelogs/unreleased/deprecated-instance-find.yml
+++ b/changelogs/unreleased/deprecated-instance-find.yml
--- a/changelogs/unreleased/diff-expand-commit-file.yml
+++ b/changelogs/unreleased/diff-expand-commit-file.yml
--- a/changelogs/unreleased/diff-fix-expanding.yml
+++ b/changelogs/unreleased/diff-fix-expanding.yml
--- a/changelogs/unreleased/discussion-perf-improvement.yml
+++ b/changelogs/unreleased/discussion-perf-improvement.yml
--- a/changelogs/unreleased/dm-batch-loader-key.yml
+++ b/changelogs/unreleased/dm-batch-loader-key.yml
--- a/changelogs/unreleased/ide-open-all-mr-files.yml
+++ b/changelogs/unreleased/ide-open-all-mr-files.yml
--- a/changelogs/unreleased/dm-remove-prune-web-hook-logs-worker.yml
+++ b/changelogs/unreleased/dm-remove-prune-web-hook-logs-worker.yml
--- a/changelogs/unreleased/docs-minor-aws-fixes.yml
+++ b/changelogs/unreleased/docs-minor-aws-fixes.yml
--- a/changelogs/unreleased/document-raw-snippet-api.yml
+++ b/changelogs/unreleased/document-raw-snippet-api.yml
--- a/changelogs/unreleased/drop-default-value-status-deployments.yml
+++ b/changelogs/unreleased/drop-default-value-status-deployments.yml
--- a/changelogs/unreleased/drop-gcp-cluster-table.yml
+++ b/changelogs/unreleased/drop-gcp-cluster-table.yml
--- a/changelogs/unreleased/expose-mr-pipeline-variables.yml
+++ b/changelogs/unreleased/expose-mr-pipeline-variables.yml
--- a/changelogs/unreleased/feature-option-to-make-variables-protected.yml
+++ b/changelogs/unreleased/feature-option-to-make-variables-protected.yml
--- a/changelogs/unreleased/fix-55448.yml
+++ b/changelogs/unreleased/fix-55448.yml
--- a/changelogs/unreleased/fix-gb-encrypt-ci-build-token.yml
+++ b/changelogs/unreleased/fix-gb-encrypt-ci-build-token.yml
--- a/changelogs/unreleased/fix-gb-encrypt-runners-tokens.yml
+++ b/changelogs/unreleased/fix-gb-encrypt-runners-tokens.yml
--- a/changelogs/unreleased/fix-gb-improve-timeout-inputs-help-sections.yml
+++ b/changelogs/unreleased/fix-gb-improve-timeout-inputs-help-sections.yml
--- a/changelogs/unreleased/fix-mr-widget-unrelated-deployment-status.yml
+++ b/changelogs/unreleased/fix-mr-widget-unrelated-deployment-status.yml
--- a/changelogs/unreleased/fix-multiple-comments-shade-overlap.yml
+++ b/changelogs/unreleased/fix-multiple-comments-shade-overlap.yml
--- a/changelogs/unreleased/fj-47494-upgrade-git-to-2-18-0.yml
+++ b/changelogs/unreleased/fj-47494-upgrade-git-to-2-18-0.yml
--- a/changelogs/unreleased/fj-clean-content-headers.yml
+++ b/changelogs/unreleased/fj-clean-content-headers.yml
--- a/changelogs/unreleased/fj-force-content-disposition.yml
+++ b/changelogs/unreleased/fj-force-content-disposition.yml
--- a/changelogs/unreleased/force-reload-arguments-1.yml
+++ b/changelogs/unreleased/force-reload-arguments-1.yml
--- a/changelogs/unreleased/frozen-string-lib-gitlab-even-even-even-more.yml
+++ b/changelogs/unreleased/frozen-string-lib-gitlab-even-even-even-more.yml
--- a/changelogs/unreleased/frozen-string-lib-gitlab-even-even-more.yml
+++ b/changelogs/unreleased/frozen-string-lib-gitlab-even-even-more.yml
--- a/changelogs/unreleased/frozen-string-lib-gitlab-even-more.yml
+++ b/changelogs/unreleased/frozen-string-lib-gitlab-even-more.yml
--- a/changelogs/unreleased/frozen-string-lib-gitlab-more.yml
+++ b/changelogs/unreleased/frozen-string-lib-gitlab-more.yml
--- a/changelogs/unreleased/frozen-string-lib-rubocop.yml
+++ b/changelogs/unreleased/frozen-string-lib-rubocop.yml
--- a/changelogs/unreleased/gt-add-top-padding-for-nested-environment-items-loading-icon.yml
+++ b/changelogs/unreleased/gt-add-top-padding-for-nested-environment-items-loading-icon.yml
--- a/changelogs/unreleased/gt-align-issue-status-and-confidential-icon.yml
+++ b/changelogs/unreleased/gt-align-issue-status-and-confidential-icon.yml
--- a/changelogs/unreleased/gt-change-breadcrumb-title-for-contribution-charts.yml
+++ b/changelogs/unreleased/gt-change-breadcrumb-title-for-contribution-charts.yml
--- a/changelogs/unreleased/gt-change-container-width-for-project-import.yml
+++ b/changelogs/unreleased/gt-change-container-width-for-project-import.yml
--- a/changelogs/unreleased/gt-externalize-app-views-invites.yml
+++ b/changelogs/unreleased/gt-externalize-app-views-invites.yml
--- a/changelogs/unreleased/gt-externalize-app-views-project-runners.yml
+++ b/changelogs/unreleased/gt-externalize-app-views-project-runners.yml
--- a/changelogs/unreleased/gt-externalize-app-views-snippets.yml
+++ b/changelogs/unreleased/gt-externalize-app-views-snippets.yml
--- a/changelogs/unreleased/gt-fix-typo-in-notebook-props.yml
+++ b/changelogs/unreleased/gt-fix-typo-in-notebook-props.yml
--- a/changelogs/unreleased/gt-fix-typos-in-lib.yml
+++ b/changelogs/unreleased/gt-fix-typos-in-lib.yml
--- a/changelogs/unreleased/gt-remove-instances-of-extend-monospace.yml
+++ b/changelogs/unreleased/gt-remove-instances-of-extend-monospace.yml
--- a/changelogs/unreleased/gt-remove-unused-project-method.yml
+++ b/changelogs/unreleased/gt-remove-unused-project-method.yml
--- a/changelogs/unreleased/gt-rename-diffs-store-variable.yml
+++ b/changelogs/unreleased/gt-rename-diffs-store-variable.yml
--- a/changelogs/unreleased/gt-show-primary-button-when-all-labels-are-prioritized.yml
+++ b/changelogs/unreleased/gt-show-primary-button-when-all-labels-are-prioritized.yml
--- a/changelogs/unreleased/gt-update-env-metrics-empty-state.yml
+++ b/changelogs/unreleased/gt-update-env-metrics-empty-state.yml
--- a/changelogs/unreleased/gt-use-gl-tooltip-directive.yml
+++ b/changelogs/unreleased/gt-use-gl-tooltip-directive.yml
--- a/changelogs/unreleased/ignore-failed-pipeline-creation-on-pipeline-schedule.yml
+++ b/changelogs/unreleased/ignore-failed-pipeline-creation-on-pipeline-schedule.yml
--- a/changelogs/unreleased/improve_auto_devops_migration_debug.yml
+++ b/changelogs/unreleased/improve_auto_devops_migration_debug.yml
--- a/changelogs/unreleased/include-new-link-in-breadcrumb.yml
+++ b/changelogs/unreleased/include-new-link-in-breadcrumb.yml
--- a/changelogs/unreleased/jivl-add-empty-state-graphs-null-values.yml
+++ b/changelogs/unreleased/jivl-add-empty-state-graphs-null-values.yml
--- a/changelogs/unreleased/jupyter-tls.yml
+++ b/changelogs/unreleased/jupyter-tls.yml
--- a/changelogs/unreleased/kcj-add-philosophy.yml
+++ b/changelogs/unreleased/kcj-add-philosophy.yml
--- a/changelogs/unreleased/kubernetes-http-response-code.yml
+++ b/changelogs/unreleased/kubernetes-http-response-code.yml
--- a/changelogs/unreleased/legacy_fallback_for_project_clusters_only.yml
+++ b/changelogs/unreleased/legacy_fallback_for_project_clusters_only.yml
--- a/changelogs/unreleased/lock-trace-writes.yml
+++ b/changelogs/unreleased/lock-trace-writes.yml
--- a/changelogs/unreleased/fix-deadlock-chunked-io.yml
+++ b/changelogs/unreleased/fix-deadlock-chunked-io.yml
--- a/changelogs/unreleased/mg-fix-knative-application-row.yml
+++ b/changelogs/unreleased/mg-fix-knative-application-row.yml
--- a/changelogs/unreleased/mk-avoid-read-only-error.yml
+++ b/changelogs/unreleased/mk-avoid-read-only-error.yml
--- a/changelogs/unreleased/move-group-issues-search-cte-up-the-chain.yml
+++ b/changelogs/unreleased/move-group-issues-search-cte-up-the-chain.yml
--- a/changelogs/unreleased/mr-file-tree-commit.yml
+++ b/changelogs/unreleased/mr-file-tree-commit.yml
--- a/changelogs/unreleased/mr-origin-23218.yml
+++ b/changelogs/unreleased/mr-origin-23218.yml
--- a/changelogs/unreleased/mr-pipelines-2.yml
+++ b/changelogs/unreleased/mr-pipelines-2.yml
--- a/changelogs/unreleased/mr-sticky-headers.yml
+++ b/changelogs/unreleased/mr-sticky-headers.yml
--- a/changelogs/unreleased/mr-tree-filter-path-name.yml
+++ b/changelogs/unreleased/mr-tree-filter-path-name.yml
--- a/changelogs/unreleased/multiple-diff-line-discussions-fix.yml
+++ b/changelogs/unreleased/multiple-diff-line-discussions-fix.yml
--- a/changelogs/unreleased/non-webkit-scrollbar-fixing.yml
+++ b/changelogs/unreleased/non-webkit-scrollbar-fixing.yml
--- a/changelogs/unreleased/optimise-job-request.yml
+++ b/changelogs/unreleased/optimise-job-request.yml
--- a/changelogs/unreleased/order-of-notification-settings.yml
+++ b/changelogs/unreleased/order-of-notification-settings.yml
--- a/changelogs/unreleased/osw-fallback-on-blank-refs.yml
+++ b/changelogs/unreleased/osw-fallback-on-blank-refs.yml
--- a/changelogs/unreleased/osw-fix-grouping-by-file-path.yml
+++ b/changelogs/unreleased/osw-fix-grouping-by-file-path.yml
--- a/changelogs/unreleased/osw-remove-unnused-data-from-diff-discussions.yml
+++ b/changelogs/unreleased/osw-remove-unnused-data-from-diff-discussions.yml
--- a/changelogs/unreleased/osw-update-mr-metrics-with-events-data.yml
+++ b/changelogs/unreleased/osw-update-mr-metrics-with-events-data.yml
--- a/changelogs/unreleased/profile-fixing.yml
+++ b/changelogs/unreleased/profile-fixing.yml
--- a/changelogs/unreleased/project_identicon_fix.yml
+++ b/changelogs/unreleased/project_identicon_fix.yml
--- a/changelogs/unreleased/rails5-active-record-class-value.yml
+++ b/changelogs/unreleased/rails5-active-record-class-value.yml
--- a/changelogs/unreleased/rails5-deprecation-render-nothing.yml
+++ b/changelogs/unreleased/rails5-deprecation-render-nothing.yml
--- a/changelogs/unreleased/rails5-env-deprecated.yml
+++ b/changelogs/unreleased/rails5-env-deprecated.yml
--- a/changelogs/unreleased/remove-blob-search-limit.yml
+++ b/changelogs/unreleased/remove-blob-search-limit.yml
--- a/changelogs/unreleased/remove-deployment-status-hack-from-backend.yml
+++ b/changelogs/unreleased/remove-deployment-status-hack-from-backend.yml
--- a/changelogs/unreleased/remove-duplicate-primary-button-in-dashboard-snippets.yml
+++ b/changelogs/unreleased/remove-duplicate-primary-button-in-dashboard-snippets.yml
--- a/changelogs/unreleased/render-text-deprecated.yml
+++ b/changelogs/unreleased/render-text-deprecated.yml
--- a/changelogs/unreleased/retryable_create_or_update_kubernetes_namespace.yml
+++ b/changelogs/unreleased/retryable_create_or_update_kubernetes_namespace.yml
--- a/changelogs/unreleased/revert-1cccfca1.yml
+++ b/changelogs/unreleased/revert-1cccfca1.yml
--- a/changelogs/unreleased/rs-cherry-pick-api.yml
+++ b/changelogs/unreleased/rs-cherry-pick-api.yml
--- a/changelogs/unreleased/security-182-update-workhorse.yml
+++ b/changelogs/unreleased/security-182-update-workhorse.yml
--- a/changelogs/unreleased/security-2717-xss-username-autocomplete.yml
+++ b/changelogs/unreleased/security-2717-xss-username-autocomplete.yml
--- a/changelogs/unreleased/security-2736-prometheus-ssrf.yml
+++ b/changelogs/unreleased/security-2736-prometheus-ssrf.yml
--- a/changelogs/unreleased/security-2754-fix-lfs-import.yml
+++ b/changelogs/unreleased/security-2754-fix-lfs-import.yml
--- a/changelogs/unreleased/security-bvl-exposure-in-commits-list.yml
+++ b/changelogs/unreleased/security-bvl-exposure-in-commits-list.yml
--- a/changelogs/unreleased/security-email-change-notification.yml
+++ b/changelogs/unreleased/security-email-change-notification.yml
--- a/changelogs/unreleased/security-fix-pat-web-access.yml
+++ b/changelogs/unreleased/security-fix-pat-web-access.yml
--- a/changelogs/unreleased/security-fix-uri-xss-applications.yml
+++ b/changelogs/unreleased/security-fix-uri-xss-applications.yml
--- a/changelogs/unreleased/security-fix-webhook-ssrf-ipv6.yml
+++ b/changelogs/unreleased/security-fix-webhook-ssrf-ipv6.yml
--- a/changelogs/unreleased/security-fj-crlf-injection.yml
+++ b/changelogs/unreleased/security-fj-crlf-injection.yml
--- a/changelogs/unreleased/security-guest-comments.yml
+++ b/changelogs/unreleased/security-guest-comments.yml
--- a/changelogs/unreleased/security-guest-comments_2.yml
+++ b/changelogs/unreleased/security-guest-comments_2.yml
--- a/changelogs/unreleased/security-issue_51301.yml
+++ b/changelogs/unreleased/security-issue_51301.yml
--- a/changelogs/unreleased/security-mermaid-xss.yml
+++ b/changelogs/unreleased/security-mermaid-xss.yml
--- a/changelogs/unreleased/security-pages-toctou-race.yml
+++ b/changelogs/unreleased/security-pages-toctou-race.yml
--- a/changelogs/unreleased/security-private-group.yml
+++ b/changelogs/unreleased/security-private-group.yml
--- a/changelogs/unreleased/security-stored-xss-for-environments.yml
+++ b/changelogs/unreleased/security-stored-xss-for-environments.yml
--- a/changelogs/unreleased/security-xss-in-markdown-following-unrecognized-html-element.yml
+++ b/changelogs/unreleased/security-xss-in-markdown-following-unrecognized-html-element.yml
--- a/changelogs/unreleased/set-kubeconfig-nil-when-token-nil.yml
+++ b/changelogs/unreleased/set-kubeconfig-nil-when-token-nil.yml
--- a/changelogs/unreleased/sh-53180-append-path.yml
+++ b/changelogs/unreleased/sh-53180-append-path.yml
--- a/changelogs/unreleased/sh-bump-gems-security.yml
+++ b/changelogs/unreleased/sh-bump-gems-security.yml
--- a/changelogs/unreleased/sh-bump-ruby-2-5-3.yml
+++ b/changelogs/unreleased/sh-bump-ruby-2-5-3.yml
--- a/changelogs/unreleased/sh-cache-avatar-paths.yml
+++ b/changelogs/unreleased/sh-cache-avatar-paths.yml
--- a/changelogs/unreleased/sh-disable-autocomplete-mirror-settings.yml
+++ b/changelogs/unreleased/sh-disable-autocomplete-mirror-settings.yml
--- a/changelogs/unreleased/sh-fix-http-clone-panel.yml
+++ b/changelogs/unreleased/sh-fix-http-clone-panel.yml
--- a/changelogs/unreleased/sh-fix-issue-38317.yml
+++ b/changelogs/unreleased/sh-fix-issue-38317.yml
--- a/changelogs/unreleased/sh-fix-issue-51220.yml
+++ b/changelogs/unreleased/sh-fix-issue-51220.yml
--- a/changelogs/unreleased/sh-fix-issue-53783-ce.yml
+++ b/changelogs/unreleased/sh-fix-issue-53783-ce.yml
--- a/changelogs/unreleased/sh-fix-mirrors-protected-branches.yml
+++ b/changelogs/unreleased/sh-fix-mirrors-protected-branches.yml
--- a/changelogs/unreleased/sh-handle-invalid-gpg-sig.yml
+++ b/changelogs/unreleased/sh-handle-invalid-gpg-sig.yml
--- a/changelogs/unreleased/sh-handle-string-null-bytes.yml
+++ b/changelogs/unreleased/sh-handle-string-null-bytes.yml
--- a/changelogs/unreleased/sh-ignore-arrays-url-sanitizer.yml
+++ b/changelogs/unreleased/sh-ignore-arrays-url-sanitizer.yml
--- a/changelogs/unreleased/sh-json-serialize-broadcast-messages.yml
+++ b/changelogs/unreleased/sh-json-serialize-broadcast-messages.yml
--- a/changelogs/unreleased/sh-remove-local-sidekiq-admin-check.yml
+++ b/changelogs/unreleased/sh-remove-local-sidekiq-admin-check.yml
--- a/changelogs/unreleased/sh-truncate-with-periods.yml
+++ b/changelogs/unreleased/sh-truncate-with-periods.yml
--- a/changelogs/unreleased/sh-use-nakayoshi-fork.yml
+++ b/changelogs/unreleased/sh-use-nakayoshi-fork.yml
--- a/changelogs/unreleased/sh-use-nokogiri-xml-backend.yml
+++ b/changelogs/unreleased/sh-use-nokogiri-xml-backend.yml
--- a/changelogs/unreleased/spec-positional-arguments.yml
+++ b/changelogs/unreleased/spec-positional-arguments.yml
--- a/changelogs/unreleased/specs-positional-arguments.yml
+++ b/changelogs/unreleased/specs-positional-arguments.yml
--- a/changelogs/unreleased/speed-up-relative-positioning.yml
+++ b/changelogs/unreleased/speed-up-relative-positioning.yml
--- a/changelogs/unreleased/store-correlation-logs.yml
+++ b/changelogs/unreleased/store-correlation-logs.yml
--- a/changelogs/unreleased/suggest-change-to-diff-line.yml
+++ b/changelogs/unreleased/suggest-change-to-diff-line.yml
--- a/changelogs/unreleased/support-gitaly-tls.yml
+++ b/changelogs/unreleased/support-gitaly-tls.yml
--- a/changelogs/unreleased/switch-rails.yml
+++ b/changelogs/unreleased/switch-rails.yml
--- a/changelogs/unreleased/tc-backfill-full-path-config.yml
+++ b/changelogs/unreleased/tc-backfill-full-path-config.yml
--- a/changelogs/unreleased/tc-backfill-hashed-project_repositories.yml
+++ b/changelogs/unreleased/tc-backfill-hashed-project_repositories.yml
--- a/changelogs/unreleased/tc-repo-full-path-in-db.yml
+++ b/changelogs/unreleased/tc-repo-full-path-in-db.yml
--- a/changelogs/unreleased/triggermesh-phase2-external-ip.yml
+++ b/changelogs/unreleased/triggermesh-phase2-external-ip.yml
--- a/changelogs/unreleased/triggermesh-phase2-knative-description.yml
+++ b/changelogs/unreleased/triggermesh-phase2-knative-description.yml
--- a/changelogs/unreleased/triggermesh-phase2-serverless-list.yml
+++ b/changelogs/unreleased/triggermesh-phase2-serverless-list.yml
--- a/changelogs/unreleased/triggermesh-phase2-serverless.yml
+++ b/changelogs/unreleased/triggermesh-phase2-serverless.yml
--- a/changelogs/unreleased/unicorn-monkey-patch.yml
+++ b/changelogs/unreleased/unicorn-monkey-patch.yml
--- a/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-1-39.yml
+++ b/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-1-39.yml
--- a/changelogs/unreleased/update-gitlab-runner-helm-chart-version.yml
+++ b/changelogs/unreleased/update-gitlab-runner-helm-chart-version.yml
--- a/changelogs/unreleased/upgrade-to-workhorse-7-6-0.yml
+++ b/changelogs/unreleased/upgrade-to-workhorse-7-6-0.yml
--- a/changelogs/unreleased/upgrade_kubeclient_400.yml
+++ b/changelogs/unreleased/upgrade_kubeclient_400.yml
--- a/changelogs/unreleased/usage-count.yml
+++ b/changelogs/unreleased/usage-count.yml
--- a/changelogs/unreleased/validate-foreign-keys-being-indexed.yml
+++ b/changelogs/unreleased/validate-foreign-keys-being-indexed.yml
--- a/changelogs/unreleased/winh-collapse-discussions.yml
+++ b/changelogs/unreleased/winh-collapse-discussions.yml
--- a/changelogs/unreleased/winh-divider-margin.yml
+++ b/changelogs/unreleased/winh-divider-margin.yml
--- a/changelogs/unreleased/winh-dropdown-divider-color.yml
+++ b/changelogs/unreleased/winh-dropdown-divider-color.yml
--- a/changelogs/unreleased/winh-dropdown-item-padding.yml
+++ b/changelogs/unreleased/winh-dropdown-item-padding.yml
--- a/changelogs/unreleased/winh-issue-boards-project-dropdown-close.yml
+++ b/changelogs/unreleased/winh-issue-boards-project-dropdown-close.yml
--- a/changelogs/unreleased/winh-markdown-preview-lists.yml
+++ b/changelogs/unreleased/winh-markdown-preview-lists.yml
--- a/changelogs/unreleased/winh-merge-request-commit-context.yml
+++ b/changelogs/unreleased/winh-merge-request-commit-context.yml
--- a/changelogs/unreleased/winh-merge-request-commit-discussion.yml
+++ b/changelogs/unreleased/winh-merge-request-commit-discussion.yml
--- a/changelogs/unreleased/winh-merge-request-diff-discussion-commit-id.yml
+++ b/changelogs/unreleased/winh-merge-request-diff-discussion-commit-id.yml
--- a/changelogs/unreleased/winh-milestone-select.yml
+++ b/changelogs/unreleased/winh-milestone-select.yml
--- a/changelogs/unreleased/winh-resolved-discussions-reply-field.yml
+++ b/changelogs/unreleased/winh-resolved-discussions-reply-field.yml
--- a/changelogs/unreleased/winh-upgrade-gitlab-ui.yml
+++ b/changelogs/unreleased/winh-upgrade-gitlab-ui.yml
--- a/changelogs/unreleased/workhorse-7-3-0.yml
+++ b/changelogs/unreleased/workhorse-7-3-0.yml
--- a/changelogs/unreleased/zj-improve-gitaly-pb.yml
+++ b/changelogs/unreleased/zj-improve-gitaly-pb.yml
--- a/changelogs/unreleased/zj-pool-repository-creation.yml
+++ b/changelogs/unreleased/zj-pool-repository-creation.yml
--- a/changelogs/unreleased/zj-remove-broken-storage.yml
+++ b/changelogs/unreleased/zj-remove-broken-storage.yml
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
--- a/danger/documentation/Dangerfile
+++ b/danger/documentation/Dangerfile
--- a/db/fixtures/development/24_forks.rb
+++ b/db/fixtures/development/24_forks.rb
--- a/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
+++ b/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
--- a/db/migrate/20181031145139_add_protected_ci_variables_to_application_settings.rb
+++ b/db/migrate/20181031145139_add_protected_ci_variables_to_application_settings.rb
--- a/db/post_migrate/20181219145520_migrate_cluster_configure_worker_sidekiq_queue.rb
+++ b/db/post_migrate/20181219145520_migrate_cluster_configure_worker_sidekiq_queue.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
--- a/doc/api/jobs.md
+++ b/doc/api/jobs.md
--- a/doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md
+++ b/doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md
--- a/doc/ci/merge_request_pipelines/index.md
+++ b/doc/ci/merge_request_pipelines/index.md
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
--- a/doc/development/contributing/merge_request_workflow.md
+++ b/doc/development/contributing/merge_request_workflow.md
--- a/doc/development/instrumentation.md
+++ b/doc/development/instrumentation.md
--- a/doc/install/kubernetes/gitlab_chart.md
+++ b/doc/install/kubernetes/gitlab_chart.md
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
--- a/doc/user/abuse_reports.md
+++ b/doc/user/abuse_reports.md
--- a/doc/user/admin_area/abuse_reports.md
+++ b/doc/user/admin_area/abuse_reports.md
--- a/doc/user/admin_area/img/abuse_report_blocked_user.png
+++ b/doc/user/admin_area/img/abuse_report_blocked_user.png
--- a/doc/user/admin_area/img/abuse_reports_page.png
+++ b/doc/user/admin_area/img/abuse_reports_page.png
--- a/doc/user/group/clusters/index.md
+++ b/doc/user/group/clusters/index.md
--- a/doc/user/index.md
+++ b/doc/user/index.md
--- a/doc/user/profile/account/delete_account.md
+++ b/doc/user/profile/account/delete_account.md
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
--- a/doc/user/project/clusters/serverless/img/function-execution.png
+++ b/doc/user/project/clusters/serverless/img/function-execution.png
--- a/doc/user/project/clusters/serverless/img/serverless-page.png
+++ b/doc/user/project/clusters/serverless/img/serverless-page.png
--- a/doc/user/project/clusters/serverless/index.md
+++ b/doc/user/project/clusters/serverless/index.md
--- a/doc/user/project/img/releases.png
+++ b/doc/user/project/img/releases.png
--- a/doc/user/project/releases.md
+++ b/doc/user/project/releases.md
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
--- a/lib/gitlab/fake_application_settings.rb
+++ b/lib/gitlab/fake_application_settings.rb
--- a/lib/gitlab/git/object_pool.rb
+++ b/lib/gitlab/git/object_pool.rb
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
--- a/lib/gitlab/gitaly_client/object_pool_service.rb
+++ b/lib/gitlab/gitaly_client/object_pool_service.rb
--- a/lib/gitlab/import_export/command_line_util.rb
+++ b/lib/gitlab/import_export/command_line_util.rb
--- a/lib/gitlab/json_cache.rb
+++ b/lib/gitlab/json_cache.rb
--- a/lib/gitlab/group_hierarchy.rb
+++ b/lib/gitlab/group_hierarchy.rb
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
--- a/lib/gitlab/utils/override.rb
+++ b/lib/gitlab/utils/override.rb
--- a/lib/tasks/gitlab/storage.rake
+++ b/lib/tasks/gitlab/storage.rake
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
--- a/package.json
+++ b/package.json
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
--- a/qa/qa/support/page/logging.rb
+++ b/qa/qa/support/page/logging.rb
--- a/qa/spec/page/logging_spec.rb
+++ b/qa/spec/page/logging_spec.rb
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
--- a/spec/controllers/projects/deploy_keys_controller_spec.rb
+++ b/spec/controllers/projects/deploy_keys_controller_spec.rb
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
--- a/spec/controllers/projects/refs_controller_spec.rb
+++ b/spec/controllers/projects/refs_controller_spec.rb
--- a/spec/controllers/projects/tags/releases_controller_spec.rb
+++ b/spec/controllers/projects/tags/releases_controller_spec.rb
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
--- a/spec/factories/pool_repositories.rb
+++ b/spec/factories/pool_repositories.rb
--- a/spec/features/admin/admin_disables_git_access_protocol_spec.rb
+++ b/spec/features/admin/admin_disables_git_access_protocol_spec.rb
--- a/spec/features/groups/show_spec.rb
+++ b/spec/features/groups/show_spec.rb
--- a/spec/features/issues/user_creates_issue_spec.rb
+++ b/spec/features/issues/user_creates_issue_spec.rb
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
--- a/spec/features/users/overview_spec.rb
+++ b/spec/features/users/overview_spec.rb
--- a/spec/fixtures/api/schemas/entities/issuable_sidebar_todo.json
+++ b/spec/fixtures/api/schemas/entities/issuable_sidebar_todo.json
--- a/spec/fixtures/api/schemas/entities/issue_sidebar.json
+++ b/spec/fixtures/api/schemas/entities/issue_sidebar.json
--- a/spec/fixtures/api/schemas/entities/issue_sidebar_extras.json
+++ b/spec/fixtures/api/schemas/entities/issue_sidebar_extras.json
--- a/spec/fixtures/api/schemas/entities/merge_request_basic.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_basic.json
--- a/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_sidebar.json
--- a/spec/fixtures/api/schemas/entities/merge_request_sidebar_extras.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_sidebar_extras.json
--- a/spec/fixtures/api/schemas/public_api/v4/milestone.json
+++ b/spec/fixtures/api/schemas/public_api/v4/milestone.json
--- a/spec/fixtures/api/schemas/public_api/v4/milestones.json
+++ b/spec/fixtures/api/schemas/public_api/v4/milestones.json
--- a/spec/fixtures/symlink_export.tar.gz
+++ b/spec/fixtures/symlink_export.tar.gz
--- a/spec/helpers/issuables_helper_spec.rb
+++ b/spec/helpers/issuables_helper_spec.rb
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
--- a/spec/initializers/8_metrics_spec.rb
+++ b/spec/initializers/8_metrics_spec.rb
--- a/spec/javascripts/ci_variable_list/ci_variable_list_spec.js
+++ b/spec/javascripts/ci_variable_list/ci_variable_list_spec.js
--- a/spec/javascripts/diffs/store/utils_spec.js
+++ b/spec/javascripts/diffs/store/utils_spec.js
--- a/spec/javascripts/environments/environment_terminal_button_spec.js
+++ b/spec/javascripts/environments/environment_terminal_button_spec.js
--- a/spec/javascripts/fixtures/blob.rb
+++ b/spec/javascripts/fixtures/blob.rb
--- a/spec/javascripts/fixtures/boards.rb
+++ b/spec/javascripts/fixtures/boards.rb
--- a/spec/javascripts/fixtures/branches.rb
+++ b/spec/javascripts/fixtures/branches.rb
--- a/spec/javascripts/fixtures/clusters.rb
+++ b/spec/javascripts/fixtures/clusters.rb
--- a/spec/javascripts/fixtures/commit.rb
+++ b/spec/javascripts/fixtures/commit.rb
--- a/spec/javascripts/fixtures/deploy_keys.rb
+++ b/spec/javascripts/fixtures/deploy_keys.rb
--- a/spec/javascripts/fixtures/groups.rb
+++ b/spec/javascripts/fixtures/groups.rb
--- a/spec/javascripts/fixtures/issues.rb
+++ b/spec/javascripts/fixtures/issues.rb
--- a/spec/javascripts/fixtures/jobs.rb
+++ b/spec/javascripts/fixtures/jobs.rb
--- a/spec/javascripts/fixtures/labels.rb
+++ b/spec/javascripts/fixtures/labels.rb
--- a/spec/javascripts/fixtures/merge_requests.rb
+++ b/spec/javascripts/fixtures/merge_requests.rb
--- a/spec/javascripts/fixtures/merge_requests_diffs.rb
+++ b/spec/javascripts/fixtures/merge_requests_diffs.rb
--- a/spec/javascripts/fixtures/pipeline_schedules.rb
+++ b/spec/javascripts/fixtures/pipeline_schedules.rb
--- a/spec/javascripts/fixtures/pipelines.rb
+++ b/spec/javascripts/fixtures/pipelines.rb
--- a/spec/javascripts/fixtures/projects.rb
+++ b/spec/javascripts/fixtures/projects.rb
--- a/spec/javascripts/fixtures/prometheus_service.rb
+++ b/spec/javascripts/fixtures/prometheus_service.rb
--- a/spec/javascripts/fixtures/services.rb
+++ b/spec/javascripts/fixtures/services.rb
--- a/spec/javascripts/fixtures/snippet.rb
+++ b/spec/javascripts/fixtures/snippet.rb
--- a/spec/javascripts/fixtures/todos.rb
+++ b/spec/javascripts/fixtures/todos.rb
--- a/spec/javascripts/fixtures/u2f.rb
+++ b/spec/javascripts/fixtures/u2f.rb
--- a/spec/javascripts/jobs/components/artifacts_block_spec.js
+++ b/spec/javascripts/jobs/components/artifacts_block_spec.js
--- a/spec/javascripts/jobs/components/sidebar_spec.js
+++ b/spec/javascripts/jobs/components/sidebar_spec.js
--- a/spec/javascripts/notes/components/noteable_discussion_spec.js
+++ b/spec/javascripts/notes/components/noteable_discussion_spec.js
--- a/spec/javascripts/releases/components/app_spec.js
+++ b/spec/javascripts/releases/components/app_spec.js
--- a/spec/javascripts/releases/components/release_block_spec.js
+++ b/spec/javascripts/releases/components/release_block_spec.js
--- a/spec/javascripts/releases/mock_data.js
+++ b/spec/javascripts/releases/mock_data.js
--- a/spec/javascripts/releases/store/actions_spec.js
+++ b/spec/javascripts/releases/store/actions_spec.js
--- a/spec/javascripts/releases/store/helpers.js
+++ b/spec/javascripts/releases/store/helpers.js
--- a/spec/javascripts/releases/store/mutations_spec.js
+++ b/spec/javascripts/releases/store/mutations_spec.js
--- a/spec/javascripts/sidebar/mock_data.js
+++ b/spec/javascripts/sidebar/mock_data.js
--- a/spec/javascripts/sidebar/sidebar_mediator_spec.js
+++ b/spec/javascripts/sidebar/sidebar_mediator_spec.js
--- a/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js
+++ b/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js
--- a/spec/lib/gitlab/bare_repository_import/importer_spec.rb
+++ b/spec/lib/gitlab/bare_repository_import/importer_spec.rb
--- a/spec/lib/gitlab/gitaly_client_spec.rb
+++ b/spec/lib/gitlab/gitaly_client_spec.rb
--- a/spec/lib/gitlab/import_export/command_line_util_spec.rb
+++ b/spec/lib/gitlab/import_export/command_line_util_spec.rb
--- a/spec/lib/gitlab/import_export/file_importer_spec.rb
+++ b/spec/lib/gitlab/import_export/file_importer_spec.rb
--- a/spec/lib/gitlab/json_cache_spec.rb
+++ b/spec/lib/gitlab/json_cache_spec.rb
--- a/spec/lib/gitlab/group_hierarchy_spec.rb
+++ b/spec/lib/gitlab/group_hierarchy_spec.rb
--- a/spec/lib/gitlab/project_authorizations_spec.rb
+++ b/spec/lib/gitlab/project_authorizations_spec.rb
--- a/spec/lib/gitlab/prometheus/query_variables_spec.rb
+++ b/spec/lib/gitlab/prometheus/query_variables_spec.rb
--- a/spec/lib/gitlab/upgrader_spec.rb
+++ b/spec/lib/gitlab/upgrader_spec.rb
--- a/spec/lib/gitlab/utils/override_spec.rb
+++ b/spec/lib/gitlab/utils/override_spec.rb
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
--- a/spec/migrations/migrate_cluster_configure_worker_sidekiq_queue_spec.rb
+++ b/spec/migrations/migrate_cluster_configure_worker_sidekiq_queue_spec.rb
--- a/spec/models/broadcast_message_spec.rb
+++ b/spec/models/broadcast_message_spec.rb
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
--- a/spec/models/concerns/avatarable_spec.rb
+++ b/spec/models/concerns/avatarable_spec.rb
--- a/spec/models/concerns/discussion_on_diff_spec.rb
+++ b/spec/models/concerns/discussion_on_diff_spec.rb
--- a/spec/models/diff_note_spec.rb
+++ b/spec/models/diff_note_spec.rb
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
--- a/spec/models/pool_repository_spec.rb
+++ b/spec/models/pool_repository_spec.rb
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
--- a/spec/requests/api/events_spec.rb
+++ b/spec/requests/api/events_spec.rb
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
--- a/spec/requests/openid_connect_spec.rb
+++ b/spec/requests/openid_connect_spec.rb
--- a/spec/requests/rack_attack_global_spec.rb
+++ b/spec/requests/rack_attack_global_spec.rb
--- a/spec/serializers/entity_date_helper_spec.rb
+++ b/spec/serializers/entity_date_helper_spec.rb
--- a/spec/serializers/environment_entity_spec.rb
+++ b/spec/serializers/environment_entity_spec.rb
--- a/spec/serializers/issue_serializer_spec.rb
+++ b/spec/serializers/issue_serializer_spec.rb
--- a/spec/serializers/merge_request_basic_serializer_spec.rb
+++ b/spec/serializers/merge_request_basic_serializer_spec.rb
--- a/spec/serializers/merge_request_serializer_spec.rb
+++ b/spec/serializers/merge_request_serializer_spec.rb
--- a/spec/services/clusters/gcp/finalize_creation_service_spec.rb
+++ b/spec/services/clusters/gcp/finalize_creation_service_spec.rb
--- a/spec/services/clusters/update_service_spec.rb
+++ b/spec/services/clusters/update_service_spec.rb
--- a/spec/services/groups/create_service_spec.rb
+++ b/spec/services/groups/create_service_spec.rb
--- a/spec/services/groups/nested_create_service_spec.rb
+++ b/spec/services/groups/nested_create_service_spec.rb
--- a/spec/services/groups/transfer_service_spec.rb
+++ b/spec/services/groups/transfer_service_spec.rb
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
--- a/spec/services/projects/after_rename_service_spec.rb
+++ b/spec/services/projects/after_rename_service_spec.rb
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/support/api/boards_shared_examples.rb
+++ b/spec/support/api/boards_shared_examples.rb
--- a/spec/support/api/milestones_shared_examples.rb
+++ b/spec/support/api/milestones_shared_examples.rb
--- a/spec/support/api/scopes/read_user_shared_examples.rb
+++ b/spec/support/api/scopes/read_user_shared_examples.rb
--- a/spec/support/api/time_tracking_shared_examples.rb
+++ b/spec/support/api/time_tracking_shared_examples.rb
--- a/spec/support/controllers/githubish_import_controller_shared_examples.rb
+++ b/spec/support/controllers/githubish_import_controller_shared_examples.rb
--- a/spec/support/features/variable_list_shared_examples.rb
+++ b/spec/support/features/variable_list_shared_examples.rb
--- a/spec/support/helpers/git_http_helpers.rb
+++ b/spec/support/helpers/git_http_helpers.rb
--- a/spec/support/helpers/graphql_helpers.rb
+++ b/spec/support/helpers/graphql_helpers.rb
--- a/spec/support/import_export/export_file_helper.rb
+++ b/spec/support/import_export/export_file_helper.rb
--- a/spec/support/issuables_requiring_filter_shared_examples.rb
+++ b/spec/support/issuables_requiring_filter_shared_examples.rb
--- a/spec/support/shared_examples/controllers/uploads_actions_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/uploads_actions_shared_examples.rb
--- a/spec/support/shared_examples/milestone_tabs_examples.rb
+++ b/spec/support/shared_examples/milestone_tabs_examples.rb
--- a/spec/support/shared_examples/requests/api/diff_discussions.rb
+++ b/spec/support/shared_examples/requests/api/diff_discussions.rb
--- a/spec/support/shared_examples/requests/api/discussions.rb
+++ b/spec/support/shared_examples/requests/api/discussions.rb
--- a/spec/support/shared_examples/requests/api/merge_requests_list.rb
+++ b/spec/support/shared_examples/requests/api/merge_requests_list.rb
--- a/spec/support/shared_examples/requests/api/notes.rb
+++ b/spec/support/shared_examples/requests/api/notes.rb
--- a/spec/support/shared_examples/requests/api/resolvable_discussions.rb
+++ b/spec/support/shared_examples/requests/api/resolvable_discussions.rb
--- a/spec/tasks/gitlab/storage_rake_spec.rb
+++ b/spec/tasks/gitlab/storage_rake_spec.rb
--- a/spec/views/notify/changed_milestone_email.html.haml_spec.rb
+++ b/spec/views/notify/changed_milestone_email.html.haml_spec.rb
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
--- a/spec/workers/cluster_platform_configure_worker_spec.rb
+++ b/spec/workers/cluster_platform_configure_worker_spec.rb
--- a/spec/workers/cluster_provision_worker_spec.rb
+++ b/spec/workers/cluster_provision_worker_spec.rb
--- a/spec/workers/object_pool/destroy_worker_spec.rb
+++ b/spec/workers/object_pool/destroy_worker_spec.rb
--- a/spec/workers/stuck_merge_jobs_worker_spec.rb
+++ b/spec/workers/stuck_merge_jobs_worker_spec.rb
--- a/yarn.lock
+++ b/yarn.lock