Merge branch 'master' into 33697-pipelines-json-endpoint

* master: (106 commits) Merge branch '10-7-security_issue_42029' into 'security-10-7' Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7' Add developer documentation on diff handling and limits Use fast timeouts for Gitaly FooInProgress RPC's Use GitLab Pages v0.9.1 Docs: review product categories in doc/README Define custom base controller for Doorkeeper Use grpc 1.11.0 Update index.md Makes namespaceless project destroy worker spec not depend on a specific migration version Docs: update Pages for newbies Remove legacy storage path call InvaildStateError -> InvalidStateError Don't automatically remove artifacts for pages jobs after pages:deploy has run Resolve "Add how to use nip.io to Auto DevOps and Kubernetes documentation" Fix example config miss-alignment in uploads.object_store.connection Remove IDE image upload spec Add gitlab-pages admin ping rake task Don't run JS lint for QA either Add sha filter to list pipelines ...

Merge branch 'master' into 33697-pipelines-json-endpoint
* master: (106 commits) Merge branch '10-7-security_issue_42029' into 'security-10-7' Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7' Add developer documentation on diff handling and limits Use fast timeouts for Gitaly FooInProgress RPC's Use GitLab Pages v0.9.1 Docs: review product categories in doc/README Define custom base controller for Doorkeeper Use grpc 1.11.0 Update index.md Makes namespaceless project destroy worker spec not depend on a specific migration version Docs: update Pages for newbies Remove legacy storage path call InvaildStateError -> InvalidStateError Don't automatically remove artifacts for pages jobs after pages:deploy has run Resolve "Add how to use nip.io to Auto DevOps and Kubernetes documentation" Fix example config miss-alignment in uploads.object_store.connection Remove IDE image upload spec Add gitlab-pages admin ping rake task Don't run JS lint for QA either Add sha filter to list pipelines ...
8a057334 · Filipa Lacerda · 10d8b3a0 · 2f7b71df · 8a057334 · 8a057334
Commit 8a057334 authored Apr 30, 2018 by Filipa Lacerda
293 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ eslint-report.html
 /locale/**/*.time_stamp
 /.rspec
 /plugins/*
+/.gitlab_pages_secret
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,7 @@ stages:
 # Jobs that only need to pull cache
 .dedicated-no-docs-pull-cache-job: &dedicated-no-docs-pull-cache-job
  <<: *dedicated-runner
-  <<: *except-docs-and-qa
+  <<: *except-docs
  <<: *pull-cache
  dependencies:
    - setup-test-env
@@ -122,6 +122,10 @@ stages:
  variables:
    SETUP_DB: "false"

+.dedicated-no-docs-and-no-qa-pull-cache-job: &dedicated-no-docs-and-no-qa-pull-cache-job
+  <<: *dedicated-no-docs-pull-cache-job
+  <<: *except-docs-and-qa
+
 .rake-exec: &rake-exec
  <<: *dedicated-no-docs-no-db-pull-cache-job
  script:
@@ -222,7 +226,7 @@ stages:
    - master@gitlab/gitlab-ee

 .gitlab-setup: &gitlab-setup
-  <<: *dedicated-no-docs-pull-cache-job
+  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
  <<: *use-pg
  variables:
    CREATE_DB_USER: "true"
@@ -262,12 +266,12 @@ stages:

 # DB migration, rollback, and seed jobs
 .db-migrate-reset: &db-migrate-reset
-  <<: *dedicated-no-docs-pull-cache-job
+  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
  script:
    - bundle exec rake db:migrate:reset

 .migration-paths: &migration-paths
-  <<: *dedicated-no-docs-pull-cache-job
+  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
  variables:
    CREATE_DB_USER: "true"
  script:
@@ -289,7 +293,6 @@ stages:
 # Trigger a package build in omnibus-gitlab repository
 #
 package-and-qa:
-  <<: *dedicated-runner
  image: ruby:2.4-alpine
  before_script: []
  stage: build
@@ -648,7 +651,7 @@ migration:path-mysql:
  <<: *use-mysql

 .db-rollback: &db-rollback
-  <<: *dedicated-no-docs-pull-cache-job
+  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
  script:
    - bundle exec rake db:migrate VERSION=20170523121229
    - bundle exec rake db:migrate
@@ -671,7 +674,7 @@ gitlab:setup-mysql:

 # Frontend-related jobs
 gitlab:assets:compile:
-  <<: *dedicated-no-docs-no-db-pull-cache-job
+  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
  dependencies: []
  variables:
    NODE_ENV: "production"
@@ -692,7 +695,7 @@ gitlab:assets:compile:
      - webpack-report/

 karma:
-  <<: *dedicated-no-docs-pull-cache-job
+  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
  <<: *use-pg
  dependencies:
    - compile-assets
@@ -816,7 +819,7 @@ coverage:
    - coverage/assets/

 lint:javascript:report:
-  <<: *dedicated-no-docs-no-db-pull-cache-job
+  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
  stage: post-test
  dependencies:
    - compile-assets

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,12 +25,12 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._
 - [Workflow labels](#workflow-labels)
  - [Type labels (~"feature proposal", ~bug, ~customer, etc.)](#type-labels-feature-proposal-bug-customer-etc)
  - [Subject labels (~wiki, ~"container registry", ~ldap, ~api, etc.)](#subject-labels-wiki-container-registry-ldap-api-etc)
-  - [Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-cicd-discussion-edge-platform-etc)
+  - [Team labels (~"CI/CD", ~Discussion, ~Quality, ~Platform, etc.)](#team-labels-cicd-discussion-quality-platform-etc)
  - [Milestone labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#milestone-labels-deliverable-stretch-next-patch-release)
  - [Priority labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#bug-priority-labels-p1-p2-p3-etc)
  - [Severity labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#bug-severity-labels-s1-s2-s3-etc)
  - [Label for community contributors (~"Accepting Merge Requests")](#label-for-community-contributors-accepting-merge-requests)
- [Implement design & UI elements](#implement-design-ui-elements)
+- [Implement design & UI elements](#implement-design--ui-elements)
 - [Issue tracker](#issue-tracker)
  - [Issue triaging](#issue-triaging)
  - [Feature proposals](#feature-proposals)
@@ -127,7 +127,7 @@ Most issues will have labels for at least one of the following:

 - Type: ~"feature proposal", ~bug, ~customer, etc.
 - Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc.
- Team: ~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.
+- Team: ~"CI/CD", ~Discussion, ~Quality, ~Platform, etc.
 - Milestone: ~Deliverable, ~Stretch, ~"Next Patch Release"
 - Priority: ~P1, ~P2, ~P3, ~P4
 - Severity: ~S1, ~S2, ~S3, ~S4
@@ -171,13 +171,13 @@ Examples of subject labels are ~wiki, ~"container registry", ~ldap, ~api,

 Subject labels are always all-lowercase.

-### Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)
+### Team labels (~"CI/CD", ~Discussion, ~Quality, ~Platform, etc.)

 Team labels specify what team is responsible for this issue.
 Assigning a team label makes sure issues get the attention of the appropriate
 people.

-The current team labels are ~Build, ~"CI/CD", ~Discussion, ~Documentation, ~Edge,
+The current team labels are ~Build, ~"CI/CD", ~Discussion, ~Documentation, ~Quality,
 ~Geo, ~Gitaly, ~Monitoring, ~Platform, ~Release, ~"Security Products" and ~"UX".

 The descriptions on the [labels page][labels-page] explain what falls under the
@@ -727,4 +727,3 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor

 [^1]: Please note that specs other than JavaScript specs are considered backend
      code.
-      
\ No newline at end of file
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
-0.8.0
+0.9.1
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,6 @@ gem 'omniauth-shibboleth', '~> 1.2.0'
 gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.2.0'
 gem 'omniauth-authentiq', '~> 0.3.1'
-gem 'omniauth-jwt', '~> 0.0.2'
 gem 'rack-oauth2', '~> 1.2.1'
 gem 'jwt', '~> 1.5.6'

@@ -283,7 +282,6 @@ gem 'batch-loader', '~> 1.2.1'
 gem 'peek', '~> 1.0.1'
 gem 'peek-gc', '~> 0.0.2'
 gem 'peek-mysql2', '~> 1.1.0', group: :mysql
-gem 'peek-performance_bar', '~> 1.3.0'
 gem 'peek-pg', '~> 1.3.0', group: :postgres
 gem 'peek-rblineprof', '~> 0.2.0'
 gem 'peek-redis', '~> 1.2.0'
@@ -416,7 +414,7 @@ end

 # Gitaly GRPC client
 gem 'gitaly-proto', '~> 0.97.0', require: 'gitaly'
-gem 'grpc', '~> 1.10.0'
+gem 'grpc', '~> 1.11.0'

 # Locked until https://github.com/google/protobuf/issues/4210 is closed
 gem 'google-protobuf', '= 3.5.1'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -374,7 +374,7 @@ GEM
      rake
    grape_logging (1.7.0)
      grape
-    grpc (1.10.0)
+    grpc (1.11.0)
      google-protobuf (~> 3.1)
      googleapis-common-protos-types (~> 1.0.0)
      googleauth (>= 0.5.1, < 0.7)
@@ -555,9 +555,6 @@ GEM
      jwt (>= 1.5)
      omniauth (>= 1.1.1)
      omniauth-oauth2 (>= 1.5)
-    omniauth-jwt (0.0.2)
-      jwt
-      omniauth (~> 1.1)
    omniauth-kerberos (0.3.0)
      omniauth-multipassword
      timfel-krb5-auth (~> 0.8)
@@ -603,8 +600,6 @@ GEM
      atomic (>= 1.0.0)
      mysql2
      peek
-    peek-performance_bar (1.3.1)
-      peek (>= 0.1.0)
    peek-pg (1.3.0)
      concurrent-ruby
      concurrent-ruby-ext
@@ -1078,7 +1073,7 @@ DEPENDENCIES
  grape-entity (~> 0.6.0)
  grape-route-helpers (~> 2.1.0)
  grape_logging (~> 1.7)
-  grpc (~> 1.10.0)
+  grpc (~> 1.11.0)
  haml_lint (~> 0.26.0)
  hamlit (~> 2.6.1)
  hashie-forbidden_attributes
@@ -1119,7 +1114,6 @@ DEPENDENCIES
  omniauth-github (~> 1.1.1)
  omniauth-gitlab (~> 1.0.2)
  omniauth-google-oauth2 (~> 0.5.3)
-  omniauth-jwt (~> 0.0.2)
  omniauth-kerberos (~> 0.3.0)
  omniauth-oauth2-generic (~> 0.2.2)
  omniauth-saml (~> 1.10)
@@ -1130,7 +1124,6 @@ DEPENDENCIES
  peek (~> 1.0.1)
  peek-gc (~> 0.0.2)
  peek-mysql2 (~> 1.1.0)
-  peek-performance_bar (~> 1.3.0)
  peek-pg (~> 1.3.0)
  peek-rblineprof (~> 0.2.0)
  peek-redis (~> 1.2.0)

--- a/app/assets/javascripts/ide/components/changed_file_icon.vue
+++ b/app/assets/javascripts/ide/components/changed_file_icon.vue
@@ -26,11 +26,18 @@ export default {
      required: false,
      default: false,
    },
+    forceModifiedIcon: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
  },
  computed: {
    changedIcon() {
      const suffix = this.file.staged && !this.showStagedIcon ? '-solid' : '';
-      return this.file.tempFile ? `file-addition${suffix}` : `file-modified${suffix}`;
+      return this.file.tempFile && !this.forceModifiedIcon
+        ? `file-addition${suffix}`
+        : `file-modified${suffix}`;
    },
    stagedIcon() {
      return `${this.changedIcon}-solid`;

--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
 <script>
-  import { mapActions } from 'vuex';
-  import icon from '~/vue_shared/components/icon.vue';
-  import newModal from './modal.vue';
-  import upload from './upload.vue';
+import { mapActions } from 'vuex';
+import icon from '~/vue_shared/components/icon.vue';
+import newModal from './modal.vue';
+import upload from './upload.vue';

-  export default {
+export default {
  components: {
    icon,
    newModal,
@@ -27,10 +27,15 @@
      dropdownOpen: false,
    };
  },
+  watch: {
+    dropdownOpen() {
+      this.$nextTick(() => {
+        this.$refs.dropdownMenu.scrollIntoView();
+      });
+    },
+  },
  methods: {
-      ...mapActions([
-        'createTempEntry',
-      ]),
+    ...mapActions(['createTempEntry']),
    createNewItem(type) {
      this.modalType = type;
      this.openModal = true;
@@ -43,7 +48,7 @@
      this.dropdownOpen = !this.dropdownOpen;
    },
  },
-  };
+};
 </script>

 <template>
@@ -71,7 +76,10 @@
          css-classes="pull-left"
        />
      </button>
-      <ul class="dropdown-menu dropdown-menu-right">
+      <ul
+        class="dropdown-menu dropdown-menu-right"
+        ref="dropdownMenu"
+      >
        <li>
          <a
            href="#"

--- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
@@ -40,13 +40,6 @@ export default {

      return __('Create file');
    },
-    formLabelName() {
-      if (this.type === 'tree') {
-        return __('Directory name');
-      }
-
-      return __('File name');
-    },
  },
  mounted() {
    this.$refs.fieldName.focus();
@@ -82,8 +75,8 @@ export default {
      @submit.prevent="createEntryInStore"
    >
      <fieldset class="form-group append-bottom-0">
-        <label class="label-light col-sm-3">
-          {{ formLabelName }}
+        <label class="label-light col-sm-3 ide-new-modal-label">
+          {{ __('Name') }}
        </label>
        <div class="col-sm-9">
          <input

--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -97,7 +97,7 @@ export default {
            :file="file"
          />
        </span>
-        <span class="pull-right">
+        <span class="pull-right ide-file-icon-holder">
          <mr-file-icon
            v-if="file.mrChange"
          />
@@ -106,7 +106,8 @@ export default {
            :file="file"
            :show-tooltip="true"
            :show-staged-icon="true"
-            class="prepend-top-5 pull-right"
+            :force-modified-icon="true"
+            class="pull-right"
          />
        </span>
        <new-dropdown

--- a/app/assets/javascripts/ide/components/repo_tab.vue
+++ b/app/assets/javascripts/ide/components/repo_tab.vue
@@ -84,6 +84,7 @@ export default {
      <changed-file-icon
        v-else
        :file="tab"
+        :force-modified-icon="true"
      />
    </button>


--- a/app/assets/javascripts/ide/stores/actions.js
+++ b/app/assets/javascripts/ide/stores/actions.js
@@ -33,10 +33,7 @@ export const setPanelCollapsedStatus = ({ commit }, { side, collapsed }) => {
  }
 };

-export const toggleRightPanelCollapsed = (
-  { dispatch, state },
-  e = undefined,
-) => {
+export const toggleRightPanelCollapsed = ({ dispatch, state }, e = undefined) => {
  if (e) {
    $(e.currentTarget)
      .tooltip('hide')
@@ -77,7 +74,7 @@ export const createTempEntry = (
    }

    worker.addEventListener('message', ({ data }) => {
-      const { file } = data;
+      const { file, parentPath } = data;

      worker.terminate();

@@ -93,6 +90,10 @@ export const createTempEntry = (
        dispatch('setFileActive', file.path);
      }

+      if (parentPath && !state.entries[parentPath].opened) {
+        commit(types.TOGGLE_TREE_OPEN, parentPath);
+      }
+
      resolve(file);
    });

@@ -137,6 +138,14 @@ export const updateDelayViewerUpdated = ({ commit }, delay) => {
  commit(types.UPDATE_DELAY_VIEWER_CHANGE, delay);
 };

+export const updateTempFlagForEntry = ({ commit, dispatch, state }, { file, tempFile }) => {
+  commit(types.UPDATE_TEMP_FLAG, { path: file.path, tempFile });
+
+  if (file.parentPath) {
+    dispatch('updateTempFlagForEntry', { file: state.entries[file.parentPath], tempFile });
+  }
+};
+
 export const toggleFileFinder = ({ commit }, fileFindVisible) =>
  commit(types.TOGGLE_FILE_FINDER, fileFindVisible);


--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -63,7 +63,7 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive
  const file = state.entries[path];
  commit(types.TOGGLE_LOADING, { entry: file });
  return service
-    .getFileData(file.url)
+    .getFileData(`${gon.relative_url_root ? gon.relative_url_root : ''}${file.url}`)
    .then(res => {
      const pageTitle = decodeURI(normalizeHeaders(res.headers)['PAGE-TITLE']);
      setPageTitle(pageTitle);

--- a/app/assets/javascripts/ide/stores/modules/commit/actions.js
+++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js
@@ -110,6 +110,17 @@ export const updateFilesAfterCommit = (
      { root: true },
    );

+    commit(
+      rootTypes.TOGGLE_FILE_CHANGED,
+      {
+        file,
+        changed: false,
+      },
+      { root: true },
+    );
+
+    dispatch('updateTempFlagForEntry', { file, tempFile: false }, { root: true });
+
    eventHub.$emit(`editor.update.model.content.${file.key}`, {
      content: file.content,
      changed: !!changedFile,

--- a/app/assets/javascripts/ide/stores/mutation_types.js
+++ b/app/assets/javascripts/ide/stores/mutation_types.js
@@ -59,4 +59,5 @@ export const UPDATE_FILE_AFTER_COMMIT = 'UPDATE_FILE_AFTER_COMMIT';
 export const ADD_PENDING_TAB = 'ADD_PENDING_TAB';
 export const REMOVE_PENDING_TAB = 'REMOVE_PENDING_TAB';

+export const UPDATE_TEMP_FLAG = 'UPDATE_TEMP_FLAG';
 export const TOGGLE_FILE_FINDER = 'TOGGLE_FILE_FINDER';
--- a/app/assets/javascripts/ide/stores/mutations.js
+++ b/app/assets/javascripts/ide/stores/mutations.js
@@ -4,6 +4,7 @@ import mergeRequestMutation from './mutations/merge_request';
 import fileMutations from './mutations/file';
 import treeMutations from './mutations/tree';
 import branchMutations from './mutations/branch';
+import { sortTree } from './utils';

 export default {
  [types.SET_INITIAL_DATA](state, data) {
@@ -73,7 +74,7 @@ export default {
          f => foundEntry.tree.find(e => e.path === f.path) === undefined,
        );
        Object.assign(foundEntry, {
-          tree: foundEntry.tree.concat(tree),
+          tree: sortTree(foundEntry.tree.concat(tree)),
        });
      }

@@ -86,10 +87,16 @@ export default {

    if (!foundEntry) {
      Object.assign(state.trees[`${projectId}/${branchId}`], {
-        tree: state.trees[`${projectId}/${branchId}`].tree.concat(data.treeList),
+        tree: sortTree(state.trees[`${projectId}/${branchId}`].tree.concat(data.treeList)),
      });
    }
  },
+  [types.UPDATE_TEMP_FLAG](state, { path, tempFile }) {
+    Object.assign(state.entries[path], {
+      tempFile,
+      changed: tempFile,
+    });
+  },
  [types.UPDATE_VIEWER](state, viewer) {
    Object.assign(state, {
      viewer,

--- a/app/assets/javascripts/ide/stores/utils.js
+++ b/app/assets/javascripts/ide/stores/utils.js
@@ -33,6 +33,7 @@ export const dataStructure = () => ({
  raw: '',
  content: '',
  parentTreeUrl: '',
+  parentPath: '',
  renderError: false,
  base64: false,
  editorRow: 1,
@@ -65,6 +66,7 @@ export const decorateData = entity => {
    previewMode,
    file_lock,
    html,
+    parentPath = '',
  } = entity;

  return {
@@ -81,6 +83,7 @@ export const decorateData = entity => {
    opened,
    active,
    parentTreeUrl,
+    parentPath,
    changed,
    renderError,
    content,
@@ -121,8 +124,8 @@ const sortTreesByTypeAndName = (a, b) => {
  } else if (a.type === 'blob' && b.type === 'tree') {
    return 1;
  }
-  if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
-  if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
+  if (a.name < b.name) return -1;
+  if (a.name > b.name) return 1;
  return 0;
 };


--- a/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
+++ b/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
@@ -6,6 +6,7 @@ self.addEventListener('message', e => {

  const treeList = [];
  let file;
+  let parentPath;
  const entries = data.reduce((acc, path) => {
    const pathSplit = path.split('/');
    const blobName = pathSplit.pop().trim();
@@ -17,6 +18,8 @@ self.addEventListener('message', e => {
        const foundEntry = acc[folderPath];

        if (!foundEntry) {
+          parentPath = parentFolder ? parentFolder.path : null;
+
          const tree = decorateData({
            projectId,
            branchId,
@@ -29,6 +32,7 @@ self.addEventListener('message', e => {
            tempFile,
            changed: tempFile,
            opened: tempFile,
+            parentPath,
          });

          Object.assign(acc, {
@@ -52,6 +56,8 @@ self.addEventListener('message', e => {

    if (blobName !== '') {
      const fileFolder = acc[pathSplit.join('/')];
+      parentPath = fileFolder ? fileFolder.path : null;
+
      file = decorateData({
        projectId,
        branchId,
@@ -66,6 +72,7 @@ self.addEventListener('message', e => {
        content,
        base64,
        previewMode: viewerInformationForPath(blobName),
+        parentPath,
      });

      Object.assign(acc, {
@@ -86,5 +93,6 @@ self.addEventListener('message', e => {
    entries,
    treeList: sortTree(treeList),
    file,
+    parentPath,
  });
 });
--- a/app/assets/javascripts/milestone_select.js
+++ b/app/assets/javascripts/milestone_select.js
@@ -12,7 +12,8 @@ import ModalStore from './boards/stores/modal_store';
 export default class MilestoneSelect {
  constructor(currentProject, els, options = {}) {
    if (currentProject !== null) {
-      this.currentProject = typeof currentProject === 'string' ? JSON.parse(currentProject) : currentProject;
+      this.currentProject =
+        typeof currentProject === 'string' ? JSON.parse(currentProject) : currentProject;
    }

    this.init(els, options);
@@ -26,7 +27,10 @@ export default class MilestoneSelect {
    }

    $els.each((i, dropdown) => {
-      let milestoneLinkNoneTemplate, milestoneLinkTemplate, selectedMilestone, selectedMilestoneDefault;
+      let milestoneLinkNoneTemplate,
+        milestoneLinkTemplate,
+        selectedMilestone,
+        selectedMilestoneDefault;
      const $dropdown = $(dropdown);
      const projectId = $dropdown.data('projectId');
      const milestonesUrl = $dropdown.data('milestones');
@@ -46,45 +50,47 @@ export default class MilestoneSelect {
      const $sidebarCollapsedValue = $block.find('.sidebar-collapsed-icon');
      const $value = $block.find('.value');
      const $loading = $block.find('.block-loading').fadeOut();
-      selectedMilestoneDefault = (showAny ? '' : null);
-      selectedMilestoneDefault = (showNo && defaultNo ? 'No Milestone' : selectedMilestoneDefault);
+      selectedMilestoneDefault = showAny ? '' : null;
+      selectedMilestoneDefault = showNo && defaultNo ? 'No Milestone' : selectedMilestoneDefault;
      selectedMilestone = $dropdown.data('selected') || selectedMilestoneDefault;

      if (issueUpdateURL) {
-        milestoneLinkTemplate = _.template('<a href="/<%- full_path %>/milestones/<%- iid %>" class="bold has-tooltip" data-container="body" title="<%- remaining %>"><%- title %></a>');
+        milestoneLinkTemplate = _.template(
+          '<a href="/<%- full_path %>/milestones/<%- iid %>" class="bold has-tooltip" data-container="body" title="<%- remaining %>"><%- title %></a>',
+        );
        milestoneLinkNoneTemplate = '<span class="no-value">None</span>';
      }
      return $dropdown.glDropdown({
        showMenuAbove: showMenuAbove,
-        data: (term, callback) => axios.get(milestonesUrl)
-          .then(({ data }) => {
+        data: (term, callback) =>
+          axios.get(milestonesUrl).then(({ data }) => {
            const extraOptions = [];
            if (showAny) {
              extraOptions.push({
-                id: 0,
-                name: '',
-                title: 'Any Milestone'
+                id: null,
+                name: null,
+                title: 'Any Milestone',
              });
            }
            if (showNo) {
              extraOptions.push({
                id: -1,
                name: 'No Milestone',
-                title: 'No Milestone'
+                title: 'No Milestone',
              });
            }
            if (showUpcoming) {
              extraOptions.push({
                id: -2,
                name: '#upcoming',
-                title: 'Upcoming'
+                title: 'Upcoming',
              });
            }
            if (showStarted) {
              extraOptions.push({
                id: -3,
                name: '#started',
-                title: 'Started'
+                title: 'Started',
              });
            }
            if (extraOptions.length) {
@@ -106,7 +112,7 @@ export default class MilestoneSelect {
        `,
        filterable: true,
        search: {
-          fields: ['title']
+          fields: ['title'],
        },
        selectable: true,
        toggleLabel: (selected, el, e) => {
@@ -119,7 +125,7 @@ export default class MilestoneSelect {
        defaultLabel: defaultLabel,
        fieldName: $dropdown.data('fieldName'),
        text: milestone => _.escape(milestone.title),
-        id: (milestone) => {
+        id: milestone => {
          if (!useId && !$dropdown.is('.js-issuable-form-dropdown')) {
            return milestone.name;
          } else {
@@ -131,7 +137,7 @@ export default class MilestoneSelect {
          // display:block overrides the hide-collapse rule
          return $value.css('display', '');
        },
-        opened: (e) => {
+        opened: e => {
          const $el = $(e.currentTarget);
          if ($dropdown.hasClass('js-issue-board-sidebar') || options.handleClick) {
            selectedMilestone = $dropdown[0].dataset.selected || selectedMilestoneDefault;
@@ -140,7 +146,7 @@ export default class MilestoneSelect {
          $(`[data-milestone-id="${_.escape(selectedMilestone)}"] > a`, $el).addClass('is-active');
        },
        vue: $dropdown.hasClass('js-issue-board-sidebar'),
-        clicked: (clickEvent) => {
+        clicked: clickEvent => {
          const { $el, e } = clickEvent;
          let selected = clickEvent.selectedObj;

@@ -155,11 +161,14 @@ export default class MilestoneSelect {

          const page = $('body').attr('data-page');
          const isIssueIndex = page === 'projects:issues:index';
-          const isMRIndex = (page === page && page === 'projects:merge_requests:index');
-          const isSelecting = (selected.name !== selectedMilestone);
+          const isMRIndex = page === page && page === 'projects:merge_requests:index';
+          const isSelecting = selected.name !== selectedMilestone;
          selectedMilestone = isSelecting ? selected.name : selectedMilestoneDefault;

-          if ($dropdown.hasClass('js-filter-bulk-update') || $dropdown.hasClass('js-issuable-form-dropdown')) {
+          if (
+            $dropdown.hasClass('js-filter-bulk-update') ||
+            $dropdown.hasClass('js-issuable-form-dropdown')
+          ) {
            e.preventDefault();
            return;
          }
@@ -177,10 +186,13 @@ export default class MilestoneSelect {
            return $dropdown.closest('form').submit();
          } else if ($dropdown.hasClass('js-issue-board-sidebar')) {
            if (selected.id !== -1 && isSelecting) {
-              gl.issueBoards.boardStoreIssueSet('milestone', new ListMilestone({
+              gl.issueBoards.boardStoreIssueSet(
+                'milestone',
+                new ListMilestone({
                  id: selected.id,
-                title: selected.name
-              }));
+                  title: selected.name,
+                }),
+              );
            } else {
              gl.issueBoards.boardStoreIssueDelete('milestone');
            }
@@ -188,7 +200,8 @@ export default class MilestoneSelect {
            $dropdown.trigger('loading.gl.dropdown');
            $loading.removeClass('hidden').fadeIn();

-            gl.issueBoards.BoardsStore.detail.issue.update($dropdown.attr('data-issue-update'))
+            gl.issueBoards.BoardsStore.detail.issue
+              .update($dropdown.attr('data-issue-update'))
              .then(() => {
                $dropdown.trigger('loaded.gl.dropdown');
                $loading.fadeOut();
@@ -203,7 +216,8 @@ export default class MilestoneSelect {
            data[abilityName].milestone_id = selected != null ? selected : null;
            $loading.removeClass('hidden').fadeIn();
            $dropdown.trigger('loading.gl.dropdown');
-            return axios.put(issueUpdateURL, data)
+            return axios
+              .put(issueUpdateURL, data)
              .then(({ data }) => {
                $dropdown.trigger('loaded.gl.dropdown');
                $loading.fadeOut();
@@ -215,7 +229,10 @@ export default class MilestoneSelect {
                  data.milestone.name = data.milestone.title;
                  $value.html(milestoneLinkTemplate(data.milestone));
                  return $sidebarCollapsedValue
-                    .attr('data-original-title', `${data.milestone.name}<br />${data.milestone.remaining}`)
+                    .attr(
+                      'data-original-title',
+                      `${data.milestone.name}<br />${data.milestone.remaining}`,
+                    )
                    .find('span')
                    .text(data.milestone.title);
                } else {
@@ -230,7 +247,7 @@ export default class MilestoneSelect {
                $loading.fadeOut();
              });
          }
-        }
+        },
      });
    });
  }

--- a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
+++ b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
@@ -52,16 +52,15 @@
      text() {
        const keepContributionsText = s__(`AdminArea|
          You are about to permanently delete the user %{username}.
-          This will delete all of the issues, merge requests, and groups linked to them.
+          Issues, merge requests, and groups linked to them will be transferred to a system-wide "Ghost-user".
          To avoid data loss, consider using the %{strong_start}block user%{strong_end} feature instead.
          Once you %{strong_start}Delete user%{strong_end}, it cannot be undone or recovered.`);

        const deleteContributionsText = s__(`AdminArea|
          You are about to permanently delete the user %{username}.
-          Issues, merge requests, and groups linked to them will be transferred to a system-wide "Ghost-user".
+          This will delete all of the issues, merge requests, and groups linked to them.
          To avoid data loss, consider using the %{strong_start}block user%{strong_end} feature instead.
          Once you %{strong_start}Delete user%{strong_end}, it cannot be undone or recovered.`);
-
        return sprintf(this.deleteContributions ? deleteContributionsText : keepContributionsText,
          {
            username: `<strong>${_.escape(this.username)}</strong>`,

--- a/app/assets/javascripts/pages/users/activity_calendar.js
+++ b/app/assets/javascripts/pages/users/activity_calendar.js
@@ -188,11 +188,11 @@ export default class ActivityCalendar {
      },
      {
        text: 'W',
-        y: 29 + this.dayYPos(2),
+        y: 29 + this.dayYPos(3),
      },
      {
        text: 'F',
-        y: 29 + this.dayYPos(3),
+        y: 29 + this.dayYPos(5),
      },
    ];
    this.svg

--- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
+++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
@@ -5,7 +5,6 @@ import PerformanceBarService from '../services/performance_bar_service';
 import detailedMetric from './detailed_metric.vue';
 import requestSelector from './request_selector.vue';
 import simpleMetric from './simple_metric.vue';
-import upstreamPerformanceBar from './upstream_performance_bar.vue';

 import Flash from '../../flash';

@@ -14,7 +13,6 @@ export default {
    detailedMetric,
    requestSelector,
    simpleMetric,
-    upstreamPerformanceBar,
  },
  props: {
    store: {
@@ -128,9 +126,6 @@ export default {
          {{ currentRequest.details.host.hostname }}
        </span>
      </div>
-      <upstream-performance-bar
-        v-if="initialRequest && currentRequest.details"
-      />
      <detailed-metric
        v-for="metric in $options.detailedMetrics"
        :key="metric.metric"

--- a/app/assets/javascripts/performance_bar/components/upstream_performance_bar.vue
+++ b/app/assets/javascripts/performance_bar/components/upstream_performance_bar.vue
-<script>
-export default {
-  mounted() {
-    const upstreamPerformanceBar = document
-      .getElementById('peek-view-performance-bar')
-      .cloneNode(true);
-
-    upstreamPerformanceBar.classList.remove('hidden');
-
-    this.$refs.wrapper.appendChild(upstreamPerformanceBar);
-  },
-};
-</script>
-<template>
-  <div
-    id="peek-view-performance-bar-vue"
-    class="view"
-    ref="wrapper"
-  ></div>
-</template>
--- a/app/assets/javascripts/performance_bar/index.js
+++ b/app/assets/javascripts/performance_bar/index.js
-import 'vendor/peek.performance_bar';
-
 import Vue from 'vue';
 import performanceBarApp from './components/performance_bar_app.vue';
 import PerformanceBarStore from './stores/performance_bar_store';

--- a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
+++ b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
 import $ from 'jquery';
+import _ from 'underscore';

 function isValidProjectId(id) {
  return id > 0;
@@ -43,7 +44,7 @@ class SidebarMoveIssue {
      renderRow: project => `
        <li>
          <a href="#" class="js-move-issue-dropdown-item">
-            ${project.name_with_namespace}
+            ${_.escape(project.name_with_namespace)}
          </a>
        </li>
      `,

--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
 <script>
-  import { n__ } from '~/locale';
-  import statusIcon from '../mr_widget_status_icon.vue';
-  import eventHub from '../../event_hub';
+import { n__ } from '~/locale';
+import statusIcon from '../mr_widget_status_icon.vue';
+import eventHub from '../../event_hub';

-  export default {
+export default {
  name: 'MRWidgetFailedToMerge',

  components: {
@@ -22,6 +22,7 @@
    return {
      timer: 10,
      isRefreshing: false,
+      intervalId: null,
    };
  },

@@ -36,15 +37,19 @@
  },

  mounted() {
-      setInterval(() => {
-        this.updateTimer();
-      }, 1000);
+    this.intervalId = setInterval(this.updateTimer, 1000);
  },

  created() {
    eventHub.$emit('DisablePolling');
  },

+  beforeDestroy() {
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+    }
+  },
+
  methods: {
    refresh() {
      this.isRefreshing = true;
@@ -59,8 +64,7 @@
      }
    },
  },
-
-  };
+};
 </script>
 <template>
  <div class="mr-widget-body media">

--- a/app/assets/javascripts/vue_shared/components/file_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/file_icon.vue
 <script>
-  import getIconForFile from './file_icon/file_icon_map';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-  import icon from '../../vue_shared/components/icon.vue';
+import getIconForFile from './file_icon/file_icon_map';
+import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+import icon from '../../vue_shared/components/icon.vue';

-  /* This is a re-usable vue component for rendering a svg sprite
+/* This is a re-usable vue component for rendering a svg sprite
    icon

    Sample configuration:
@@ -15,7 +15,7 @@
    />

  */
-  export default {
+export default {
  components: {
    loadingIcon,
    icon,
@@ -68,7 +68,7 @@
      return this.size ? `s${this.size}` : '';
    },
  },
-  };
+};
 </script>
 <template>
  <span>
@@ -82,6 +82,7 @@
      v-if="!loading && folder"
      :name="folderIconName"
      :size="size"
+      css-classes="folder-icon"
    />
    <loading-icon
      v-if="loading"

--- a/app/assets/javascripts/vue_shared/models/label.js
+++ b/app/assets/javascripts/vue_shared/models/label.js
-class ListLabel {
+export default class ListLabel {
  constructor(obj) {
    this.id = obj.id;
    this.title = obj.title;

--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -40,10 +40,6 @@
  .project-home-panel {
    padding-left: 0 !important;

-    .project-avatar {
-      display: block;
-    }
-
    .project-repo-buttons,
    .git-clone-holder {
      display: none;

--- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss
+++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
@@ -241,8 +241,6 @@
 }

 .scrolling-tabs-container {
-  position: relative;
-
  .merge-request-tabs-container & {
    overflow: hidden;
  }
@@ -272,8 +270,6 @@
 }

 .inner-page-scroll-tabs {
-  position: relative;
-
  .fade-right {
    @include fade(left, $white-light);
    right: 0;

--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -19,6 +19,7 @@

        .fork-svg {
          margin-right: 4px;
+          vertical-align: bottom;
        }
      }


--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -70,7 +70,7 @@
 }

 .branch-info .commit-icon {
-  margin-right: 3px;
+  margin-right: 8px;

  svg {
    top: 3px;

--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -314,6 +314,10 @@
  display: inline-flex;
  vertical-align: top;

+  &:hover .color-label {
+    text-decoration: underline;
+  }
+
  .label {
    vertical-align: inherit;
    font-size: $label-font-size;

--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -55,6 +55,7 @@
      white-space: nowrap;
      text-overflow: ellipsis;
      max-width: inherit;
+      line-height: 22px;

      svg {
        vertical-align: middle;
@@ -67,6 +68,11 @@
      }
    }

+    .ide-file-icon-holder {
+      display: flex;
+      align-items: center;
+    }
+
    .ide-file-changed-icon {
      margin-left: auto;

@@ -77,7 +83,6 @@

    .ide-new-btn {
      display: none;
-      margin-bottom: -4px;
      margin-right: -8px;
    }

@@ -90,12 +95,10 @@
      }
    }

-    &.folder {
-      svg {
+    .folder-icon {
      fill: $gl-text-color-secondary;
    }
  }
-  }

  a {
    color: $gl-text-color;
@@ -111,6 +114,7 @@
 .file-col-commit-message {
  display: flex;
  overflow: visible;
+  align-items: center;
  padding: 6px 12px;
 }

@@ -438,7 +442,7 @@
  .projects-sidebar {
    display: flex;
    flex-direction: column;
-    height: 100%;
+    flex: 1;

    .context-header {
      width: auto;
@@ -967,3 +971,7 @@
  background: transparent;
  resize: none;
 }
+
+.ide-new-modal-label {
+  line-height: 34px;
+}
--- a/app/assets/stylesheets/performance_bar.scss
+++ b/app/assets/stylesheets/performance_bar.scss
 @import 'framework/variables';
-@import 'peek/views/performance_bar';
 @import 'peek/views/rblineprof';

 #js-peek {

--- a/app/finders/pipelines_finder.rb
+++ b/app/finders/pipelines_finder.rb
@@ -14,6 +14,7 @@ class PipelinesFinder
    items = by_scope(items)
    items = by_status(items)
    items = by_ref(items)
+    items = by_sha(items)
    items = by_name(items)
    items = by_username(items)
    items = by_yaml_errors(items)
@@ -69,6 +70,14 @@ class PipelinesFinder
    end
  end

+  def by_sha(items)
+    if params[:sha].present?
+      items.where(sha: params[:sha])
+    else
+      items
+    end
+  end
+
  def by_name(items)
    if params[:name].present?
      items.joins(:user).where(users: { name: params[:name] })

--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -17,7 +17,7 @@ module BlobHelper
  end

  def ide_edit_path(project = @project, ref = @ref, path = @path, options = {})
-    "#{ide_path}/project#{edit_blob_path(project, ref, path, options)}"
+    "#{ide_path}/project#{url_for([project, "edit", "blob", id: [ref, path], script_name: "/"])}"
  end

  def edit_blob_button(project = @project, ref = @ref, path = @path, options = {})

--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -63,7 +63,7 @@ module CommitsHelper
  # Returns a link formatted as a commit branch link
  def commit_branch_link(url, text)
    link_to(url, class: 'label label-gray ref-name branch-link') do
-      sprite_icon('fork', size: 16, css_class: 'fork-svg') + "#{text}"
+      sprite_icon('fork', size: 12, css_class: 'fork-svg') + "#{text}"
    end
  end


--- a/app/helpers/dropdowns_helper.rb
+++ b/app/helpers/dropdowns_helper.rb
@@ -41,7 +41,7 @@ module DropdownsHelper

  def dropdown_toggle(toggle_text, data_attr, options = {})
    default_label = data_attr[:default_label]
-    content_tag(:button, class: "dropdown-menu-toggle #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), type: "button", data: data_attr) do
+    content_tag(:button, disabled: options[:disabled], class: "dropdown-menu-toggle #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), type: "button", data: data_attr) do
      output = content_tag(:span, toggle_text, class: "dropdown-toggle-text #{'is-default' if toggle_text == default_label}")
      output << icon('chevron-down')
      output.html_safe

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -400,7 +400,8 @@ module ProjectsHelper
    exports_path = File.join(Settings.shared['path'], 'tmp/project_exports')
    filtered_message = message.strip.gsub(exports_path, "[REPO EXPORT PATH]")

-    filtered_message.gsub(project.repository_storage_path.chomp('/'), "[REPOS PATH]")
+    disk_path = Gitlab.config.repositories.storages[project.repository_storage].legacy_disk_path
+    filtered_message.gsub(disk_path.chomp('/'), "[REPOS PATH]")
  end

  def project_child_container_class(view_path)

--- a/app/models/concerns/storage/legacy_namespace.rb
+++ b/app/models/concerns/storage/legacy_namespace.rb
@@ -45,25 +45,25 @@ module Storage

    # Hooks

-    # Save the storage paths before the projects are destroyed to use them on after destroy
+    # Save the storages before the projects are destroyed to use them on after destroy
    def prepare_for_destroy
-      old_repository_storage_paths
+      old_repository_storages
    end

    private

    def move_repositories
-      # Move the namespace directory in all storage paths used by member projects
-      repository_storage_paths.each do |repository_storage_path|
+      # Move the namespace directory in all storages used by member projects
+      repository_storages.each do |repository_storage|
        # Ensure old directory exists before moving it
-        gitlab_shell.add_namespace(repository_storage_path, full_path_was)
+        gitlab_shell.add_namespace(repository_storage, full_path_was)

        # Ensure new directory exists before moving it (if there's a parent)
-        gitlab_shell.add_namespace(repository_storage_path, parent.full_path) if parent
+        gitlab_shell.add_namespace(repository_storage, parent.full_path) if parent

-        unless gitlab_shell.mv_namespace(repository_storage_path, full_path_was, full_path)
+        unless gitlab_shell.mv_namespace(repository_storage, full_path_was, full_path)

-          Rails.logger.error "Exception moving path #{repository_storage_path} from #{full_path_was} to #{full_path}"
+          Rails.logger.error "Exception moving path #{repository_storage} from #{full_path_was} to #{full_path}"

          # if we cannot move namespace directory we should rollback
          # db changes in order to prevent out of sync between db and fs
@@ -72,33 +72,33 @@ module Storage
      end
    end

-    def old_repository_storage_paths
-      @old_repository_storage_paths ||= repository_storage_paths
+    def old_repository_storages
+      @old_repository_storage_paths ||= repository_storages
    end

-    def repository_storage_paths
+    def repository_storages
      # We need to get the storage paths for all the projects, even the ones that are
      # pending delete. Unscoping also get rids of the default order, which causes
      # problems with SELECT DISTINCT.
      Project.unscoped do
-        all_projects.select('distinct(repository_storage)').to_a.map(&:repository_storage_path)
+        all_projects.select('distinct(repository_storage)').to_a.map(&:repository_storage)
      end
    end

    def rm_dir
      # Remove the namespace directory in all storages paths used by member projects
-      old_repository_storage_paths.each do |repository_storage_path|
+      old_repository_storages.each do |repository_storage|
        # Move namespace directory into trash.
        # We will remove it later async
        new_path = "#{full_path}+#{id}+deleted"

-        if gitlab_shell.mv_namespace(repository_storage_path, full_path, new_path)
+        if gitlab_shell.mv_namespace(repository_storage, full_path, new_path)
          Gitlab::AppLogger.info %Q(Namespace directory "#{full_path}" moved to "#{new_path}")

          # Remove namespace directroy async with delay so
          # GitLab has time to remove all projects first
          run_after_commit do
-            GitlabShellWorker.perform_in(5.minutes, :rm_namespace, repository_storage_path, new_path)
+            GitlabShellWorker.perform_in(5.minutes, :rm_namespace, repository_storage, new_path)
          end
        end
      end

--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -37,20 +37,20 @@ class GroupMember < Member
  private

  def send_invite
-    notification_service.invite_group_member(self, @raw_invite_token)
+    run_after_commit_or_now { notification_service.invite_group_member(self, @raw_invite_token) }

    super
  end

  def post_create_hook
-    notification_service.new_group_member(self)
+    run_after_commit_or_now { notification_service.new_group_member(self) }

    super
  end

  def post_update_hook
    if access_level_changed?
-      notification_service.update_group_member(self)
+      run_after_commit { notification_service.update_group_member(self) }
    end

    super

--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -92,7 +92,7 @@ class ProjectMember < Member
  private

  def send_invite
-    notification_service.invite_project_member(self, @raw_invite_token)
+    run_after_commit_or_now { notification_service.invite_project_member(self, @raw_invite_token) }

    super
  end
@@ -100,7 +100,7 @@ class ProjectMember < Member
  def post_create_hook
    unless owner?
      event_service.join_project(self.project, self.user)
-      notification_service.new_project_member(self)
+      run_after_commit_or_now { notification_service.new_project_member(self) }
    end

    super
@@ -108,7 +108,7 @@ class ProjectMember < Member

  def post_update_hook
    if access_level_changed?
-      notification_service.update_project_member(self)
+      run_after_commit { notification_service.update_project_member(self) }
    end

    super

--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -197,10 +197,6 @@ class MergeRequestDiff < ActiveRecord::Base
    CompareService.new(project, head_commit_sha).execute(project, sha, straight: true)
  end

-  def commits_count
-    super || merge_request_diff_commits.size
-  end
-
  private

  def create_merge_request_diff_files(diffs)

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -518,10 +518,6 @@ class Project < ActiveRecord::Base
    repository.empty?
  end

-  def repository_storage_path
-    Gitlab.config.repositories.storages[repository_storage]&.legacy_disk_path
-  end
-
  def team
    @team ||= ProjectTeam.new(self)
  end
@@ -1105,7 +1101,7 @@ class Project < ActiveRecord::Base
  # Check if repository already exists on disk
  def check_repository_path_availability
    return true if skip_disk_validation
-    return false unless repository_storage_path
+    return false unless repository_storage

    expires_full_path_cache # we need to clear cache to validate renames correctly

@@ -1910,14 +1906,14 @@ class Project < ActiveRecord::Base
  def check_repository_absence!
    return if skip_disk_validation

-    if repository_storage_path.blank? || repository_with_same_path_already_exists?
+    if repository_storage.blank? || repository_with_same_path_already_exists?
      errors.add(:base, 'There is already a repository with that name on disk')
      throw :abort
    end
  end

  def repository_with_same_path_already_exists?
-    gitlab_shell.exists?(repository_storage_path, "#{disk_path}.git")
+    gitlab_shell.exists?(repository_storage, "#{disk_path}.git")
  end

  # set last_activity_at to the same as created_at

--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -21,7 +21,7 @@ class ProjectWiki
  end

  delegate :empty?, to: :pages
-  delegate :repository_storage_path, :hashed_storage?, to: :project
+  delegate :repository_storage, :hashed_storage?, to: :project

  def path
    @project.path + '.wiki'

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -84,10 +84,15 @@ class Repository

  # Return absolute path to repository
  def path_to_repo
-    @path_to_repo ||= File.expand_path(
-      File.join(repository_storage_path, disk_path + '.git')
+    @path_to_repo ||=
+      begin
+        storage = Gitlab.config.repositories.storages[@project.repository_storage]
+
+        File.expand_path(
+          File.join(storage.legacy_disk_path, disk_path + '.git')
        )
      end
+  end

  def inspect
    "#<#{self.class.name}:#{@disk_path}>"
@@ -915,10 +920,6 @@ class Repository
    raw_repository.fetch_ref(source_repository.raw_repository, source_ref: source_ref, target_ref: target_ref)
  end

-  def repository_storage_path
-    @project.repository_storage_path
-  end
-
  def rebase(user, merge_request)
    raw.rebase(user, merge_request.id, branch: merge_request.source_branch,
                                       branch_sha: merge_request.source_branch_sha,

--- a/app/models/storage/hashed_project.rb
+++ b/app/models/storage/hashed_project.rb
 module Storage
  class HashedProject
    attr_accessor :project
-    delegate :gitlab_shell, :repository_storage_path, to: :project
+    delegate :gitlab_shell, :repository_storage, to: :project

    ROOT_PATH_PREFIX = '@hashed'.freeze

@@ -24,7 +24,7 @@ module Storage
    end

    def ensure_storage_path_exists
-      gitlab_shell.add_namespace(repository_storage_path, base_dir)
+      gitlab_shell.add_namespace(repository_storage, base_dir)
    end

    def rename_repo

--- a/app/models/storage/legacy_project.rb
+++ b/app/models/storage/legacy_project.rb
 module Storage
  class LegacyProject
    attr_accessor :project
-    delegate :namespace, :gitlab_shell, :repository_storage_path, to: :project
+    delegate :namespace, :gitlab_shell, :repository_storage, to: :project

    def initialize(project)
      @project = project
@@ -24,18 +24,18 @@ module Storage
    def ensure_storage_path_exists
      return unless namespace

-      gitlab_shell.add_namespace(repository_storage_path, base_dir)
+      gitlab_shell.add_namespace(repository_storage, base_dir)
    end

    def rename_repo
      new_full_path = project.build_full_path

-      if gitlab_shell.mv_repository(repository_storage_path, project.full_path_was, new_full_path)
+      if gitlab_shell.mv_repository(repository_storage, project.full_path_was, new_full_path)
        # If repository moved successfully we need to send update instructions to users.
        # However we cannot allow rollback since we moved repository
        # So we basically we mute exceptions in next actions
        begin
-          gitlab_shell.mv_repository(repository_storage_path, "#{project.full_path_was}.wiki", "#{new_full_path}.wiki")
+          gitlab_shell.mv_repository(repository_storage, "#{project.full_path_was}.wiki", "#{new_full_path}.wiki")
          return true
        rescue => e
          Rails.logger.error "Exception renaming #{project.full_path_was} -> #{new_full_path}: #{e}"

--- a/app/services/issues/close_service.rb
+++ b/app/services/issues/close_service.rb
@@ -26,7 +26,7 @@ module Issues
        issue.update(closed_by: current_user)
        event_service.close_issue(issue, current_user)
        create_note(issue, commit) if system_note
-        notification_service.close_issue(issue, current_user) if notifications
+        notification_service.async.close_issue(issue, current_user) if notifications
        todo_service.close_issue(issue, current_user)
        execute_hooks(issue, 'close')
        invalidate_cache_counts(issue, users: issue.assignees)

--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -139,7 +139,7 @@ module Issues
    end

    def notify_participants
-      notification_service.issue_moved(@old_issue, @new_issue, @current_user)
+      notification_service.async.issue_moved(@old_issue, @new_issue, @current_user)
    end
  end
 end
--- a/app/services/issues/reopen_service.rb
+++ b/app/services/issues/reopen_service.rb
@@ -6,7 +6,7 @@ module Issues
      if issue.reopen
        event_service.reopen_issue(issue, current_user)
        create_note(issue, 'reopened')
-        notification_service.reopen_issue(issue, current_user)
+        notification_service.async.reopen_issue(issue, current_user)
        execute_hooks(issue, 'reopen')
        invalidate_cache_counts(issue, users: issue.assignees)
        issue.update_project_counter_caches

--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -30,7 +30,7 @@ module Issues

      if issue.assignees != old_assignees
        create_assignee_note(issue, old_assignees)
-        notification_service.reassigned_issue(issue, current_user, old_assignees)
+        notification_service.async.reassigned_issue(issue, current_user, old_assignees)
        todo_service.reassigned_issue(issue, current_user, old_assignees)
      end

@@ -41,13 +41,13 @@ module Issues
      added_labels = issue.labels - old_labels

      if added_labels.present?
-        notification_service.relabeled_issue(issue, added_labels, current_user)
+        notification_service.async.relabeled_issue(issue, added_labels, current_user)
      end

      added_mentions = issue.mentioned_users - old_mentioned_users

      if added_mentions.present?
-        notification_service.new_mentions_in_issue(issue, added_mentions, current_user)
+        notification_service.async.new_mentions_in_issue(issue, added_mentions, current_user)
      end
    end


--- a/app/services/merge_requests/close_service.rb
+++ b/app/services/merge_requests/close_service.rb
@@ -10,7 +10,7 @@ module MergeRequests
      if merge_request.close
        create_event(merge_request)
        create_note(merge_request)
-        notification_service.close_mr(merge_request, current_user)
+        notification_service.async.close_mr(merge_request, current_user)
        todo_service.close_merge_request(merge_request, current_user)
        execute_hooks(merge_request, 'close')
        invalidate_cache_counts(merge_request, users: merge_request.assignees)

--- a/app/services/merge_requests/reopen_service.rb
+++ b/app/services/merge_requests/reopen_service.rb
@@ -6,7 +6,7 @@ module MergeRequests
      if merge_request.reopen
        create_event(merge_request)
        create_note(merge_request, 'reopened')
-        notification_service.reopen_mr(merge_request, current_user)
+        notification_service.async.reopen_mr(merge_request, current_user)
        execute_hooks(merge_request, 'reopen')
        merge_request.reload_diff(current_user)
        merge_request.mark_as_unchecked

--- a/app/services/merge_requests/resolved_discussion_notification_service.rb
+++ b/app/services/merge_requests/resolved_discussion_notification_service.rb
@@ -4,7 +4,7 @@ module MergeRequests
      return unless merge_request.discussions_resolved?

      SystemNoteService.resolve_all_discussions(merge_request, project, current_user)
-      notification_service.resolve_all_discussions(merge_request, current_user)
+      notification_service.async.resolve_all_discussions(merge_request, current_user)
    end
  end
 end
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -21,6 +21,7 @@ module MergeRequests
      update(merge_request)
    end

+    # rubocop:disable Metrics/AbcSize
    def handle_changes(merge_request, options)
      old_associations = options.fetch(:old_associations, {})
      old_labels = old_associations.fetch(:labels, [])
@@ -42,8 +43,11 @@ module MergeRequests
      end

      if merge_request.previous_changes.include?('assignee_id')
+        old_assignee_id = merge_request.previous_changes['assignee_id'].first
+        old_assignee = User.find(old_assignee_id) if old_assignee_id
+
        create_assignee_note(merge_request)
-        notification_service.reassigned_merge_request(merge_request, current_user)
+        notification_service.async.reassigned_merge_request(merge_request, current_user, old_assignee)
        todo_service.reassigned_merge_request(merge_request, current_user)
      end

@@ -54,7 +58,7 @@ module MergeRequests

      added_labels = merge_request.labels - old_labels
      if added_labels.present?
-        notification_service.relabeled_merge_request(
+        notification_service.async.relabeled_merge_request(
          merge_request,
          added_labels,
          current_user
@@ -63,13 +67,14 @@ module MergeRequests

      added_mentions = merge_request.mentioned_users - old_mentioned_users
      if added_mentions.present?
-        notification_service.new_mentions_in_merge_request(
+        notification_service.async.new_mentions_in_merge_request(
          merge_request,
          added_mentions,
          current_user
        )
      end
    end
+    # rubocop:enable Metrics/AbcSize

    def merge_from_quick_action(merge_request)
      last_diff_sha = params.delete(:merge)

--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -7,7 +7,32 @@
 # Ex.
 #   NotificationService.new.new_issue(issue, current_user)
 #
+# When calculating the recipients of a notification is expensive (for instance,
+# in the new issue case), `#async` will make that calculation happen in Sidekiq
+# instead:
+#
+#   NotificationService.new.async.new_issue(issue, current_user)
+#
 class NotificationService
+  class Async
+    attr_reader :parent
+    delegate :respond_to_missing, to: :parent
+
+    def initialize(parent)
+      @parent = parent
+    end
+
+    def method_missing(meth, *args)
+      return super unless parent.respond_to?(meth)
+
+      MailScheduler::NotificationServiceWorker.perform_async(meth.to_s, *args)
+    end
+  end
+
+  def async
+    @async ||= Async.new(self)
+  end
+
  # Always notify user about ssh key added
  # only if ssh key is not deploy key
  #
@@ -142,8 +167,23 @@ class NotificationService
  #  * merge_request assignee if their notification level is not Disabled
  #  * users with custom level checked with "reassign merge request"
  #
-  def reassigned_merge_request(merge_request, current_user)
-    reassign_resource_email(merge_request, current_user, :reassigned_merge_request_email)
+  def reassigned_merge_request(merge_request, current_user, previous_assignee)
+    recipients = NotificationRecipientService.build_recipients(
+      merge_request,
+      current_user,
+      action: "reassign",
+      previous_assignee: previous_assignee
+    )
+
+    recipients.each do |recipient|
+      mailer.reassigned_merge_request_email(
+        recipient.user.id,
+        merge_request.id,
+        previous_assignee&.id,
+        current_user.id,
+        recipient.reason
+      ).deliver_later
+    end
  end

  # When we add labels to a merge request we should send an email to:
@@ -421,29 +461,6 @@ class NotificationService
    end
  end

-  def reassign_resource_email(target, current_user, method)
-    previous_assignee_id = previous_record(target, 'assignee_id')
-    previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
-
-    recipients = NotificationRecipientService.build_recipients(
-      target,
-      current_user,
-      action: "reassign",
-      previous_assignee: previous_assignee
-    )
-
-    recipients.each do |recipient|
-      mailer.send(
-        method,
-        recipient.user.id,
-        target.id,
-        previous_assignee_id,
-        current_user.id,
-        recipient.reason
-      ).deliver_later
-    end
-  end
-
  def relabeled_resource_email(target, labels, current_user, method)
    recipients = labels.flat_map { |l| l.subscribers(target.project) }.uniq
    recipients = notifiable_users(
@@ -471,14 +488,6 @@ class NotificationService
    Notify
  end

-  def previous_record(object, attribute)
-    return unless object && attribute
-
-    if object.previous_changes.include?(attribute)
-      object.previous_changes[attribute].first
-    end
-  end
-
  private

  def recipients_for_pages_domain(domain)

--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -91,7 +91,7 @@ module Projects

        project.run_after_commit do
          # self is now project
-          GitlabShellWorker.perform_in(5.minutes, :remove_repository, self.repository_storage_path, new_path)
+          GitlabShellWorker.perform_in(5.minutes, :remove_repository, self.repository_storage, new_path)
        end
      else
        false
@@ -100,9 +100,9 @@ module Projects

    def mv_repository(from_path, to_path)
      # There is a possibility project does not have repository or wiki
-      return true unless gitlab_shell.exists?(project.repository_storage_path, from_path + '.git')
+      return true unless gitlab_shell.exists?(project.repository_storage, from_path + '.git')

-      gitlab_shell.mv_repository(project.repository_storage_path, from_path, to_path)
+      gitlab_shell.mv_repository(project.repository_storage, from_path, to_path)
    end

    def attempt_rollback(project, message)

--- a/app/services/projects/hashed_storage/migrate_repository_service.rb
+++ b/app/services/projects/hashed_storage/migrate_repository_service.rb
@@ -47,8 +47,8 @@ module Projects
      private

      def move_repository(from_name, to_name)
-        from_exists = gitlab_shell.exists?(project.repository_storage_path, "#{from_name}.git")
-        to_exists = gitlab_shell.exists?(project.repository_storage_path, "#{to_name}.git")
+        from_exists = gitlab_shell.exists?(project.repository_storage, "#{from_name}.git")
+        to_exists = gitlab_shell.exists?(project.repository_storage, "#{to_name}.git")

        # If we don't find the repository on either original or target we should log that as it could be an issue if the
        # project was not originally empty.
@@ -60,7 +60,7 @@ module Projects
          return true
        end

-        gitlab_shell.mv_repository(project.repository_storage_path, from_name, to_name)
+        gitlab_shell.mv_repository(project.repository_storage, from_name, to_name)
      end

      def rollback_folder_move

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

    def move_repo_folder(from_name, to_name)
-      gitlab_shell.mv_repository(project.repository_storage_path, from_name, to_name)
+      gitlab_shell.mv_repository(project.repository_storage, from_name, to_name)
    end

    def execute_system_hooks

--- a/app/services/projects/update_pages_service.rb
+++ b/app/services/projects/update_pages_service.rb
 module Projects
  class UpdatePagesService < BaseService
-    InvaildStateError = Class.new(StandardError)
+    InvalidStateError = Class.new(StandardError)
    FailedToExtractError = Class.new(StandardError)

    BLOCK_SIZE = 32.kilobytes
@@ -21,8 +21,8 @@ module Projects
      @status.enqueue!
      @status.run!

-      raise InvaildStateError, 'missing pages artifacts' unless build.artifacts?
-      raise InvaildStateError, 'pages are outdated' unless latest?
+      raise InvalidStateError, 'missing pages artifacts' unless build.artifacts?
+      raise InvalidStateError, 'pages are outdated' unless latest?

      # Create temporary directory in which we will extract the artifacts
      FileUtils.mkdir_p(tmp_path)
@@ -31,16 +31,16 @@ module Projects

        # Check if we did extract public directory
        archive_public_path = File.join(archive_path, 'public')
-        raise InvaildStateError, 'pages miss the public folder' unless Dir.exist?(archive_public_path)
-        raise InvaildStateError, 'pages are outdated' unless latest?
+        raise InvalidStateError, 'pages miss the public folder' unless Dir.exist?(archive_public_path)
+        raise InvalidStateError, 'pages are outdated' unless latest?

        deploy_page!(archive_public_path)
        success
      end
-    rescue InvaildStateError => e
+    rescue InvalidStateError => e
      error(e.message)
    rescue => e
-      error(e.message, false)
+      error(e.message)
      raise e
    end

@@ -48,17 +48,15 @@ module Projects

    def success
      @status.success
-      delete_artifact!
      super
    end

-    def error(message, allow_delete_artifact = true)
+    def error(message)
      register_failure
      log_error("Projects::UpdatePagesService: #{message}")
      @status.allow_failure = !latest?
      @status.description = message
      @status.drop(:script_failure)
-      delete_artifact! if allow_delete_artifact
      super
    end

@@ -77,18 +75,18 @@ module Projects
      if artifacts.ends_with?('.zip')
        extract_zip_archive!(temp_path)
      else
-        raise InvaildStateError, 'unsupported artifacts format'
+        raise InvalidStateError, 'unsupported artifacts format'
      end
    end

    def extract_zip_archive!(temp_path)
-      raise InvaildStateError, 'missing artifacts metadata' unless build.artifacts_metadata?
+      raise InvalidStateError, 'missing artifacts metadata' unless build.artifacts_metadata?

      # Calculate page size after extract
      public_entry = build.artifacts_metadata_entry(SITE_PATH, recursive: true)

      if public_entry.total_size > max_size
-        raise InvaildStateError, "artifacts for pages are too large: #{public_entry.total_size}"
+        raise InvalidStateError, "artifacts for pages are too large: #{public_entry.total_size}"
      end

      # Requires UnZip at least 6.00 Info-ZIP.
@@ -162,11 +160,6 @@ module Projects
      build.artifacts_file.path
    end

-    def delete_artifact!
-      build.reload # Reload stable object to prevent erase artifacts with old state
-      build.erase_artifacts! unless build.has_expiring_artifacts?
-    end
-
    def latest_sha
      project.commit(build.ref).try(:sha).to_s
    ensure

--- a/app/services/repository_archive_clean_up_service.rb
+++ b/app/services/repository_archive_clean_up_service.rb
@@ -20,11 +20,12 @@ class RepositoryArchiveCleanUpService
  private

  def clean_up_old_archives
-    run(%W(find #{path} -not -path #{path} -type f \( -name \*.tar -o -name \*.bz2 -o -name \*.tar.gz -o -name \*.zip \) -maxdepth 2 -mmin +#{mmin} -delete))
+    run(%W(find #{path} -mindepth 1 -maxdepth 3 -type f \( -name \*.tar -o -name \*.bz2 -o -name \*.tar.gz -o -name \*.zip \) -mmin +#{mmin} -delete))
  end

  def clean_up_empty_directories
-    run(%W(find #{path} -not -path #{path} -type d -empty -name \*.git -maxdepth 1 -delete))
+    run(%W(find #{path} -mindepth 2 -maxdepth 2 -type d -empty -delete))
+    run(%W(find #{path} -mindepth 1 -maxdepth 1 -type d -empty -delete))
  end

  def run(cmd)

--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -159,7 +159,7 @@ module SystemNoteService
    body = if noteable.time_estimate == 0
             "removed time estimate"
           else
-             "changed time estimate to #{parsed_time},"
+             "changed time estimate to #{parsed_time}"
           end

    create_note(NoteSummary.new(noteable, project, author, body, action: 'time_tracking'))

--- a/app/views/admin/users/_user.html.haml
+++ b/app/views/admin/users/_user.html.haml
@@ -43,7 +43,7 @@
                  delete_user_url: admin_user_path(user),
                  block_user_url: block_admin_user_path(user),
                  username: user.name,
-                  delete_contributions: 'false' }, type: 'button' }
+                  delete_contributions: false }, type: 'button' }
                  = s_('AdminUsers|Delete user')

            %li
@@ -52,5 +52,5 @@
                delete_user_url: admin_user_path(user, hard_delete: true),
                block_user_url: block_admin_user_path(user),
                username: user.name,
-                delete_contributions: 'true' }, type: 'button' }
+                delete_contributions: true }, type: 'button' }
                = s_('AdminUsers|Delete user and contributions')
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -183,7 +183,7 @@
              delete_user_url: admin_user_path(@user),
              block_user_url: block_admin_user_path(@user),
              username: @user.name,
-              delete_contributions: 'false' }, type: 'button' }
+              delete_contributions: false }, type: 'button' }
              = s_('AdminUsers|Delete user')
          - else
            - if @user.solo_owned_groups.present?
@@ -215,7 +215,7 @@
                delete_user_url: admin_user_path(@user, hard_delete: true),
                block_user_url: block_admin_user_path(@user),
                username: @user.name,
-                delete_contributions: 'true' }, type: 'button' }
+                delete_contributions: true }, type: 'button' }
                = s_('AdminUsers|Delete user and contributions')
          - else
            %p

--- a/app/views/ci/variables/_variable_row.html.haml
+++ b/app/views/ci/variables/_variable_row.html.haml
@@ -17,14 +17,14 @@
  .ci-variable-row-body
    %input.js-ci-variable-input-id{ type: "hidden", name: id_input_name, value: id }
    %input.js-ci-variable-input-destroy{ type: "hidden", name: destroy_input_name }
-    %input.js-ci-variable-input-key.ci-variable-body-item.form-control{ type: "text",
+    %input.js-ci-variable-input-key.ci-variable-body-item.qa-ci-variable-input-key.form-control{ type: "text",
      name: key_input_name,
      value: key,
      placeholder: s_('CiVariables|Input variable key') }
    .ci-variable-body-item
-      .form-control.js-secret-value-placeholder{ class: ('hide' unless id) }
+      .form-control.js-secret-value-placeholder.qa-ci-variable-input-value{ class: ('hide' unless id) }
        = '*' * 20
-      %textarea.js-ci-variable-input-value.js-secret-value.form-control{ class: ('hide' if id),
+      %textarea.js-ci-variable-input-value.js-secret-value.qa-ci-variable-input-value.form-control{ class: ('hide' if id),
        rows: 1,
        name: value_input_name,
        placeholder: s_('CiVariables|Input variable value') }

--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
 - breadcrumb_title "General Settings"
+- @content_class = "limit-container-width" unless fluid_layout
+
 .panel.panel-default.prepend-top-default
  .panel-heading
    Group settings

--- a/app/views/peek/_bar.html.haml
+++ b/app/views/peek/_bar.html.haml
@@ -5,8 +5,3 @@
         peek_url: peek_routes.results_url,
         profile_url: url_for(params.merge(lineprofiler: 'true')) },
         class: Peek.env }
-
-#peek-view-performance-bar.hidden
-  = render_server_response_time
-  %span#serverstats
-  %ul.performance-bar
--- a/app/views/projects/forks/new.html.haml
+++ b/app/views/projects/forks/new.html.haml
@@ -12,7 +12,7 @@
    - if @namespaces.present?
      .fork-thumbnail-container.js-fork-content
        %h5.prepend-top-0.append-bottom-0.prepend-left-default.append-right-default
-          Click to fork the project
+          = _("Select a namespace to fork the project")
        - @namespaces.each do |namespace|
          = render 'fork_button', namespace: namespace
    - else

--- a/app/views/projects/protected_branches/_branches_list.html.haml
+++ b/app/views/projects/protected_branches/_branches_list.html.haml
 - can_admin_project = can?(current_user, :admin_project, @project)

 = render layout: 'projects/protected_branches/shared/branches_list', locals: { can_admin_project: can_admin_project } do
-  = render partial: 'projects/protected_branches/protected_branch', collection: @protected_branches, locals: { can_admin_project: can_admin_project}
+  = render partial: 'projects/protected_branches/protected_branch', collection: @protected_branches
--- a/app/views/projects/protected_branches/_create_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/_create_protected_branch.html.haml
 - content_for :merge_access_levels do
  .merge_access_levels-container
    = dropdown_tag('Select',
-                    options: { toggle_class: 'js-allowed-to-merge wide',
-                    dropdown_class: 'dropdown-menu-selectable capitalize-header',
+                    options: { toggle_class: 'js-allowed-to-merge qa-allowed-to-merge-select wide',
+                    dropdown_class: 'dropdown-menu-selectable qa-allowed-to-merge-dropdown capitalize-header',
                    data: { field_name: 'protected_branch[merge_access_levels_attributes][0][access_level]', input_id: 'merge_access_levels_attributes' }})
 - content_for :push_access_levels do
  .push_access_levels-container

--- a/app/views/projects/protected_branches/_update_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/_update_protected_branch.html.haml
 %td
  = hidden_field_tag "allowed_to_merge_#{protected_branch.id}", protected_branch.merge_access_levels.first.access_level
  = dropdown_tag( (protected_branch.merge_access_levels.first.humanize || 'Select') ,
-                 options: { toggle_class: 'js-allowed-to-merge', dropdown_class: 'dropdown-menu-selectable js-allowed-to-merge-container capitalize-header',
+                 options: { toggle_class: 'js-allowed-to-merge qa-allowed-to-merge', dropdown_class: 'dropdown-menu-selectable js-allowed-to-merge-container capitalize-header',
                 data: { field_name: "allowed_to_merge_#{protected_branch.id}", access_level_id: protected_branch.merge_access_levels.first.id }})
 %td
  = hidden_field_tag "allowed_to_push_#{protected_branch.id}", protected_branch.push_access_levels.first.access_level

--- a/app/views/projects/protected_branches/shared/_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/shared/_protected_branch.html.haml
@@ -21,4 +21,4 @@

  - if can_admin_project
    %td
-      = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: 'btn btn-warning'
+      = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_branch], disabled: local_assigns[:disabled], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-warning"
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -36,5 +36,6 @@
            = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
            .help-block
              = s_('CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.')
+              = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank'

          = f.submit 'Save changes', class: "btn btn-success prepend-top-15"
--- a/app/views/shared/_group_form.html.haml
+++ b/app/views/shared/_group_form.html.haml
@@ -32,6 +32,13 @@
      required: true,
      title: 'You can choose a descriptive name different from the path.'

+- if @group.persisted?
+  .form-group.group-name-holder
+    = f.label :id, class: 'control-label' do
+      = _("Group ID")
+    .col-sm-10
+      = f.text_field :id, class: 'form-control', readonly: true
+
 .form-group.group-description-holder
  = f.label :description, class: 'control-label'
  .col-sm-10

--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -41,6 +41,7 @@
 - github_importer:github_import_stage_import_repository

 - mail_scheduler:mail_scheduler_issue_due
+- mail_scheduler:mail_scheduler_notification_service

 - object_storage_upload
 - object_storage:object_storage_background_move

--- a/app/workers/concerns/mail_scheduler_queue.rb
+++ b/app/workers/concerns/mail_scheduler_queue.rb
@@ -4,4 +4,8 @@ module MailSchedulerQueue
  included do
    queue_namespace :mail_scheduler
  end
+
+  def notification_service
+    @notification_service ||= NotificationService.new
+  end
 end
--- a/app/workers/mail_scheduler/issue_due_worker.rb
+++ b/app/workers/mail_scheduler/issue_due_worker.rb
@@ -4,8 +4,6 @@ module MailScheduler
    include MailSchedulerQueue

    def perform(project_id)
-      notification_service = NotificationService.new
-
      Issue.opened.due_tomorrow.in_projects(project_id).preload(:project).find_each do |issue|
        notification_service.issue_due(issue)
      end

--- a/app/workers/mail_scheduler/notification_service_worker.rb
+++ b/app/workers/mail_scheduler/notification_service_worker.rb
+require 'active_job/arguments'
+
+module MailScheduler
+  class NotificationServiceWorker
+    include ApplicationWorker
+    include MailSchedulerQueue
+
+    def perform(meth, *args)
+      deserialized_args = ActiveJob::Arguments.deserialize(args)
+
+      notification_service.public_send(meth, *deserialized_args) # rubocop:disable GitlabSecurity/PublicSend
+    rescue ActiveJob::DeserializationError
+    end
+
+    def self.perform_async(*args)
+      super(*ActiveJob::Arguments.serialize(args))
+    end
+  end
+end
--- a/app/workers/repository_fork_worker.rb
+++ b/app/workers/repository_fork_worker.rb
@@ -13,7 +13,9 @@ class RepositoryForkWorker
    # See https://gitlab.com/gitlab-org/gitaly/issues/1110
    if args.empty?
      source_project = target_project.forked_from_project
-      return target_project.mark_import_as_failed('Source project cannot be found.') unless source_project
+      unless source_project
+        return target_project.mark_import_as_failed('Source project cannot be found.')
+      end

      fork_repository(target_project, source_project.repository_storage, source_project.disk_path)
    else

--- a/changelogs/unreleased/45398-fix-rss-button.yml
+++ b/changelogs/unreleased/45398-fix-rss-button.yml
+---
+title: Fix tabs container styles to make RSS button clickable
+merge_request: 18559
+author:
+type: fixed
--- a/changelogs/unreleased/45451-user-deletion-modal-with-same-info-for-delete-user-or-delete-user-and-contributions.yml
+++ b/changelogs/unreleased/45451-user-deletion-modal-with-same-info-for-delete-user-or-delete-user-and-contributions.yml
+---
+title: Correct text and functionality for delete user / delete user and contributions
+  modal.
+merge_request: 18463
+author: Marc Schwede
+type: fixed
--- a/changelogs/unreleased/45481-sane-pages-artifacts.yml
+++ b/changelogs/unreleased/45481-sane-pages-artifacts.yml
+---
+title: Don't automatically remove artifacts for pages jobs after pages:deploy has
+  run
+merge_request: 18628
+author:
+type: fixed
--- a/changelogs/unreleased/45572-members-invitations-scheduled-before-commit.yml
+++ b/changelogs/unreleased/45572-members-invitations-scheduled-before-commit.yml
+---
+title: Ensure member notifications are sent after the member actual creation/update in the DB
+merge_request: 18538
+author:
+type: fixed
--- a/changelogs/unreleased/accessible-text.yml
+++ b/changelogs/unreleased/accessible-text.yml
+---
+title: Replace "Click" with "Select" to be more inclusive of people with accessibility
+  requirements
+merge_request: 18386
+author: Mark Lapierre
+type: other
--- a/changelogs/unreleased/add-jwt-strategy-to-gitlab-suite.yml
+++ b/changelogs/unreleased/add-jwt-strategy-to-gitlab-suite.yml
+---
+title: Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite
+merge_request: 18580
+author:
+type: fixed
--- a/changelogs/unreleased/align-project-avatar-on-small-viewports.yml
+++ b/changelogs/unreleased/align-project-avatar-on-small-viewports.yml
+---
+title: Align project avatar on small viewports
+merge_request: 18513
+author: George Tsiolis
+type: changed
--- a/changelogs/unreleased/bvl-fix-openid-redirect.yml
+++ b/changelogs/unreleased/bvl-fix-openid-redirect.yml
+---
+title: Fix redirection error for applications using OpenID
+merge_request: 18599
+author:
+type: fixed
--- a/changelogs/unreleased/jramsay-44880-filter-pipelines-by-sha.yml
+++ b/changelogs/unreleased/jramsay-44880-filter-pipelines-by-sha.yml
+---
+title: Add sha filter to pipelines list API
+merge_request: 18125
+author:
+type: changed
--- a/changelogs/unreleased/move-notification-service-calls-to-sidekiq.yml
+++ b/changelogs/unreleased/move-notification-service-calls-to-sidekiq.yml
+---
+title: Compute notification recipients in background jobs
+merge_request:
+author:
+type: performance
--- a/changelogs/unreleased/performance-gb-improve-pipeline-creation-service.yml
+++ b/changelogs/unreleased/performance-gb-improve-pipeline-creation-service.yml
+---
+title: Improve performance of a service responsible for creating a pipeline
+merge_request: 18582
+author:
+type: performance
--- a/changelogs/unreleased/restore-label-underline-color.yml
+++ b/changelogs/unreleased/restore-label-underline-color.yml
+---
+title: Restore label underline color
+merge_request: 18407
+author: George Tsiolis
+type: fixed
--- a/changelogs/unreleased/restore-size-and-position-for-fork-icon.yml
+++ b/changelogs/unreleased/restore-size-and-position-for-fork-icon.yml
+---
+title: Fix size and position for fork icon
+merge_request: 18449
+author: George Tsiolis
+type: changed
--- a/changelogs/unreleased/security-45689-fix-archive-cache-bug.yml
+++ b/changelogs/unreleased/security-45689-fix-archive-cache-bug.yml
+---
+title: Serve archive requests with the correct file in all cases
+merge_request:
+author:
+type: security
--- a/changelogs/unreleased/security_issue_42029.yml
+++ b/changelogs/unreleased/security_issue_42029.yml
+---
+title: Sanitizes user name to avoid XSS attacks
+merge_request:
+author:
+type: security
--- a/changelogs/unreleased/show-group-id-in-group-settings.yml
+++ b/changelogs/unreleased/show-group-id-in-group-settings.yml
+---
+title: Show group id in group settings
+merge_request: 18482
+author: George Tsiolis
+type: added
--- a/changelogs/unreleased/winh-dashboard-any-milestone.yml
+++ b/changelogs/unreleased/winh-dashboard-any-milestone.yml
+---
+title: Reset milestone filter when clicking "Any Milestone" in dashboard
+merge_request: 18531
+author:
+type: fixed
--- a/changelogs/unreleased/zj-repository-exist-mandatory.yml
+++ b/changelogs/unreleased/zj-repository-exist-mandatory.yml
+---
+title: Repository#exists? is always executed through Gitaly
+merge_request:
+author:
+type: performance
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -184,7 +184,7 @@ production: &base
    # base_dir: uploads/-/system
    object_store:
      enabled: false
-      # remote_directory: uploads # Bucket name
+      remote_directory: uploads # Bucket name
      # direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
      # background_upload: false # Temporary option to limit automatic upload (Default: true)
      # proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
@@ -212,6 +212,8 @@ production: &base
    artifacts_server: true
    # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
    # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
+    admin:
+      address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)

  ## Mattermost
  ## For enabling Add to Mattermost button
@@ -532,7 +534,7 @@ production: &base
      #             required_claims: ["name", "email"],
      #             info_map: { name: "name", email: "email" },
      #             auth_url: 'https://example.com/',
-      #             valid_within: nil,
+      #             valid_within: null,
      #           }
      #   }
      # - { name: 'saml',
@@ -823,7 +825,7 @@ test:
                  required_claims: ["name", "email"],
                  info_map: { name: "name", email: "email" },
                  auth_url: 'https://example.com/',
-                  valid_within: nil,
+                  valid_within: null,
                }
        }
      - { name: 'auth0',

--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
--- a/config/initializers/2_gitlab.rb
+++ b/config/initializers/2_gitlab.rb
--- a/config/initializers/fast_gettext.rb
+++ b/config/initializers/fast_gettext.rb
--- a/config/initializers/deprecations.rb
+++ b/config/initializers/deprecations.rb
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
--- a/config/initializers/pages.rb
+++ b/config/initializers/pages.rb
--- a/config/initializers/peek.rb
+++ b/config/initializers/peek.rb
--- a/lib/settings.rb
+++ b/lib/settings.rb
--- a/db/migrate/20161220141214_remove_dot_git_from_group_names.rb
+++ b/db/migrate/20161220141214_remove_dot_git_from_group_names.rb
--- a/db/migrate/20161226122833_remove_dot_git_from_usernames.rb
+++ b/db/migrate/20161226122833_remove_dot_git_from_usernames.rb
--- a/db/migrate/20180425131009_assure_commits_count_for_merge_request_diff.rb
+++ b/db/migrate/20180425131009_assure_commits_count_for_merge_request_diff.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/README.md
+++ b/doc/README.md
--- a/doc/administration/auth/jwt.md
+++ b/doc/administration/auth/jwt.md
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
--- a/doc/administration/job_artifacts.md
+++ b/doc/administration/job_artifacts.md
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
--- a/doc/administration/operations/fast_ssh_key_lookup.md
+++ b/doc/administration/operations/fast_ssh_key_lookup.md
--- a/doc/administration/uploads.md
+++ b/doc/administration/uploads.md
--- a/doc/api/README.md
+++ b/doc/api/README.md
--- a/doc/api/group_badges.md
+++ b/doc/api/group_badges.md
--- a/doc/api/pipeline_schedules.md
+++ b/doc/api/pipeline_schedules.md
--- a/doc/api/pipelines.md
+++ b/doc/api/pipelines.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/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
+++ b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
--- a/doc/development/README.md
+++ b/doc/development/README.md
--- a/doc/development/background_migrations.md
+++ b/doc/development/background_migrations.md
--- a/doc/development/diffs.md
+++ b/doc/development/diffs.md
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.md
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
--- a/doc/development/fe_guide/style_guide_js.md
+++ b/doc/development/fe_guide/style_guide_js.md
--- a/doc/development/file_storage.md
+++ b/doc/development/file_storage.md
--- a/doc/development/i18n/externalization.md
+++ b/doc/development/i18n/externalization.md
--- a/doc/development/img/state-model-issue.png
+++ b/doc/development/img/state-model-issue.png
--- a/doc/development/img/state-model-legend.png
+++ b/doc/development/img/state-model-legend.png
--- a/doc/development/img/state-model-merge-request.png
+++ b/doc/development/img/state-model-merge-request.png
--- a/doc/development/merge_request_performance_guidelines.md
+++ b/doc/development/merge_request_performance_guidelines.md
--- a/doc/development/object_state_models.md
+++ b/doc/development/object_state_models.md
--- a/doc/development/ordering_table_columns.md
+++ b/doc/development/ordering_table_columns.md
--- a/doc/development/testing_guide/testing_levels.md
+++ b/doc/development/testing_guide/testing_levels.md
--- a/doc/development/ux_guide/components.md
+++ b/doc/development/ux_guide/components.md
--- a/doc/development/what_requires_downtime.md
+++ b/doc/development/what_requires_downtime.md
--- a/doc/development/writing_documentation.md
+++ b/doc/development/writing_documentation.md
--- a/doc/install/database_mysql.md
+++ b/doc/install/database_mysql.md
--- a/doc/install/google_cloud_platform/index.md
+++ b/doc/install/google_cloud_platform/index.md
--- a/doc/install/kubernetes/gitlab_chart.md
+++ b/doc/install/kubernetes/gitlab_chart.md
--- a/doc/install/kubernetes/gitlab_runner_chart.md
+++ b/doc/install/kubernetes/gitlab_runner_chart.md
--- a/doc/install/kubernetes/index.md
+++ b/doc/install/kubernetes/index.md
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
--- a/doc/university/glossary/README.md
+++ b/doc/university/glossary/README.md
--- a/doc/university/high-availability/aws/README.md
+++ b/doc/university/high-availability/aws/README.md
--- a/doc/university/support/README.md
+++ b/doc/university/support/README.md
--- a/doc/university/training/end-user/README.md
+++ b/doc/university/training/end-user/README.md
--- a/doc/university/training/topics/tags.md
+++ b/doc/university/training/topics/tags.md
--- a/doc/university/training/user_training.md
+++ b/doc/university/training/user_training.md
--- a/doc/user/admin_area/settings/sign_up_restrictions.md
+++ b/doc/user/admin_area/settings/sign_up_restrictions.md
--- a/doc/user/group/img/groups.png
+++ b/doc/user/group/img/groups.png
--- a/doc/user/group/img/new_group_from_groups.png
+++ b/doc/user/group/img/new_group_from_groups.png
--- a/doc/user/group/img/new_group_from_other_pages.png
+++ b/doc/user/group/img/new_group_from_other_pages.png
--- a/doc/user/group/subgroups/index.md
+++ b/doc/user/group/subgroups/index.md
--- a/doc/user/index.md
+++ b/doc/user/index.md
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
--- a/doc/user/project/issues/closing_issues.md
+++ b/doc/user/project/issues/closing_issues.md
--- a/doc/user/project/issues/crosslinking_issues.md
+++ b/doc/user/project/issues/crosslinking_issues.md
--- a/doc/user/project/issues/issues_functionalities.md
+++ b/doc/user/project/issues/issues_functionalities.md
--- a/doc/user/project/milestones/index.md
+++ b/doc/user/project/milestones/index.md
--- a/doc/user/project/pages/getting_started_part_two.md
+++ b/doc/user/project/pages/getting_started_part_two.md
--- a/doc/user/project/pages/img/remove_fork_relashionship.png
+++ b/doc/user/project/pages/img/remove_fork_relashionship.png
--- a/doc/user/project/pages/index.md
+++ b/doc/user/project/pages/index.md
--- a/doc/user/project/repository/reducing_the_repo_size_using_git.md
+++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
--- a/lib/api/pipelines.rb
+++ b/lib/api/pipelines.rb
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
--- a/lib/gitlab/bare_repository_import/importer.rb
+++ b/lib/gitlab/bare_repository_import/importer.rb
--- a/lib/gitlab/base_doorkeeper_controller.rb
+++ b/lib/gitlab/base_doorkeeper_controller.rb
--- a/lib/gitlab/ci/pipeline/chain/populate.rb
+++ b/lib/gitlab/ci/pipeline/chain/populate.rb
--- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb
+++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb
--- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb
+++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb
--- a/lib/gitlab/git/remote_repository.rb
+++ b/lib/gitlab/git/remote_repository.rb
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
--- a/lib/gitlab/pages_client.rb
+++ b/lib/gitlab/pages_client.rb
--- a/lib/gitlab/shell.rb
+++ b/lib/gitlab/shell.rb
--- a/lib/omni_auth/strategies/jwt.rb
+++ b/lib/omni_auth/strategies/jwt.rb
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
--- a/lib/tasks/gitlab/list_repos.rake
+++ b/lib/tasks/gitlab/list_repos.rake
--- a/lib/tasks/gitlab/pages.rake
+++ b/lib/tasks/gitlab/pages.rake
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
--- a/package.json
+++ b/package.json
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
--- a/qa/Gemfile
+++ b/qa/Gemfile
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
--- a/qa/qa.rb
+++ b/qa/qa.rb
--- a/qa/qa/factory/repository/push.rb
+++ b/qa/qa/factory/repository/push.rb
--- a/qa/qa/factory/resource/branch.rb
+++ b/qa/qa/factory/resource/branch.rb
--- a/qa/qa/factory/resource/deploy_key.rb
+++ b/qa/qa/factory/resource/deploy_key.rb
--- a/qa/qa/factory/resource/merge_request.rb
+++ b/qa/qa/factory/resource/merge_request.rb
--- a/qa/qa/factory/resource/project.rb
+++ b/qa/qa/factory/resource/project.rb
--- a/qa/qa/factory/resource/secret_variable.rb
+++ b/qa/qa/factory/resource/secret_variable.rb
--- a/qa/qa/git/location.rb
+++ b/qa/qa/git/location.rb
--- a/qa/qa/git/repository.rb
+++ b/qa/qa/git/repository.rb
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
--- a/qa/qa/page/project/settings/protected_branches.rb
+++ b/qa/qa/page/project/settings/protected_branches.rb
--- a/qa/qa/page/project/settings/secret_variables.rb
+++ b/qa/qa/page/project/settings/secret_variables.rb
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
--- a/qa/qa/runtime/key/base.rb
+++ b/qa/qa/runtime/key/base.rb
--- a/qa/qa/runtime/key/ecdsa.rb
+++ b/qa/qa/runtime/key/ecdsa.rb
--- a/qa/qa/runtime/key/ed25519.rb
+++ b/qa/qa/runtime/key/ed25519.rb
--- a/qa/qa/runtime/key/rsa.rb
+++ b/qa/qa/runtime/key/rsa.rb
--- a/qa/qa/runtime/rsa_key.rb
+++ b/qa/qa/runtime/rsa_key.rb
--- a/qa/qa/service/shellout.rb
+++ b/qa/qa/service/shellout.rb
--- a/qa/qa/specs/features/project/add_deploy_key_spec.rb
+++ b/qa/qa/specs/features/project/add_deploy_key_spec.rb
--- a/qa/qa/specs/features/project/deploy_key_clone_spec.rb
+++ b/qa/qa/specs/features/project/deploy_key_clone_spec.rb
--- a/qa/qa/specs/features/repository/clone_spec.rb
+++ b/qa/qa/specs/features/repository/clone_spec.rb
--- a/qa/qa/specs/features/repository/protected_branches_spec.rb
+++ b/qa/qa/specs/features/repository/protected_branches_spec.rb
--- a/qa/spec/runtime/key/ecdsa_spec.rb
+++ b/qa/spec/runtime/key/ecdsa_spec.rb
--- a/qa/spec/runtime/key/ed25519_spec.rb
+++ b/qa/spec/runtime/key/ed25519_spec.rb
--- a/qa/spec/runtime/rsa_key.rb
+++ b/qa/spec/runtime/rsa_key.rb
--- a/spec/controllers/profiles_controller_spec.rb
+++ b/spec/controllers/profiles_controller_spec.rb
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
--- a/spec/features/dashboard/milestone_filter_spec.rb
+++ b/spec/features/dashboard/milestone_filter_spec.rb
--- a/spec/features/groups/members/manage_access_requests_spec.rb
+++ b/spec/features/groups/members/manage_access_requests_spec.rb
--- a/spec/features/groups/members/master_manages_access_requests_spec.rb
+++ b/spec/features/groups/members/master_manages_access_requests_spec.rb
--- a/spec/features/projects/import_export/test_project_export.tar.gz
+++ b/spec/features/projects/import_export/test_project_export.tar.gz
--- a/spec/features/projects/members/master_manages_access_requests_spec.rb
+++ b/spec/features/projects/members/master_manages_access_requests_spec.rb
--- a/spec/features/projects/tree/upload_file_spec.rb
+++ b/spec/features/projects/tree/upload_file_spec.rb
--- a/spec/finders/pipelines_finder_spec.rb
+++ b/spec/finders/pipelines_finder_spec.rb
--- a/spec/fixtures/exported-project.gz
+++ b/spec/fixtures/exported-project.gz
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
--- a/spec/javascripts/activities_spec.js
+++ b/spec/javascripts/activities_spec.js
--- a/spec/javascripts/commits_spec.js
+++ b/spec/javascripts/commits_spec.js
--- a/spec/javascripts/ide/components/new_dropdown/index_spec.js
+++ b/spec/javascripts/ide/components/new_dropdown/index_spec.js
--- a/spec/javascripts/ide/components/new_dropdown/modal_spec.js
+++ b/spec/javascripts/ide/components/new_dropdown/modal_spec.js
--- a/spec/javascripts/ide/stores/actions_spec.js
+++ b/spec/javascripts/ide/stores/actions_spec.js
--- a/spec/javascripts/ide/stores/mutations_spec.js
+++ b/spec/javascripts/ide/stores/mutations_spec.js
--- a/spec/javascripts/pager_spec.js
+++ b/spec/javascripts/pager_spec.js
--- a/spec/javascripts/sidebar/mock_data.js
+++ b/spec/javascripts/sidebar/mock_data.js
--- a/spec/javascripts/sidebar/sidebar_move_issue_spec.js
+++ b/spec/javascripts/sidebar/sidebar_move_issue_spec.js
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_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/bare_repository_import/repository_spec.rb
+++ b/spec/lib/gitlab/bare_repository_import/repository_spec.rb
--- a/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
--- a/spec/lib/gitlab/import_export/wiki_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/wiki_restorer_spec.rb
--- a/spec/lib/gitlab/pages_client_spec.rb
+++ b/spec/lib/gitlab/pages_client_spec.rb
--- a/spec/lib/gitlab/shell_spec.rb
+++ b/spec/lib/gitlab/shell_spec.rb
--- a/spec/lib/omni_auth/strategies/jwt_spec.rb
+++ b/spec/lib/omni_auth/strategies/jwt_spec.rb
--- a/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb
+++ b/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb
--- a/spec/models/members/group_member_spec.rb
+++ b/spec/models/members/group_member_spec.rb
--- a/spec/models/members/project_member_spec.rb
+++ b/spec/models/members/project_member_spec.rb
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
--- a/spec/requests/openid_connect_spec.rb
+++ b/spec/requests/openid_connect_spec.rb
--- a/spec/services/groups/destroy_service_spec.rb
+++ b/spec/services/groups/destroy_service_spec.rb
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
--- a/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb
+++ b/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
--- a/spec/services/repository_archive_clean_up_service_spec.rb
+++ b/spec/services/repository_archive_clean_up_service_spec.rb
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
--- a/spec/services/users/destroy_service_spec.rb
+++ b/spec/services/users/destroy_service_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/support/helpers/javascript_fixtures_helpers.rb
+++ b/spec/support/helpers/javascript_fixtures_helpers.rb
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
--- a/spec/support/shared_examples/features/master_manages_access_requests_shared_example.rb
+++ b/spec/support/shared_examples/features/master_manages_access_requests_shared_example.rb
--- a/spec/support/shared_examples/models/members_notifications_shared_example.rb
+++ b/spec/support/shared_examples/models/members_notifications_shared_example.rb
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
--- a/spec/workers/mail_scheduler/issue_due_worker_spec.rb
+++ b/spec/workers/mail_scheduler/issue_due_worker_spec.rb
--- a/spec/workers/mail_scheduler/notification_service_worker_spec.rb
+++ b/spec/workers/mail_scheduler/notification_service_worker_spec.rb
--- a/spec/workers/namespaceless_project_destroy_worker_spec.rb
+++ b/spec/workers/namespaceless_project_destroy_worker_spec.rb
--- a/vendor/assets/javascripts/peek.performance_bar.js
+++ b/vendor/assets/javascripts/peek.performance_bar.js
--- a/vendor/project_templates/express.tar.gz
+++ b/vendor/project_templates/express.tar.gz
--- a/vendor/project_templates/rails.tar.gz
+++ b/vendor/project_templates/rails.tar.gz
--- a/vendor/project_templates/spring.tar.gz
+++ b/vendor/project_templates/spring.tar.gz
--- a/yarn.lock
+++ b/yarn.lock