From c55685d265b628d457fc065df2559fc89996cef9 Mon Sep 17 00:00:00 2001
From: Alexander Tanayno <atanayno@gitlab.com>
Date: Wed, 18 Apr 2018 12:04:40 +0000
Subject: add restart of gitlab-pages to apply gitlab pages settings

---
 doc/administration/pages/index.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 00c631fdaae..c342a82ef7b 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -124,6 +124,12 @@ The Pages daemon doesn't listen to the outside world.
     ```
 
 1. [Reconfigure GitLab][reconfigure]
+1. Restart gitlab-pages by running the following command:
+
+     ```ruby
+    sudo gitlab-ctl restart gitlab-pages
+    ```
+
 
 Watch the [video tutorial][video-admin] for this configuration.
 
@@ -155,6 +161,11 @@ outside world.
     respectively.
 
 1. [Reconfigure GitLab][reconfigure]
+1. Restart gitlab-pages by running the following command:
+
+     ```ruby
+    sudo gitlab-ctl restart gitlab-pages
+    ```
 
 ## Advanced configuration
 
@@ -192,6 +203,11 @@ world. Custom domains are supported, but no TLS.
     listens on. If you don't have IPv6, you can omit the IPv6 address.
 
 1. [Reconfigure GitLab][reconfigure]
+1. Restart gitlab-pages by running the following command:
+
+     ```ruby
+    sudo gitlab-ctl restart gitlab-pages
+    ```
 
 ### Custom domains with TLS support
 
@@ -225,6 +241,11 @@ world. Custom domains and TLS are supported.
     listens on. If you don't have IPv6, you can omit the IPv6 address.
 
 1. [Reconfigure GitLab][reconfigure]
+1. Restart gitlab-pages by running the following command:
+
+     ```ruby
+    sudo gitlab-ctl restart gitlab-pages
+    ```
 
 ### Custom domain verification
 
@@ -252,6 +273,11 @@ are stored.
      ```
 
 1. [Reconfigure GitLab][reconfigure]
+1. Restart gitlab-pages by running the following command:
+
+     ```ruby
+    sudo gitlab-ctl restart gitlab-pages
+    ```
 
 ## Set maximum pages size
 
-- 
cgit v1.2.3


From 5a29a304be5fc86a5bbe61764c47cdd8069e2103 Mon Sep 17 00:00:00 2001
From: Jacopo <beschi.jacopo@gmail.com>
Date: Thu, 5 Apr 2018 17:17:02 +0200
Subject: Shows new branch/mr button even when branch exists

---
 .../javascripts/create_merge_request_dropdown.js   | 33 +++++++-----
 app/controllers/projects/issues_controller.rb      |  6 +--
 app/models/issue.rb                                | 16 ++++--
 .../unreleased/42803-show-new-branch-mr-button.yml |  5 ++
 spec/javascripts/issue_spec.js                     |  1 +
 spec/models/issue_spec.rb                          | 63 ++++++++++++++++++++++
 6 files changed, 104 insertions(+), 20 deletions(-)
 create mode 100644 changelogs/unreleased/42803-show-new-branch-mr-button.yml

diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js
index fb1fc9cd32e..a88b6971f90 100644
--- a/app/assets/javascripts/create_merge_request_dropdown.js
+++ b/app/assets/javascripts/create_merge_request_dropdown.js
@@ -84,20 +84,21 @@ export default class CreateMergeRequestDropdown {
         if (data.can_create_branch) {
           this.available();
           this.enable();
+          this.updateBranchName(data.suggested_branch_name);
 
           if (!this.droplabInitialized) {
             this.droplabInitialized = true;
             this.initDroplab();
             this.bindEvents();
           }
-        } else if (data.has_related_branch) {
+        } else {
           this.hide();
         }
       })
       .catch(() => {
         this.unavailable();
         this.disable();
-        Flash('Failed to check if a new branch can be created.');
+        Flash(__('Failed to check related branches.'));
       });
   }
 
@@ -409,13 +410,16 @@ export default class CreateMergeRequestDropdown {
     this.unavailableButton.classList.remove('hide');
   }
 
+  updateBranchName(suggestedBranchName) {
+    this.branchInput.value = suggestedBranchName;
+    this.updateCreatePaths('branch', suggestedBranchName);
+  }
+
   updateInputState(target, ref, result) {
     // target - 'branch' or 'ref' - which the input field we are searching a ref for.
     // ref - string - what a user typed.
     // result - string - what has been found on backend.
 
-    const pathReplacement = `$1${ref}`;
-
     // If a found branch equals exact the same text a user typed,
     // that means a new branch cannot be created as it already exists.
     if (ref === result) {
@@ -426,18 +430,12 @@ export default class CreateMergeRequestDropdown {
         this.refIsValid = true;
         this.refInput.dataset.value = ref;
         this.showAvailableMessage('ref');
-        this.createBranchPath = this.createBranchPath.replace(this.regexps.ref.createBranchPath,
-          pathReplacement);
-        this.createMrPath = this.createMrPath.replace(this.regexps.ref.createMrPath,
-          pathReplacement);
+        this.updateCreatePaths(target, ref);
       }
     } else if (target === 'branch') {
       this.branchIsValid = true;
       this.showAvailableMessage('branch');
-      this.createBranchPath = this.createBranchPath.replace(this.regexps.branch.createBranchPath,
-        pathReplacement);
-      this.createMrPath = this.createMrPath.replace(this.regexps.branch.createMrPath,
-        pathReplacement);
+      this.updateCreatePaths(target, ref);
     } else {
       this.refIsValid = false;
       this.refInput.dataset.value = ref;
@@ -457,4 +455,15 @@ export default class CreateMergeRequestDropdown {
       this.disableCreateAction();
     }
   }
+
+  // target - 'branch' or 'ref'
+  // ref - string - the new value to use as branch or ref
+  updateCreatePaths(target, ref) {
+    const pathReplacement = `$1${ref}`;
+
+    this.createBranchPath = this.createBranchPath.replace(this.regexps[target].createBranchPath,
+      pathReplacement);
+    this.createMrPath = this.createMrPath.replace(this.regexps[target].createMrPath,
+      pathReplacement);
+  }
 }
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 767e492f566..d69015c8665 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -134,11 +134,11 @@ class Projects::IssuesController < Projects::ApplicationController
   def can_create_branch
     can_create = current_user &&
       can?(current_user, :push_code, @project) &&
-      @issue.can_be_worked_on?(current_user)
+      @issue.can_be_worked_on?
 
     respond_to do |format|
       format.json do
-        render json: { can_create_branch: can_create, has_related_branch: @issue.has_related_branch? }
+        render json: { can_create_branch: can_create, suggested_branch_name: @issue.suggested_branch_name }
       end
     end
   end
@@ -177,7 +177,7 @@ class Projects::IssuesController < Projects::ApplicationController
   end
 
   def authorize_create_merge_request!
-    render_404 unless can?(current_user, :push_code, @project) && @issue.can_be_worked_on?(current_user)
+    render_404 unless can?(current_user, :push_code, @project) && @issue.can_be_worked_on?
   end
 
   def render_issue_json
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 7611e83647c..c34c35bcd34 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -194,6 +194,15 @@ class Issue < ActiveRecord::Base
     branches_with_iid - branches_with_merge_request
   end
 
+  def suggested_branch_name
+    return to_branch_name unless project.repository.branch_exists?(to_branch_name)
+
+    index = 2
+    index += 1 while project.repository.branch_exists?("#{to_branch_name}-#{index}")
+
+    "#{to_branch_name}-#{index}"
+  end
+
   # Returns boolean if a related branch exists for the current issue
   # ignores merge requests branchs
   def has_related_branch?
@@ -248,11 +257,8 @@ class Issue < ActiveRecord::Base
     end
   end
 
-  def can_be_worked_on?(current_user)
-    !self.closed? &&
-      !self.project.forked? &&
-      self.related_branches(current_user).empty? &&
-      self.closed_by_merge_requests(current_user).empty?
+  def can_be_worked_on?
+    !self.closed? && !self.project.forked?
   end
 
   # Returns `true` if the current issue can be viewed by either a logged in User
diff --git a/changelogs/unreleased/42803-show-new-branch-mr-button.yml b/changelogs/unreleased/42803-show-new-branch-mr-button.yml
new file mode 100644
index 00000000000..d689ff7f001
--- /dev/null
+++ b/changelogs/unreleased/42803-show-new-branch-mr-button.yml
@@ -0,0 +1,5 @@
+---
+title: Show new branch/mr button even when branch exists
+merge_request: 17712
+author: Jacopo Beschi @jacopo-beschi
+type: added
diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js
index f37426a72d4..047ecab27db 100644
--- a/spec/javascripts/issue_spec.js
+++ b/spec/javascripts/issue_spec.js
@@ -92,6 +92,7 @@ describe('Issue', function() {
       function mockCanCreateBranch(canCreateBranch) {
         mock.onGet(/(.*)\/can_create_branch$/).reply(200, {
           can_create_branch: canCreateBranch,
+          suggested_branch_name: 'foo-99',
         });
       }
 
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 11154291368..128acf83686 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -376,6 +376,48 @@ describe Issue do
     end
   end
 
+  describe '#suggested_branch_name' do
+    let(:repository) { double }
+
+    subject { build(:issue) }
+
+    before do
+      allow(subject.project).to receive(:repository).and_return(repository)
+    end
+
+    context '#to_branch_name does not exists' do
+      before do
+        allow(repository).to receive(:branch_exists?).and_return(false)
+      end
+
+      it 'returns #to_branch_name' do
+        expect(subject.suggested_branch_name).to eq(subject.to_branch_name)
+      end
+    end
+
+    context '#to_branch_name exists not ending with -index' do
+      before do
+        allow(repository).to receive(:branch_exists?).and_return(true)
+        allow(repository).to receive(:branch_exists?).with(/#{subject.to_branch_name}-\d/).and_return(false)
+      end
+
+      it 'returns #to_branch_name ending with -2' do
+        expect(subject.suggested_branch_name).to eq("#{subject.to_branch_name}-2")
+      end
+    end
+
+    context '#to_branch_name exists ending with -index' do
+      before do
+        allow(repository).to receive(:branch_exists?).and_return(true)
+        allow(repository).to receive(:branch_exists?).with("#{subject.to_branch_name}-3").and_return(false)
+      end
+
+      it 'returns #to_branch_name ending with max index + 1' do
+        expect(subject.suggested_branch_name).to eq("#{subject.to_branch_name}-3")
+      end
+    end
+  end
+
   describe '#has_related_branch?' do
     let(:issue) { create(:issue, title: "Blue Bell Knoll") }
     subject { issue.has_related_branch? }
@@ -425,6 +467,27 @@ describe Issue do
     end
   end
 
+  describe '#can_be_worked_on?' do
+    let(:project) { build(:project) }
+    subject { build(:issue, :opened, project: project) }
+
+    context 'is closed' do
+      subject { build(:issue, :closed) }
+
+      it { is_expected.not_to be_can_be_worked_on }
+    end
+
+    context 'project is forked' do
+      before do
+        allow(project).to receive(:forked?).and_return(true)
+      end
+
+      it { is_expected.not_to be_can_be_worked_on }
+    end
+
+    it { is_expected.to be_can_be_worked_on }
+  end
+
   describe '#participants' do
     context 'using a public project' do
       let(:project) { create(:project, :public) }
-- 
cgit v1.2.3


From 4f2e494772eb5f31929ecfdb439dfa4baa56521c Mon Sep 17 00:00:00 2001
From: Jacopo <beschi.jacopo@gmail.com>
Date: Fri, 13 Apr 2018 16:21:22 +0200
Subject: Checked in new translation keys

---
 locale/gitlab.pot | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 0eec9793391..cd30783c274 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1776,6 +1776,9 @@ msgstr ""
 msgid "Failed to change the owner"
 msgstr ""
 
+msgid "Failed to check related branches."
+msgstr ""
+
 msgid "Failed to remove issue from board, please try again."
 msgstr ""
 
-- 
cgit v1.2.3


From 6ae3098eb8f01406190942e8952866dd9af81dde Mon Sep 17 00:00:00 2001
From: Jacopo <beschi.jacopo@gmail.com>
Date: Thu, 19 Apr 2018 08:59:37 +0200
Subject: Uses Uniquify to calculate Issue#suggested_branch_name

---
 app/models/concerns/uniquify.rb       | 7 +++++--
 app/models/issue.rb                   | 8 ++++----
 spec/models/concerns/uniquify_spec.rb | 7 +++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/models/concerns/uniquify.rb b/app/models/concerns/uniquify.rb
index a7fe5951b6e..db51ed2dbeb 100644
--- a/app/models/concerns/uniquify.rb
+++ b/app/models/concerns/uniquify.rb
@@ -3,11 +3,14 @@ class Uniquify
   # by appending a counter to it. Uniqueness is determined by
   # repeated calls to the passed block.
   #
+  # You can pass an initial value for the counter, if not given
+  # counting starts from 1.
+  #
   # If `base` is a function/proc, we expect that calling it with a
   # candidate counter returns a string to test/return.
-  def string(base)
+  def string(base, counter = nil)
     @base = base
-    @counter = nil
+    @counter = counter
 
     increment_counter! while yield(base_string)
     base_string
diff --git a/app/models/issue.rb b/app/models/issue.rb
index c34c35bcd34..51028a404c2 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -197,10 +197,10 @@ class Issue < ActiveRecord::Base
   def suggested_branch_name
     return to_branch_name unless project.repository.branch_exists?(to_branch_name)
 
-    index = 2
-    index += 1 while project.repository.branch_exists?("#{to_branch_name}-#{index}")
-
-    "#{to_branch_name}-#{index}"
+    start_counting_from = 2
+    Uniquify.new.string(-> (counter) { "#{to_branch_name}-#{counter}" }, start_counting_from) do |suggested_branch_name|
+      project.repository.branch_exists?(suggested_branch_name)
+    end
   end
 
   # Returns boolean if a related branch exists for the current issue
diff --git a/spec/models/concerns/uniquify_spec.rb b/spec/models/concerns/uniquify_spec.rb
index 914730718e7..00341213bbe 100644
--- a/spec/models/concerns/uniquify_spec.rb
+++ b/spec/models/concerns/uniquify_spec.rb
@@ -22,6 +22,13 @@ describe Uniquify do
       expect(result).to eq('test_string2')
     end
 
+    it 'allows to pass an initial value for the counter' do
+      start_counting_from = 2
+      result = uniquify.string('test_string', start_counting_from) { |s| s == 'test_string' }
+
+      expect(result).to eq('test_string2')
+    end
+
     it 'allows passing in a base function that defines the location of the counter' do
       result = uniquify.string(-> (counter) { "test_#{counter}_string" }) do |s|
         s == 'test__string'
-- 
cgit v1.2.3


From 9000626a60c889c76ff1dfc8c6247f15953ca993 Mon Sep 17 00:00:00 2001
From: Jacopo <beschi.jacopo@gmail.com>
Date: Thu, 19 Apr 2018 11:31:01 +0200
Subject: Moves Uniquify counter in the initializer

---
 app/models/concerns/uniquify.rb       | 27 ++++++++++++++++-----------
 app/models/issue.rb                   |  2 +-
 spec/models/concerns/uniquify_spec.rb |  4 +++-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/models/concerns/uniquify.rb b/app/models/concerns/uniquify.rb
index db51ed2dbeb..549a76da20e 100644
--- a/app/models/concerns/uniquify.rb
+++ b/app/models/concerns/uniquify.rb
@@ -1,16 +1,21 @@
+# Uniquify
+#
+# Return a version of the given 'base' string that is unique
+# by appending a counter to it. Uniqueness is determined by
+# repeated calls to the passed block.
+#
+# You can pass an initial value for the counter, if not given
+# counting starts from 1.
+#
+# If `base` is a function/proc, we expect that calling it with a
+# candidate counter returns a string to test/return.
 class Uniquify
-  # Return a version of the given 'base' string that is unique
-  # by appending a counter to it. Uniqueness is determined by
-  # repeated calls to the passed block.
-  #
-  # You can pass an initial value for the counter, if not given
-  # counting starts from 1.
-  #
-  # If `base` is a function/proc, we expect that calling it with a
-  # candidate counter returns a string to test/return.
-  def string(base, counter = nil)
-    @base = base
+  def initialize(counter = nil)
     @counter = counter
+  end
+
+  def string(base)
+    @base = base
 
     increment_counter! while yield(base_string)
     base_string
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 51028a404c2..0332bfa9371 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -198,7 +198,7 @@ class Issue < ActiveRecord::Base
     return to_branch_name unless project.repository.branch_exists?(to_branch_name)
 
     start_counting_from = 2
-    Uniquify.new.string(-> (counter) { "#{to_branch_name}-#{counter}" }, start_counting_from) do |suggested_branch_name|
+    Uniquify.new(start_counting_from).string(-> (counter) { "#{to_branch_name}-#{counter}" }) do |suggested_branch_name|
       project.repository.branch_exists?(suggested_branch_name)
     end
   end
diff --git a/spec/models/concerns/uniquify_spec.rb b/spec/models/concerns/uniquify_spec.rb
index 00341213bbe..6cd2de6dcce 100644
--- a/spec/models/concerns/uniquify_spec.rb
+++ b/spec/models/concerns/uniquify_spec.rb
@@ -24,7 +24,9 @@ describe Uniquify do
 
     it 'allows to pass an initial value for the counter' do
       start_counting_from = 2
-      result = uniquify.string('test_string', start_counting_from) { |s| s == 'test_string' }
+      uniquify = described_class.new(start_counting_from)
+
+      result = uniquify.string('test_string') { |s| s == 'test_string' }
 
       expect(result).to eq('test_string2')
     end
-- 
cgit v1.2.3


From 12aab8ff6a6d8dba7ab682586b89bb1b800b82e2 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 19 Apr 2018 15:36:37 +0100
Subject: Prettify vue shared component & improve tests to match guidelines

---
 .../vue_shared/components/ci_badge_link.vue        |  88 ++++++------
 .../javascripts/vue_shared/components/ci_icon.vue  |  75 +++++------
 .../vue_shared/components/clipboard_button.vue     |  76 ++++++-----
 .../vue_shared/components/ci_icon_spec.js          | 149 +++++++++------------
 .../vue_shared/components/clipboard_button_spec.js |   2 +-
 5 files changed, 191 insertions(+), 199 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
index 5324d5dc797..0d64efcbf68 100644
--- a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
@@ -1,52 +1,52 @@
 <script>
-  import ciIcon from './ci_icon.vue';
-  import tooltip from '../directives/tooltip';
-  /**
-   * Renders CI Badge link with CI icon and status text based on
-   * API response shared between all places where it is used.
-   *
-   * Receives status object containing:
-   * status: {
-   *   details_path: "/gitlab-org/gitlab-ce/pipelines/8150156" // url
-   *   group:"running" // used for CSS class
-   *   icon: "icon_status_running" // used to render the icon
-   *   label:"running" // used for potential tooltip
-   *   text:"running" // text rendered
-   * }
-   *
-   * Used in:
-   * - Pipelines table - first column
-   * - Jobs table - first column
-   * - Pipeline show view - header
-   * - Job show view - header
-   * - MR widget
-   */
+import CiIcon from './ci_icon.vue';
+import tooltip from '../directives/tooltip';
+/**
+ * Renders CI Badge link with CI icon and status text based on
+ * API response shared between all places where it is used.
+ *
+ * Receives status object containing:
+ * status: {
+ *   details_path: "/gitlab-org/gitlab-ce/pipelines/8150156" // url
+ *   group:"running" // used for CSS class
+ *   icon: "icon_status_running" // used to render the icon
+ *   label:"running" // used for potential tooltip
+ *   text:"running" // text rendered
+ * }
+ *
+ * Used in:
+ * - Pipelines table - first column
+ * - Jobs table - first column
+ * - Pipeline show view - header
+ * - Job show view - header
+ * - MR widget
+ */
 
-  export default {
-    components: {
-      ciIcon,
+export default {
+  components: {
+    CiIcon,
+  },
+  directives: {
+    tooltip,
+  },
+  props: {
+    status: {
+      type: Object,
+      required: true,
     },
-    directives: {
-      tooltip,
+    showText: {
+      type: Boolean,
+      required: false,
+      default: true,
     },
-    props: {
-      status: {
-        type: Object,
-        required: true,
-      },
-      showText: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
+  },
+  computed: {
+    cssClass() {
+      const className = this.status.group;
+      return className ? `ci-status ci-${className}` : 'ci-status';
     },
-    computed: {
-      cssClass() {
-        const className = this.status.group;
-        return className ? `ci-status ci-${className}` : 'ci-status';
-      },
-    },
-  };
+  },
+};
 </script>
 <template>
   <a
diff --git a/app/assets/javascripts/vue_shared/components/ci_icon.vue b/app/assets/javascripts/vue_shared/components/ci_icon.vue
index 8fea746f4de..fcab8f571dd 100644
--- a/app/assets/javascripts/vue_shared/components/ci_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_icon.vue
@@ -1,45 +1,44 @@
 <script>
-  import icon from '../../vue_shared/components/icon.vue';
+import Icon from '../../vue_shared/components/icon.vue';
 
-  /**
-   * Renders CI icon based on API response shared between all places where it is used.
-   *
-   * Receives status object containing:
-   * status: {
-   *   details_path: "/gitlab-org/gitlab-ce/pipelines/8150156" // url
-   *   group:"running" // used for CSS class
-   *   icon: "icon_status_running" // used to render the icon
-   *   label:"running" // used for potential tooltip
-   *   text:"running" // text rendered
-   * }
-   *
-   * Used in:
-   * - Pipelines table Badge
-   * - Pipelines table mini graph
-   * - Pipeline graph
-   * - Pipeline show view badge
-   * - Jobs table
-   * - Jobs show view header
-   * - Jobs show view sidebar
-   */
-  export default {
-    components: {
-      icon,
+/**
+ * Renders CI icon based on API response shared between all places where it is used.
+ *
+ * Receives status object containing:
+ * status: {
+ *   details_path: "/gitlab-org/gitlab-ce/pipelines/8150156" // url
+ *   group:"running" // used for CSS class
+ *   icon: "icon_status_running" // used to render the icon
+ *   label:"running" // used for potential tooltip
+ *   text:"running" // text rendered
+ * }
+ *
+ * Used in:
+ * - Pipelines table Badge
+ * - Pipelines table mini graph
+ * - Pipeline graph
+ * - Pipeline show view badge
+ * - Jobs table
+ * - Jobs show view header
+ * - Jobs show view sidebar
+ */
+export default {
+  components: {
+    Icon,
+  },
+  props: {
+    status: {
+      type: Object,
+      required: true,
     },
-    props: {
-      status: {
-        type: Object,
-        required: true,
-      },
+  },
+  computed: {
+    cssClass() {
+      const status = this.status.group;
+      return `ci-status-icon ci-status-icon-${status} js-ci-status-icon-${status}`;
     },
-
-    computed: {
-      cssClass() {
-        const status = this.status.group;
-        return `ci-status-icon ci-status-icon-${status} js-ci-status-icon-${status}`;
-      },
-    },
-  };
+  },
+};
 </script>
 <template>
   <span :class="cssClass">
diff --git a/app/assets/javascripts/vue_shared/components/clipboard_button.vue b/app/assets/javascripts/vue_shared/components/clipboard_button.vue
index cab126a7eca..cb2cc3901ad 100644
--- a/app/assets/javascripts/vue_shared/components/clipboard_button.vue
+++ b/app/assets/javascripts/vue_shared/components/clipboard_button.vue
@@ -1,40 +1,50 @@
 <script>
-  /**
-   * Falls back to the code used in `copy_to_clipboard.js`
-   */
-  import tooltip from '../directives/tooltip';
+/**
+ * Falls back to the code used in `copy_to_clipboard.js`
+ *
+ * Renders a button with a clipboard icon that copies the content of `data-clipboard-text`
+ * when clicked.
+ *
+ * @example
+ * <clipboard-button
+ *   title="Copy to clipbard"
+ *   text="Content to be copied"
+ *    css-class="btn-transparent"
+ * />
+ */
+import tooltip from '../directives/tooltip';
 
-  export default {
-    name: 'ClipboardButton',
-    directives: {
-      tooltip,
+export default {
+  name: 'ClipboardButton',
+  directives: {
+    tooltip,
+  },
+  props: {
+    text: {
+      type: String,
+      required: true,
     },
-    props: {
-      text: {
-        type: String,
-        required: true,
-      },
-      title: {
-        type: String,
-        required: true,
-      },
-      tooltipPlacement: {
-        type: String,
-        required: false,
-        default: 'top',
-      },
-      tooltipContainer: {
-        type: [String, Boolean],
-        required: false,
-        default: false,
-      },
-      cssClass: {
-        type: String,
-        required: false,
-        default: 'btn-default',
-      },
+    title: {
+      type: String,
+      required: true,
     },
-  };
+    tooltipPlacement: {
+      type: String,
+      required: false,
+      default: 'top',
+    },
+    tooltipContainer: {
+      type: [String, Boolean],
+      required: false,
+      default: false,
+    },
+    cssClass: {
+      type: String,
+      required: false,
+      default: 'btn-default',
+    },
+  },
+};
 </script>
 
 <template>
diff --git a/spec/javascripts/vue_shared/components/ci_icon_spec.js b/spec/javascripts/vue_shared/components/ci_icon_spec.js
index d8664408595..423bc746a22 100644
--- a/spec/javascripts/vue_shared/components/ci_icon_spec.js
+++ b/spec/javascripts/vue_shared/components/ci_icon_spec.js
@@ -1,139 +1,122 @@
 import Vue from 'vue';
 import ciIcon from '~/vue_shared/components/ci_icon.vue';
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
 describe('CI Icon component', () => {
-  let CiIcon;
-  beforeEach(() => {
-    CiIcon = Vue.extend(ciIcon);
+  const Component = Vue.extend(ciIcon);
+  let vm;
+
+  afterEach(() => {
+    vm.$destroy();
   });
 
   it('should render a span element with an svg', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_success',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_success',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.tagName).toEqual('SPAN');
-    expect(component.$el.querySelector('span > svg')).toBeDefined();
+    expect(vm.$el.tagName).toEqual('SPAN');
+    expect(vm.$el.querySelector('span > svg')).toBeDefined();
   });
 
   it('should render a success status', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_success',
-          group: 'success',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_success',
+        group: 'success',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-success')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-success')).toEqual(true);
   });
 
   it('should render a failed status', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_failed',
-          group: 'failed',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_failed',
+        group: 'failed',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-failed')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-failed')).toEqual(true);
   });
 
   it('should render success with warnings status', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_warning',
-          group: 'warning',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_warning',
+        group: 'warning',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-warning')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-warning')).toEqual(true);
   });
 
   it('should render pending status', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_pending',
-          group: 'pending',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_pending',
+        group: 'pending',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-pending')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-pending')).toEqual(true);
   });
 
   it('should render running status', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_running',
-          group: 'running',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_running',
+        group: 'running',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-running')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-running')).toEqual(true);
   });
 
   it('should render created status', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_created',
-          group: 'created',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_created',
+        group: 'created',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-created')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-created')).toEqual(true);
   });
 
   it('should render skipped status', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_skipped',
-          group: 'skipped',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_skipped',
+        group: 'skipped',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-skipped')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-skipped')).toEqual(true);
   });
 
   it('should render canceled status', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_canceled',
-          group: 'canceled',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_canceled',
+        group: 'canceled',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-canceled')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-canceled')).toEqual(true);
   });
 
   it('should render status for manual action', () => {
-    const component = new CiIcon({
-      propsData: {
-        status: {
-          icon: 'icon_status_manual',
-          group: 'manual',
-        },
+    vm = mountComponent(Component, {
+      status: {
+        icon: 'icon_status_manual',
+        group: 'manual',
       },
-    }).$mount();
+    });
 
-    expect(component.$el.classList.contains('ci-status-icon-manual')).toEqual(true);
+    expect(vm.$el.classList.contains('ci-status-icon-manual')).toEqual(true);
   });
 });
diff --git a/spec/javascripts/vue_shared/components/clipboard_button_spec.js b/spec/javascripts/vue_shared/components/clipboard_button_spec.js
index f598b1afa74..97f0fbb04db 100644
--- a/spec/javascripts/vue_shared/components/clipboard_button_spec.js
+++ b/spec/javascripts/vue_shared/components/clipboard_button_spec.js
@@ -3,10 +3,10 @@ import clipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
 describe('clipboard button', () => {
+  const Component = Vue.extend(clipboardButton);
   let vm;
 
   beforeEach(() => {
-    const Component = Vue.extend(clipboardButton);
     vm = mountComponent(Component, {
       text: 'copy me',
       title: 'Copy this value into Clipboard!',
-- 
cgit v1.2.3


From a96745d44097e5dc6b110556c2ebe2085ce05041 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 19 Apr 2018 16:07:11 +0100
Subject: Runs prettier on some vue shared components

---
 .../javascripts/vue_shared/components/commit.vue   | 215 ++++++++++-----------
 .../vue_shared/components/expand_button.vue        |  54 +++---
 .../vue_shared/components/header_ci_component.vue  | 132 ++++++-------
 .../javascripts/vue_shared/components/icon.vue     | 118 +++++------
 .../vue_shared/components/expand_button_spec.js    |   4 +-
 5 files changed, 257 insertions(+), 266 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue
index b8875d04488..8f250a6c989 100644
--- a/app/assets/javascripts/vue_shared/components/commit.vue
+++ b/app/assets/javascripts/vue_shared/components/commit.vue
@@ -1,119 +1,111 @@
 <script>
-  import commitIconSvg from 'icons/_icon_commit.svg';
-  import userAvatarLink from './user_avatar/user_avatar_link.vue';
-  import tooltip from '../directives/tooltip';
-  import icon from '../../vue_shared/components/icon.vue';
+import UserAvatarLink from './user_avatar/user_avatar_link.vue';
+import tooltip from '../directives/tooltip';
+import Icon from '../../vue_shared/components/icon.vue';
 
-  export default {
-    directives: {
-      tooltip,
+export default {
+  directives: {
+    tooltip,
+  },
+  components: {
+    UserAvatarLink,
+    Icon,
+  },
+  props: {
+    /**
+     * Indicates the existance of a tag.
+     * Used to render the correct icon, if true will render `fa-tag` icon,
+     * if false will render a svg sprite fork icon
+     */
+    tag: {
+      type: Boolean,
+      required: false,
+      default: false,
     },
-    components: {
-      userAvatarLink,
-      icon,
+    /**
+     * If provided is used to render the branch name and url.
+     * Should contain the following properties:
+     * name
+     * ref_url
+     */
+    commitRef: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
+    /**
+     * Used to link to the commit sha.
+     */
+    commitUrl: {
+      type: String,
+      required: false,
+      default: '',
     },
-    props: {
-      /**
-       * Indicates the existance of a tag.
-       * Used to render the correct icon, if true will render `fa-tag` icon,
-       * if false will render a svg sprite fork icon
-       */
-      tag: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-      /**
-       * If provided is used to render the branch name and url.
-       * Should contain the following properties:
-       * name
-       * ref_url
-       */
-      commitRef: {
-        type: Object,
-        required: false,
-        default: () => ({}),
-      },
-      /**
-       * Used to link to the commit sha.
-       */
-      commitUrl: {
-        type: String,
-        required: false,
-        default: '',
-      },
 
-      /**
-       * Used to show the commit short sha that links to the commit url.
-       */
-      shortSha: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      /**
-       * If provided shows the commit tile.
-       */
-      title: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      /**
-       * If provided renders information about the author of the commit.
-       * When provided should include:
-       * `avatar_url` to render the avatar icon
-       * `web_url` to link to user profile
-       * `username` to render alt and title tags
-       */
-      author: {
-        type: Object,
-        required: false,
-        default: () => ({}),
-      },
-      showBranch: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
+    /**
+     * Used to show the commit short sha that links to the commit url.
+     */
+    shortSha: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    /**
+     * If provided shows the commit tile.
+     */
+    title: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    /**
+     * If provided renders information about the author of the commit.
+     * When provided should include:
+     * `avatar_url` to render the avatar icon
+     * `web_url` to link to user profile
+     * `username` to render alt and title tags
+     */
+    author: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
+    showBranch: {
+      type: Boolean,
+      required: false,
+      default: true,
     },
-    computed: {
-      /**
-       * Used to verify if all the properties needed to render the commit
-       * ref section were provided.
-       *
-       * @returns {Boolean}
-       */
-      hasCommitRef() {
-        return this.commitRef && this.commitRef.name && this.commitRef.ref_url;
-      },
-      /**
-       * Used to verify if all the properties needed to render the commit
-       * author section were provided.
-       *
-       * @returns {Boolean}
-       */
-      hasAuthor() {
-        return this.author &&
-          this.author.avatar_url &&
-          this.author.path &&
-          this.author.username;
-      },
-      /**
-       * If information about the author is provided will return a string
-       * to be rendered as the alt attribute of the img tag.
-       *
-       * @returns {String}
-       */
-      userImageAltDescription() {
-        return this.author &&
-          this.author.username ? `${this.author.username}'s avatar` : null;
-      },
+  },
+  computed: {
+    /**
+     * Used to verify if all the properties needed to render the commit
+     * ref section were provided.
+     *
+     * @returns {Boolean}
+     */
+    hasCommitRef() {
+      return this.commitRef && this.commitRef.name && this.commitRef.ref_url;
     },
-    created() {
-      this.commitIconSvg = commitIconSvg;
+    /**
+     * Used to verify if all the properties needed to render the commit
+     * author section were provided.
+     *
+     * @returns {Boolean}
+     */
+    hasAuthor() {
+      return this.author && this.author.avatar_url && this.author.path && this.author.username;
     },
-  };
+    /**
+     * If information about the author is provided will return a string
+     * to be rendered as the alt attribute of the img tag.
+     *
+     * @returns {String}
+     */
+    userImageAltDescription() {
+      return this.author && this.author.username ? `${this.author.username}'s avatar` : null;
+    },
+  },
+};
 </script>
 <template>
   <div class="branch-commit">
@@ -141,11 +133,10 @@
         {{ commitRef.name }}
       </a>
     </template>
-    <div
-      v-html="commitIconSvg"
+    <icon
+      name="commit"
       class="commit-icon js-commit-icon"
-    >
-    </div>
+    />
 
     <a
       class="commit-sha"
diff --git a/app/assets/javascripts/vue_shared/components/expand_button.vue b/app/assets/javascripts/vue_shared/components/expand_button.vue
index c943c8d98a4..9295be3e2b2 100644
--- a/app/assets/javascripts/vue_shared/components/expand_button.vue
+++ b/app/assets/javascripts/vue_shared/components/expand_button.vue
@@ -1,33 +1,33 @@
 <script>
-  import { __ } from '~/locale';
-  /**
-   * Port of detail_behavior expand button.
-   *
-   * @example
-   * <expand-button>
-   *   <template slot="expanded">
-   *      Text goes here.
-   *    </template>
-   * </expand-button>
-   */
-  export default {
-    name: 'ExpandButton',
-    data() {
-      return {
-        isCollapsed: true,
-      };
+import { __ } from '~/locale';
+/**
+ * Port of detail_behavior expand button.
+ *
+ * @example
+ * <expand-button>
+ *   <template slot="expanded">
+ *      Text goes here.
+ *    </template>
+ * </expand-button>
+ */
+export default {
+  name: 'ExpandButton',
+  data() {
+    return {
+      isCollapsed: true,
+    };
+  },
+  computed: {
+    ariaLabel() {
+      return __('Click to expand text');
     },
-    computed: {
-      ariaLabel() {
-        return __('Click to expand text');
-      },
+  },
+  methods: {
+    onClick() {
+      this.isCollapsed = !this.isCollapsed;
     },
-    methods: {
-      onClick() {
-        this.isCollapsed = !this.isCollapsed;
-      },
-    },
-  };
+  },
+};
 </script>
 <template>
   <span>
diff --git a/app/assets/javascripts/vue_shared/components/header_ci_component.vue b/app/assets/javascripts/vue_shared/components/header_ci_component.vue
index a0cd0cbd200..088187ed348 100644
--- a/app/assets/javascripts/vue_shared/components/header_ci_component.vue
+++ b/app/assets/javascripts/vue_shared/components/header_ci_component.vue
@@ -1,78 +1,78 @@
 <script>
-  import ciIconBadge from './ci_badge_link.vue';
-  import loadingIcon from './loading_icon.vue';
-  import timeagoTooltip from './time_ago_tooltip.vue';
-  import tooltip from '../directives/tooltip';
-  import userAvatarImage from './user_avatar/user_avatar_image.vue';
+import CiIconBadge from './ci_badge_link.vue';
+import LoadingIcon from './loading_icon.vue';
+import TimeagoTooltip from './time_ago_tooltip.vue';
+import tooltip from '../directives/tooltip';
+import UserAvatarImage from './user_avatar/user_avatar_image.vue';
 
-  /**
-   * Renders header component for job and pipeline page based on UI mockups
-   *
-   * Used in:
-   * - job show page
-   * - pipeline show page
-   */
-  export default {
-    components: {
-      ciIconBadge,
-      loadingIcon,
-      timeagoTooltip,
-      userAvatarImage,
+/**
+ * Renders header component for job and pipeline page based on UI mockups
+ *
+ * Used in:
+ * - job show page
+ * - pipeline show page
+ */
+export default {
+  components: {
+    CiIconBadge,
+    LoadingIcon,
+    TimeagoTooltip,
+    UserAvatarImage,
+  },
+  directives: {
+    tooltip,
+  },
+  props: {
+    status: {
+      type: Object,
+      required: true,
     },
-    directives: {
-      tooltip,
+    itemName: {
+      type: String,
+      required: true,
     },
-    props: {
-      status: {
-        type: Object,
-        required: true,
-      },
-      itemName: {
-        type: String,
-        required: true,
-      },
-      itemId: {
-        type: Number,
-        required: true,
-      },
-      time: {
-        type: String,
-        required: true,
-      },
-      user: {
-        type: Object,
-        required: false,
-        default: () => ({}),
-      },
-      actions: {
-        type: Array,
-        required: false,
-        default: () => [],
-      },
-      hasSidebarButton: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-      shouldRenderTriggeredLabel: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
+    itemId: {
+      type: Number,
+      required: true,
     },
+    time: {
+      type: String,
+      required: true,
+    },
+    user: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
+    actions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    hasSidebarButton: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    shouldRenderTriggeredLabel: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+  },
 
-    computed: {
-      userAvatarAltText() {
-        return `${this.user.name}'s avatar`;
-      },
+  computed: {
+    userAvatarAltText() {
+      return `${this.user.name}'s avatar`;
     },
+  },
 
-    methods: {
-      onClickAction(action) {
-        this.$emit('actionClicked', action);
-      },
+  methods: {
+    onClickAction(action) {
+      this.$emit('actionClicked', action);
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/vue_shared/components/icon.vue b/app/assets/javascripts/vue_shared/components/icon.vue
index 6a2e05000e1..1a0df49bc29 100644
--- a/app/assets/javascripts/vue_shared/components/icon.vue
+++ b/app/assets/javascripts/vue_shared/components/icon.vue
@@ -1,76 +1,75 @@
 <script>
+/* This is a re-usable vue component for rendering a svg sprite
+  icon
 
-  /* This is a re-usable vue component for rendering a svg sprite
-    icon
+  Sample configuration:
 
-    Sample configuration:
+  <icon
+    name="retry"
+    :size="32"
+    css-classes="top"
+  />
 
-    <icon
-      name="retry"
-      :size="32"
-      css-classes="top"
-    />
+*/
+// only allow classes in images.scss e.g. s12
+const validSizes = [8, 12, 16, 18, 24, 32, 48, 72];
 
-  */
-  // only allow classes in images.scss e.g. s12
-  const validSizes = [8, 12, 16, 18, 24, 32, 48, 72];
-
-  export default {
-    props: {
-      name: {
-        type: String,
-        required: true,
-      },
+export default {
+  props: {
+    name: {
+      type: String,
+      required: true,
+    },
 
-      size: {
-        type: Number,
-        required: false,
-        default: 16,
-        validator(value) {
-          return validSizes.includes(value);
-        },
+    size: {
+      type: Number,
+      required: false,
+      default: 16,
+      validator(value) {
+        return validSizes.includes(value);
       },
+    },
 
-      cssClasses: {
-        type: String,
-        required: false,
-        default: '',
-      },
+    cssClasses: {
+      type: String,
+      required: false,
+      default: '',
+    },
 
-      width: {
-        type: Number,
-        required: false,
-        default: null,
-      },
+    width: {
+      type: Number,
+      required: false,
+      default: null,
+    },
 
-      height: {
-        type: Number,
-        required: false,
-        default: null,
-      },
+    height: {
+      type: Number,
+      required: false,
+      default: null,
+    },
 
-      y: {
-        type: Number,
-        required: false,
-        default: null,
-      },
+    y: {
+      type: Number,
+      required: false,
+      default: null,
+    },
 
-      x: {
-        type: Number,
-        required: false,
-        default: null,
-      },
+    x: {
+      type: Number,
+      required: false,
+      default: null,
     },
+  },
 
-    computed: {
-      spriteHref() {
-        return `${gon.sprite_icons}#${this.name}`;
-      },
-      iconSizeClass() {
-        return this.size ? `s${this.size}` : '';
-      },
+  computed: {
+    spriteHref() {
+      return `${gon.sprite_icons}#${this.name}`;
+    },
+    iconSizeClass() {
+      return this.size ? `s${this.size}` : '';
     },
-  };
+  },
+};
 </script>
 
 <template>
@@ -79,7 +78,8 @@
     :width="width"
     :height="height"
     :x="x"
-    :y="y">
+    :y="y"
+  >
     <use v-bind="{ 'xlink:href':spriteHref }" />
   </svg>
 </template>
diff --git a/spec/javascripts/vue_shared/components/expand_button_spec.js b/spec/javascripts/vue_shared/components/expand_button_spec.js
index f19589d3b75..af9693c48fd 100644
--- a/spec/javascripts/vue_shared/components/expand_button_spec.js
+++ b/spec/javascripts/vue_shared/components/expand_button_spec.js
@@ -3,10 +3,10 @@ import expandButton from '~/vue_shared/components/expand_button.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
 describe('expand button', () => {
+  const Component = Vue.extend(expandButton);
   let vm;
 
   beforeEach(() => {
-    const Component = Vue.extend(expandButton);
     vm = mountComponent(Component, {
       slots: {
         expanded: '<p>Expanded!</p>',
@@ -22,7 +22,7 @@ describe('expand button', () => {
     expect(vm.$el.textContent.trim()).toEqual('...');
   });
 
-  it('hides expander on click', (done) => {
+  it('hides expander on click', done => {
     vm.$el.querySelector('button').click();
     vm.$nextTick(() => {
       expect(vm.$el.querySelector('button').getAttribute('style')).toEqual('display: none;');
-- 
cgit v1.2.3


From 3854d28713ca4cc20063c8f38a1599c53a171de7 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 18 Apr 2018 11:23:00 -0300
Subject: Fix issues without links when added from boards new issue  modal

---
 app/assets/javascripts/boards/models/list.js | 2 ++
 spec/features/boards/new_issue_spec.rb       | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js
index e210d69895e..7144f4190e7 100644
--- a/app/assets/javascripts/boards/models/list.js
+++ b/app/assets/javascripts/boards/models/list.js
@@ -113,6 +113,8 @@ class List {
         issue.id = data.id;
         issue.iid = data.iid;
         issue.project = data.project;
+        issue.path = data.real_path;
+        issue.referencePath = data.reference_path;
 
         if (this.issuesSize > 1) {
           const moveBeforeId = this.issues[1].id;
diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index 6769acb7c9c..e880f0096c1 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -63,6 +63,13 @@ describe 'Issue Boards new issue', :js do
       page.within(first('.board .issue-count-badge-count')) do
         expect(page).to have_content('1')
       end
+
+      page.within(first('.card')) do
+        issue = project.issues.find_by_title('bug')
+
+        expect(page).to have_content(issue.to_reference)
+        expect(page).to have_link(issue.title, href: issue_path(issue))
+      end
     end
 
     it 'shows sidebar when creating new issue' do
-- 
cgit v1.2.3


From a8fb4865eb02747541b3f8cc089936d2e2953e16 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 19 Apr 2018 17:01:45 +0100
Subject: Updates tests

---
 spec/javascripts/vue_shared/components/commit_spec.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/spec/javascripts/vue_shared/components/commit_spec.js b/spec/javascripts/vue_shared/components/commit_spec.js
index ed66361bfc3..9aea9de1ad6 100644
--- a/spec/javascripts/vue_shared/components/commit_spec.js
+++ b/spec/javascripts/vue_shared/components/commit_spec.js
@@ -55,7 +55,6 @@ describe('Commit component', () => {
           path: '/jschatz1',
           username: 'jschatz1',
         },
-        commitIconSvg: '<svg></svg>',
       };
 
       component = mountComponent(CommitComponent, props);
@@ -82,10 +81,6 @@ describe('Commit component', () => {
       expect(component.$el.querySelector('.commit-sha').textContent).toContain(props.shortSha);
     });
 
-    it('should render the given commitIconSvg', () => {
-      expect(component.$el.querySelector('.js-commit-icon').children).toContain('svg');
-    });
-
     describe('Given commit title and author props', () => {
       it('should render a link to the author profile', () => {
         expect(
-- 
cgit v1.2.3


From 672733aa66e371edc50f6d1c2467896c40ed9ac8 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Tue, 3 Apr 2018 18:57:55 +0100
Subject: Add an API endpoint to download git repository snapshots

---
 GITALY_SERVER_VERSION                              |  2 +-
 changelogs/unreleased/39345-get-raw-archive.yml    |  5 +++
 doc/api/projects.md                                | 25 ++++++++++-
 lib/api/api.rb                                     |  1 +
 lib/api/helpers/project_snapshots_helpers.rb       | 25 +++++++++++
 lib/api/project_snapshots.rb                       | 19 ++++++++
 lib/gitlab/git/repository.rb                       |  4 ++
 lib/gitlab/gitaly_client/repository_service.rb     | 16 +++++++
 lib/gitlab/workhorse.rb                            | 14 ++++++
 .../gitaly_client/repository_service_spec.rb       | 11 +++++
 spec/lib/gitlab/workhorse_spec.rb                  | 22 ++++++++++
 spec/requests/api/project_snapshots_spec.rb        | 51 ++++++++++++++++++++++
 12 files changed, 193 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/39345-get-raw-archive.yml
 create mode 100644 lib/api/helpers/project_snapshots_helpers.rb
 create mode 100644 lib/api/project_snapshots.rb
 create mode 100644 spec/requests/api/project_snapshots_spec.rb

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 5f8cbfdb7d7..483b7719418 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.95.0
+0.96.1
diff --git a/changelogs/unreleased/39345-get-raw-archive.yml b/changelogs/unreleased/39345-get-raw-archive.yml
new file mode 100644
index 00000000000..fa894432d4c
--- /dev/null
+++ b/changelogs/unreleased/39345-get-raw-archive.yml
@@ -0,0 +1,5 @@
+---
+title: Add an API endpoint to download git repository snapshots
+merge_request: 18173
+author:
+type: added
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 7ffe380e275..fe21dfe23f9 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -1398,4 +1398,27 @@ Read more in the [Project Badges](project_badges.md) documentation.
 
 ## Issue and merge request description templates
 
-The non-default [issue and merge request description templates](../user/project/description_templates.md) are managed inside the project's repository. So you can manage them via the API through the [Repositories API](repositories.md) and the [Repository Files API](repository_files.md).
\ No newline at end of file
+The non-default [issue and merge request description templates](../user/project/description_templates.md) are managed inside the project's repository. So you can manage them via the API through the [Repositories API](repositories.md) and the [Repository Files API](repository_files.md).
+
+## Download snapshot of a git repository
+
+> Introduced in GitLab 10.7
+
+This endpoint may only be accessed by an administrative user.
+
+Download a snapshot of the project (or wiki, if requested) git repository. This
+snapshot is always in uncompressed [tar](https://en.wikipedia.org/wiki/Tar_(computing))
+format.
+
+If a repository is corrupted to the point where `git clone` does not work, the
+snapshot may allow some of the data to be retrieved.
+
+```
+GET /projects/:id/snapshot
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id`      | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
+| `wiki`    | boolean | no | Whether to download the wiki, rather than project, repository |
+
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 073471b4c4d..5139e869c71 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -154,6 +154,7 @@ module API
     mount ::API::ProjectHooks
     mount ::API::Projects
     mount ::API::ProjectMilestones
+    mount ::API::ProjectSnapshots
     mount ::API::ProjectSnippets
     mount ::API::ProtectedBranches
     mount ::API::Repositories
diff --git a/lib/api/helpers/project_snapshots_helpers.rb b/lib/api/helpers/project_snapshots_helpers.rb
new file mode 100644
index 00000000000..94798a8cb51
--- /dev/null
+++ b/lib/api/helpers/project_snapshots_helpers.rb
@@ -0,0 +1,25 @@
+module API
+  module Helpers
+    module ProjectSnapshotsHelpers
+      def authorize_read_git_snapshot!
+        authenticated_with_full_private_access!
+      end
+
+      def send_git_snapshot(repository)
+        header(*Gitlab::Workhorse.send_git_snapshot(repository))
+      end
+
+      def snapshot_project
+        user_project
+      end
+
+      def snapshot_repository
+        if to_boolean(params[:wiki])
+          snapshot_project.wiki.repository
+        else
+          snapshot_project.repository
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/project_snapshots.rb b/lib/api/project_snapshots.rb
new file mode 100644
index 00000000000..71005acc587
--- /dev/null
+++ b/lib/api/project_snapshots.rb
@@ -0,0 +1,19 @@
+module API
+  class ProjectSnapshots < Grape::API
+    helpers ::API::Helpers::ProjectSnapshotsHelpers
+
+    before { authorize_read_git_snapshot! }
+
+    resource :projects do
+      desc 'Download a (possibly inconsistent) snapshot of a repository' do
+        detail 'This feature was introduced in GitLab 10.7'
+      end
+      params do
+        optional :wiki, type: Boolean, desc: 'Set to true to receive the wiki repository'
+      end
+      get ':id/snapshot' do
+        send_git_snapshot(snapshot_repository)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 3124c426f97..5a6e2e0b937 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1258,6 +1258,10 @@ module Gitlab
         true
       end
 
+      def create_from_snapshot(url, auth)
+        gitaly_repository_client.create_from_snapshot(url, auth)
+      end
+
       def rebase(user, rebase_id, branch:, branch_sha:, remote_repository:, remote_branch:)
         gitaly_migrate(:rebase) do |is_enabled|
           if is_enabled
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index 39057beefba..bf5a491e28d 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -235,6 +235,22 @@ module Gitlab
         )
       end
 
+      def create_from_snapshot(http_url, http_auth)
+        request = Gitaly::CreateRepositoryFromSnapshotRequest.new(
+          repository: @gitaly_repo,
+          http_url: http_url,
+          http_auth: http_auth
+        )
+
+        GitalyClient.call(
+          @storage,
+          :repository_service,
+          :create_repository_from_snapshot,
+          request,
+          timeout: GitalyClient.default_timeout
+        )
+      end
+
       def write_ref(ref_path, ref, old_ref, shell)
         request = Gitaly::WriteRefRequest.new(
           repository: @gitaly_repo,
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 153cb2a8bb1..1f060de657d 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -81,6 +81,20 @@ module Gitlab
         ]
       end
 
+      def send_git_snapshot(repository)
+        params = {
+          'GitalyServer' => gitaly_server_hash(repository),
+          'GetSnapshotRequest' => Gitaly::GetSnapshotRequest.new(
+            repository: repository.gitaly_repository
+          ).to_json
+        }
+
+        [
+          SEND_DATA_HEADER,
+          "git-snapshot:#{encode(params)}"
+        ]
+      end
+
       def send_git_diff(repository, diff_refs)
         params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
                    {
diff --git a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
index 074323d47d2..ecd8657c406 100644
--- a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
@@ -156,4 +156,15 @@ describe Gitlab::GitalyClient::RepositoryService do
       client.calculate_checksum
     end
   end
+
+  describe '#create_from_snapshot' do
+    it 'sends a create_repository_from_snapshot message' do
+      expect_any_instance_of(Gitaly::RepositoryService::Stub)
+        .to receive(:create_repository_from_snapshot)
+        .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
+        .and_return(double)
+
+      client.create_from_snapshot('http://example.com?wiki=1', 'Custom xyz')
+    end
+  end
 end
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index d64ea72e346..e732b089d44 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -482,4 +482,26 @@ describe Gitlab::Workhorse do
       }.deep_stringify_keys)
     end
   end
+
+  describe '.send_git_snapshot' do
+    let(:url) { 'http://example.com' }
+
+    subject(:request) { described_class.send_git_snapshot(repository) }
+
+    it 'sets the header correctly' do
+      key, command, params = decode_workhorse_header(request)
+
+      expect(key).to eq("Gitlab-Workhorse-Send-Data")
+      expect(command).to eq('git-snapshot')
+      expect(params).to eq(
+        'GitalyServer' => {
+          'address' => Gitlab::GitalyClient.address(project.repository_storage),
+          'token' => Gitlab::GitalyClient.token(project.repository_storage)
+        },
+        'GetSnapshotRequest' => Gitaly::GetSnapshotRequest.new(
+          repository: repository.gitaly_repository
+        ).to_json
+      )
+    end
+  end
 end
diff --git a/spec/requests/api/project_snapshots_spec.rb b/spec/requests/api/project_snapshots_spec.rb
new file mode 100644
index 00000000000..07a920f8d28
--- /dev/null
+++ b/spec/requests/api/project_snapshots_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe API::ProjectSnapshots do
+  include WorkhorseHelpers
+
+  let(:project) { create(:project) }
+  let(:admin) { create(:admin) }
+
+  describe 'GET /projects/:id/snapshot' do
+    def expect_snapshot_response_for(repository)
+      type, params = workhorse_send_data
+
+      expect(type).to eq('git-snapshot')
+      expect(params).to eq(
+        'GitalyServer' => {
+          'address' => Gitlab::GitalyClient.address(repository.project.repository_storage),
+          'token' => Gitlab::GitalyClient.token(repository.project.repository_storage)
+        },
+        'GetSnapshotRequest' => Gitaly::GetSnapshotRequest.new(
+          repository: repository.gitaly_repository
+        ).to_json
+      )
+    end
+
+    it 'returns authentication error as project owner' do
+      get api("/projects/#{project.id}/snapshot", project.owner)
+
+      expect(response).to have_gitlab_http_status(403)
+    end
+
+    it 'returns authentication error as unauthenticated user' do
+      get api("/projects/#{project.id}/snapshot", nil)
+
+      expect(response).to have_gitlab_http_status(401)
+    end
+
+    it 'requests project repository raw archive as administrator' do
+      get api("/projects/#{project.id}/snapshot", admin), wiki: '0'
+
+      expect(response).to have_gitlab_http_status(200)
+      expect_snapshot_response_for(project.repository)
+    end
+
+    it 'requests wiki repository raw archive as administrator' do
+      get api("/projects/#{project.id}/snapshot", admin), wiki: '1'
+
+      expect(response).to have_gitlab_http_status(200)
+      expect_snapshot_response_for(project.wiki.repository)
+    end
+  end
+end
-- 
cgit v1.2.3


From 5cfbf2c87635dbe82c53ca758c192519b2c63c45 Mon Sep 17 00:00:00 2001
From: Mek Stittri <mstittri@gitlab.com>
Date: Thu, 19 Apr 2018 10:46:34 -0700
Subject: Added missing note for P1 priority

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 02599907af7..5a85eed8611 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -210,7 +210,7 @@ This label documents the planned timeline & urgency which is used to measure aga
 
 | Label | Meaning         | Estimate time to fix                                             | Guidance |
 |-------|-----------------|------------------------------------------------------------------|----------|
-| ~P1   | Urgent Priority | The current release                                              |  |
+| ~P1   | Urgent Priority | The current release + potentially immediate hotfix to GitLab.com |  |
 | ~P2   | High Priority   | The next release                                                 |  |
 | ~P3   | Medium Priority | Within the next 3 releases (approx one quarter)                  |  |
 | ~P4   | Low Priority    | Anything outside the next 3 releases (approx beyond one quarter) | The issue is prominent but does not impact user workflow and a workaround is documented  |
-- 
cgit v1.2.3


From a02eac25a71f82de8ed1f1ad0a57d4600f417b78 Mon Sep 17 00:00:00 2001
From: Mek Stittri <mstittri@gitlab.com>
Date: Thu, 19 Apr 2018 10:56:06 -0700
Subject: Fixed links and heading section

---
 CONTRIBUTING.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5a85eed8611..29009010f0e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,9 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._
   - [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)
-  - [Priority labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#priority-labels-deliverable-stretch-next-patch-release)
+  - [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)
 - [Issue tracker](#issue-tracker)
@@ -127,6 +129,8 @@ Most issues will have labels for at least one of the following:
 - Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc.
 - Team: ~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.
 - Milestone: ~Deliverable, ~Stretch, ~"Next Patch Release"
+- Priority: ~P1, ~P2, ~P3, ~P4
+- Severity: ~S1, ~S2, ~S3, ~S4
 
 All labels, their meaning and priority are defined on the
 [labels page][labels-page].
-- 
cgit v1.2.3


From 2d7efd9637c6789f73cae803869454b4ea6bc7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Thu, 19 Apr 2018 23:30:32 -0500
Subject: Don't include lfs_file_locks data in export bundle

---
 .../rd-45502-uploading-project-export-with-lfs-file-locks-fails.yml | 5 +++++
 lib/gitlab/import_export/import_export.yml                          | 2 --
 spec/lib/gitlab/import_export/safe_model_attributes.yml             | 6 ------
 3 files changed, 5 insertions(+), 8 deletions(-)
 create mode 100644 changelogs/unreleased/rd-45502-uploading-project-export-with-lfs-file-locks-fails.yml

diff --git a/changelogs/unreleased/rd-45502-uploading-project-export-with-lfs-file-locks-fails.yml b/changelogs/unreleased/rd-45502-uploading-project-export-with-lfs-file-locks-fails.yml
new file mode 100644
index 00000000000..e3266dda629
--- /dev/null
+++ b/changelogs/unreleased/rd-45502-uploading-project-export-with-lfs-file-locks-fails.yml
@@ -0,0 +1,5 @@
+---
+title: Don't include lfs_file_locks data in export bundle
+merge_request: 18495
+author:
+type: fixed
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index cd840bd5b01..ec91c02dbe7 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -27,8 +27,6 @@ project_tree:
   - :releases
   - project_members:
     - :user
-  - lfs_file_locks:
-    - :user
   - merge_requests:
     - notes:
       - :author
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index f84a777a27f..05790bb5fe1 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -537,12 +537,6 @@ ProjectCustomAttribute:
 - project_id
 - key
 - value
-LfsFileLock:
-- id
-- path
-- user_id
-- project_id
-- created_at
 Badge:
 - id
 - link_url
-- 
cgit v1.2.3


From 5051ca971c9196441725bf2b758f341294fc2381 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 20 Apr 2018 09:41:10 +0200
Subject: Ignore ordering in IssueDueSchedulerWorker spec

---
 spec/workers/issue_due_scheduler_worker_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/workers/issue_due_scheduler_worker_spec.rb b/spec/workers/issue_due_scheduler_worker_spec.rb
index 7b60835fd26..2710267d384 100644
--- a/spec/workers/issue_due_scheduler_worker_spec.rb
+++ b/spec/workers/issue_due_scheduler_worker_spec.rb
@@ -14,7 +14,9 @@ describe IssueDueSchedulerWorker do
       create(:issue, :closed, project: project_closed_issue, due_date: Date.tomorrow)
       create(:issue, :opened, project: project_issue_due_another_day, due_date: Date.today)
 
-      expect(MailScheduler::IssueDueWorker).to receive(:bulk_perform_async).with([[project1.id], [project2.id]])
+      expect(MailScheduler::IssueDueWorker).to receive(:bulk_perform_async) do |args|
+        expect(args).to match_array([[project1.id], [project2.id]])
+      end
 
       described_class.new.perform
     end
-- 
cgit v1.2.3


From 3dc8ad277daf237b1abae1398fada18d751656df Mon Sep 17 00:00:00 2001
From: Simon Knox <simon@gitlab.com>
Date: Fri, 20 Apr 2018 07:47:08 +0000
Subject: Resolve "Text from the diff is showing within a table header inside
 the discussion after the discussion is resolved"

---
 app/assets/javascripts/notes.js                               |  2 +-
 .../user_resolves_diff_notes_and_discussions_resolve_spec.rb  | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 2121907dff0..96f2b3eac98 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -1427,7 +1427,7 @@ export default class Notes {
     const { discussion_html } = data;
     const lines = $(discussion_html).find('.line_holder');
     lines.addClass('fade-in');
-    $container.find('tbody').prepend(lines);
+    $container.find('.diff-content > table > tbody').prepend(lines);
     const fileHolder = $container.find('.file-holder');
     $container.find('.line-holder-placeholder').remove();
     syntaxHighlight(fileHolder);
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
index b4ad4b64d8e..0fd2840c426 100644
--- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
+++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
@@ -5,7 +5,7 @@ describe 'Merge request > User resolves diff notes and discussions', :js do
   let(:user)          { project.creator }
   let(:guest)         { create(:user) }
   let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: "Bug NS-04") }
-  let!(:note)          { create(:diff_note_on_merge_request, project: project, noteable: merge_request) }
+  let!(:note)         { create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "| Markdown | Table |\n|-------|---------|\n| first | second |") }
   let(:path)          { "files/ruby/popen.rb" }
   let(:position) do
     Gitlab::Diff::Position.new(
@@ -111,6 +111,15 @@ describe 'Merge request > User resolves diff notes and discussions', :js do
             expect(page.find(".line-holder-placeholder")).to be_visible
             expect(page.find(".timeline-content #note_#{note.id}")).to be_visible
           end
+
+          it 'renders tables in lazy-loaded resolved diff dicussions' do
+            find(".timeline-content .discussion[data-discussion-id='#{note.discussion_id}'] .discussion-toggle-button").click
+
+            wait_for_requests
+
+            expect(page.find(".timeline-content #note_#{note.id}")).not_to have_css(".line_holder")
+            expect(page.find(".timeline-content #note_#{note.id}")).to have_css("tr", count: 2)
+          end
         end
 
         describe 'side-by-side view' do
-- 
cgit v1.2.3


From 02c921afbc90d7f45b3f5483c27499caf7aa78a6 Mon Sep 17 00:00:00 2001
From: Alexander Tanayno <atanayno@gitlab.com>
Date: Fri, 20 Apr 2018 08:43:50 +0000
Subject: Update index.md

---
 doc/administration/pages/index.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index c342a82ef7b..9b3b1e48efd 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -119,14 +119,14 @@ The Pages daemon doesn't listen to the outside world.
 
 1. Set the external URL for GitLab Pages in `/etc/gitlab/gitlab.rb`:
 
-    ```ruby
+    ```shell
     pages_external_url 'http://example.io'
     ```
 
 1. [Reconfigure GitLab][reconfigure]
 1. Restart gitlab-pages by running the following command:
 
-     ```ruby
+     ```shell
     sudo gitlab-ctl restart gitlab-pages
     ```
 
@@ -149,7 +149,7 @@ outside world.
 1. Place the certificate and key inside `/etc/gitlab/ssl`
 1. In `/etc/gitlab/gitlab.rb` specify the following configuration:
 
-    ```ruby
+    ```shell
     pages_external_url 'https://example.io'
 
     pages_nginx['redirect_http_to_https'] = true
@@ -163,7 +163,7 @@ outside world.
 1. [Reconfigure GitLab][reconfigure]
 1. Restart gitlab-pages by running the following command:
 
-     ```ruby
+     ```shell
     sudo gitlab-ctl restart gitlab-pages
     ```
 
@@ -191,7 +191,7 @@ world. Custom domains are supported, but no TLS.
 
 1. Edit `/etc/gitlab/gitlab.rb`:
 
-    ```ruby
+    ```shell
     pages_external_url "http://example.io"
     nginx['listen_addresses'] = ['1.1.1.1']
     pages_nginx['enable'] = false
@@ -205,7 +205,7 @@ world. Custom domains are supported, but no TLS.
 1. [Reconfigure GitLab][reconfigure]
 1. Restart gitlab-pages by running the following command:
 
-     ```ruby
+     ```shell
     sudo gitlab-ctl restart gitlab-pages
     ```
 
@@ -226,7 +226,7 @@ world. Custom domains and TLS are supported.
 
 1. Edit `/etc/gitlab/gitlab.rb`:
 
-    ```ruby
+    ```shell
     pages_external_url "https://example.io"
     nginx['listen_addresses'] = ['1.1.1.1']
     pages_nginx['enable'] = false
@@ -243,7 +243,7 @@ world. Custom domains and TLS are supported.
 1. [Reconfigure GitLab][reconfigure]
 1. Restart gitlab-pages by running the following command:
 
-     ```ruby
+     ```shell
     sudo gitlab-ctl restart gitlab-pages
     ```
 
@@ -268,14 +268,14 @@ are stored.
    If you wish to store them in another location you must set it up in
    `/etc/gitlab/gitlab.rb`:
 
-     ```ruby
+     ```shell
      gitlab_rails['pages_path'] = "/mnt/storage/pages"
      ```
 
 1. [Reconfigure GitLab][reconfigure]
 1. Restart gitlab-pages by running the following command:
 
-     ```ruby
+     ```shell
     sudo gitlab-ctl restart gitlab-pages
     ```
 
-- 
cgit v1.2.3


From 225994f005ae1fad17ae40053a31e7649fd596d5 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 20 Apr 2018 10:55:29 +0200
Subject: Update CHANGELOG.md for 10.7.0

[ci skip]
---
 CHANGELOG.md                                       | 207 +++++++++++++++++++++
 .../unreleased/17516-nested-restore-changelog.yml  |   5 -
 .../unreleased/17939-osw-patch-support-gfm.yml     |   5 -
 .../20394-protected-branches-wildcard.yml          |   5 -
 ...n-pushing-more-commits-to-the-merge-request.yml |   5 -
 .../27210-add-cancel-btn-to-new-page-domain.yml    |   5 -
 .../31114-internal-ids-are-not-atomic.yml          |   5 -
 ...ect-deploy-tokens-to-allow-permanent-access.yml |   5 -
 ...3803-drop-json-support-in-project-milestone.yml |   5 -
 ...4-fix-generated-url-for-external-repository.yml |   5 -
 changelogs/unreleased/35475-lazy-diff.yml          |   5 -
 .../38167-ui-bug-when-creating-new-branch.yml      |   5 -
 .../39584-nesting-depth-5-framework-dropdowns.yml  |   5 -
 changelogs/unreleased/39880-merge-method-api.yml   |   5 -
 changelogs/unreleased/40781-os-to-ce.yml           |   5 -
 changelogs/unreleased/41224-pipeline-icons.yml     |   5 -
 ...e-simpler-env-vars-for-auto-devops-replicas.yml |   5 -
 ...g-username-url-still-redirects-to-old-route.yml |   5 -
 ...write-project-description-on-project-export.yml |   5 -
 .../unreleased/41967_issue_api_closed_by_info.yml  |   5 -
 changelogs/unreleased/42028-xss-diffs.yml          |   5 -
 ...names-group-names-covers-namespace-dropdown.yml |   5 -
 ...ions-and-sha-design-for-project-commit-list.yml |   6 -
 .../unreleased/42568-pipeline-empty-state.yml      |   5 -
 .../42579-fix-sidebar-dropdown-hover-style.yml     |   5 -
 ...oss-of-input-text-on-comments-after-preview.yml |   5 -
 ...ler-show-executes-more-than-100-sql-queries.yml |   5 -
 .../43215-update-design-for-verifying-domains.yml  |   5 -
 changelogs/unreleased/43246-checkfilter.yml        |   6 -
 ...information-should-use-a-more-specific-name.yml |   5 -
 ...n-empty-project-gives-you-wrong-information.yml |   5 -
 ...43512-add-support-for-omniauth-jwt-provider.yml |   5 -
 ...25-limit-number-of-failed-logins-using-ldap.yml |   5 -
 ...wned-projects-query-performance-improvement.yml |   5 -
 changelogs/unreleased/43603-ci-lint-support.yml    |   5 -
 .../43702-update-label-dropdown-wording.yml        |   5 -
 .../43717-breadcrumb-on-admin-runner-page.yml      |   5 -
 .../unreleased/43720-update-fe-webpack-docs.yml    |   6 -
 ...43745-store-metadata-checksum-for-artifacts.yml |   5 -
 .../43771-improve-avatar-error-message.yml         |   5 -
 ...-on-the-issuable-list-add-tooltips-to-icons.yml |   5 -
 ...-calls-and-arguments-in-the-performance-bar.yml |   5 -
 .../unreleased/43806-update-ruby-saml-to-1-7-2.yml |   5 -
 .../unreleased/43933-always-notify-mentions.yml    |   6 -
 .../unreleased/43949-verify-job-artifacts.yml      |   5 -
 ...976-fix-access-token-clipboard-button-style.yml |   5 -
 changelogs/unreleased/44022-singular-1-diff.yml    |   5 -
 .../unreleased/44139-fix-issue-boards-dup-keys.yml |   6 -
 .../unreleased/44160-update-foreman-to-0-84-0.yml  |   5 -
 ...edis-usage-from-merge-request-diffs-caching.yml |   5 -
 ...ort-for-the-prometheus-merge-request-widget.yml |   5 -
 .../unreleased/44235-update-knapsack-to-1-16-0.yml |   5 -
 ...ves-500-error-error-undefined-method-binary.yml |   5 -
 ...w-failure-reason-on-upgrade-tooltip-of-jobs.yml |   5 -
 changelogs/unreleased/44280-fix-code-search.yml    |   5 -
 ...44291-usage-ping-for-kubernetes-integration.yml |   5 -
 ...44382-ui-breakdown-for-create-merge-request.yml |   5 -
 .../unreleased/44383-cleanup-framework-header.yml  |   5 -
 .../44384-cleanup-css-for-nested-lists.yml         |   5 -
 .../44386-better-ux-for-long-name-branches.yml     |   5 -
 .../44388-update-rack-protection-to-2-0-1.yml      |   5 -
 ...389-always-allow-http-for-ci-git-operations.yml |   5 -
 ...tion-silently-failing-on-after-create-error.yml |   5 -
 .../unreleased/44425-use-gitlab_environment.yml    |   5 -
 .../unreleased/44508-fix-fork-namespace-images.yml |   5 -
 .../44657-reuse-root_ref_hash-on-branches.yml      |   5 -
 .../44665-fix-db-trace-stream-by-raw-access.yml    |   5 -
 ...12-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml |   5 -
 ...upload-task-fails-for-upload-with-store-nil.yml |   5 -
 .../44776-fix-upload-migrate-fails-for-group.yml   |   5 -
 .../44878-update-brakeman-3-6-1-to-4-2-1.yml       |   5 -
 .../unreleased/44902-remove-rake-test-ci.yml       |   5 -
 .../unreleased/45271-collpased-diff-loading.yml    |   5 -
 .../unreleased/Link_to_project_labels_page.yml     |   5 -
 .../unreleased/ab-37125-assigned-issues-query.yml  |   5 -
 .../ab-37462-cache-personal-projects-count.yml     |   5 -
 .../ab-43150-users-controller-show-query-limit.yml |   5 -
 changelogs/unreleased/ab-44467-remove-index.yml    |   5 -
 changelogs/unreleased/ac-fix-use_file-race.yml     |   5 -
 .../unreleased/ac-lfs-direct-upload-ee-to-ce.yml   |   5 -
 changelogs/unreleased/ac-pages-port.yml            |   5 -
 .../adamco-gitlab-ce-move-issue-command.yml        |   5 -
 changelogs/unreleased/add-canary-favicon.yml       |   5 -
 changelogs/unreleased/add-cpu-mem-totals.yml       |   5 -
 ...ath-to-dashboard-milestones-breadcrumb-link.yml |   5 -
 .../unreleased/add-per-runner-job-timeout.yml      |   5 -
 .../add-query-counts-to-profiler-output.yml        |   5 -
 .../ajax-requests-in-performance-bar.yml           |   5 -
 .../blackst0ne-bump-html-pipeline-gem.yml          |   5 -
 ...ils5-update-state_machines-activerecord-gem.yml |   5 -
 ...place-spinach-project-issues-issues-feature.yml |   5 -
 ...place-spinach-project-issues-labels-feature.yml |   5 -
 changelogs/unreleased/bvl-export-import-lfs.yml    |   5 -
 .../bvl-import-zip-multiple-assignees.yml          |   5 -
 .../unreleased/bvl-no-permanent-redirect.yml       |   5 -
 .../unreleased/bvl-override-import-params.yml      |   5 -
 .../unreleased/ci-pipeline-commit-lookup.yml       |   5 -
 .../da-gitaly-calculate-repository-checksum.yml    |   5 -
 ...ard-view-user-choices-issues-merge-requests.yml |   5 -
 .../deploy-tokens-container-registry-specs.yml     |   5 -
 changelogs/unreleased/direct-upload-of-uploads.yml |   5 -
 .../unreleased/dm-deploy-keys-default-user.yml     |   5 -
 .../unreleased/dm-flatten-tree-plus-chars.yml      |   5 -
 .../unreleased/dm-internal-user-namespace.yml      |   5 -
 .../unreleased/docs-for-failure-reason-tooltip.yml |   5 -
 .../unreleased/dz-improve-app-settings-2.yml       |   5 -
 .../escape-autocomplete-values-for-markdown.yml    |   5 -
 changelogs/unreleased/expose-commits-mr-api.yml    |   5 -
 ...ure-gb-variables-expressions-in-only-except.yml |   5 -
 .../feature_detect_co_authored_commits.yml         |   6 -
 .../unreleased/fix-40798-namespace-forking.yml     |   5 -
 changelogs/unreleased/fix-42459---in-branch.yml    |   5 -
 ...ix-500-error-when-mr-ref-is-not-yet-fetched.yml |   6 -
 changelogs/unreleased/fix-auth0-unsafe-login.yml   |   5 -
 changelogs/unreleased/fix-dashboard-sorting.yml    |   5 -
 changelogs/unreleased/fix-emoji-popup.yml          |   5 -
 .../unreleased/fix-mattermost-delete-team.yml      |   5 -
 .../fix-projects-no-repository-placeholder.yml     |   5 -
 .../unreleased/fix-references-in-group-context.yml |   5 -
 .../unreleased/fix-wiki-find-file-gitaly.yml       |   5 -
 .../fj-15329-services-callbacks-ssrf.yml           |   5 -
 .../fj-174-better-ldap-connection-handling.yml     |   5 -
 ...1900-import-endpoint-with-overwrite-support.yml |   5 -
 .../fj-42685-extend-project-export-endpoint.yml    |   5 -
 changelogs/unreleased/fl-fix-annoying-actions.yml  |   5 -
 changelogs/unreleased/ide-file-row-hover-style.yml |   5 -
 changelogs/unreleased/ide-folder-button-path.yml   |   5 -
 .../unreleased/ide-project-avatar-identicon.yml    |   5 -
 .../increase-unicorn-memory-killer-limits.yml      |   5 -
 changelogs/unreleased/issue_25542.yml              |   5 -
 changelogs/unreleased/issue_40915.yml              |   5 -
 changelogs/unreleased/issue_42443.yml              |   5 -
 changelogs/unreleased/issue_44270.yml              |   5 -
 .../unreleased/jej-commit-api-tracks-lfs.yml       |   5 -
 ...jej-mattermost-notification-confidentiality.yml |   5 -
 .../jivl-realtime-update-adding-file.yml           |   5 -
 ...ivl-summary-statistics-prometheus-dashboard.yml |   5 -
 changelogs/unreleased/jprovazn-issueref.yml        |   6 -
 changelogs/unreleased/jramsay-38830-tarball.yml    |   5 -
 ...e-request-widget-source-branch-improvements.yml |   6 -
 .../move-email-footer-info-to-single-line.yml      |   5 -
 ...ove-registry-after-cicd-project-nav-sidebar.yml |   5 -
 changelogs/unreleased/optional-api-delimiter.yml   |   5 -
 ...sw-41401-render-mr-commit-sha-instead-diffs.yml |   5 -
 ...5-adjust-authorization-for-discussions-show.yml |   5 -
 changelogs/unreleased/pages_force_https.yml        |   5 -
 changelogs/unreleased/poc-upload-hashing-path.yml  |   5 -
 ...uery-count-for-mergerequestscontroller-show.yml |   5 -
 .../refactor-move-assignee-title-vue-component.yml |   5 -
 ...mr-widget-memory-usage-and-graph-components.yml |   5 -
 ...ve-mr-widget-nothing-to-merge-vue-component.yml |   5 -
 ...r-move-mr-widget-sha-mismatch-vue-component.yml |   5 -
 ...widget-unresolved-discussions-vue-component.yml |   5 -
 ...time-tracking-comparison-pane-vue-component.yml |   5 -
 .../refactor-move-time-tracking-vue-components.yml |   5 -
 changelogs/unreleased/remove-pages-tar-support.yml |   5 -
 .../unreleased/sh-add-cleanup-rpc-gitaly.yml       |   5 -
 .../unreleased/sh-appearance-cache-key-version.yml |   5 -
 changelogs/unreleased/sh-gitlab-sidekiq-logger.yml |   5 -
 .../unreleased/sh-memoize-repository-empty.yml     |   5 -
 .../unreleased/sh-move-sidekiq-exporter-logs.yml   |   5 -
 .../unreleased/tc-re-add-read-only-banner.yml      |   5 -
 changelogs/unreleased/ui-mr-counter-cache.yml      |   5 -
 .../update-gitlab-ci-yml-services-docs.yml         |   5 -
 ...-import-path-for-vue-mount-component-helper.yml |   5 -
 ...update-unresolved-discussions-vue-component.yml |   5 -
 ...uration-attribute-for-project-build-timeout.yml |   5 -
 .../winh-41174-projects-groups-badges-ui.yml       |   5 -
 changelogs/unreleased/winh-deprecate-old-modal.yml |   5 -
 .../unreleased/workhorse-gitaly-mandatory.yml      |   5 -
 changelogs/unreleased/zj-bump-gitaly.yml           |   5 -
 .../unreleased/zj-feature-gate-remove-http-api.yml |   5 -
 changelogs/unreleased/zj-opt-out-delete-refs.yml   |   5 -
 .../unreleased/zj-opt-out-list-commits-by-oid.yml  |   5 -
 changelogs/unreleased/zj-remote-repo-exists.yml    |   5 -
 175 files changed, 207 insertions(+), 879 deletions(-)
 delete mode 100644 changelogs/unreleased/17516-nested-restore-changelog.yml
 delete mode 100644 changelogs/unreleased/17939-osw-patch-support-gfm.yml
 delete mode 100644 changelogs/unreleased/20394-protected-branches-wildcard.yml
 delete mode 100644 changelogs/unreleased/23460-send-email-when-pushing-more-commits-to-the-merge-request.yml
 delete mode 100644 changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml
 delete mode 100644 changelogs/unreleased/31114-internal-ids-are-not-atomic.yml
 delete mode 100644 changelogs/unreleased/31591-project-deploy-tokens-to-allow-permanent-access.yml
 delete mode 100644 changelogs/unreleased/33803-drop-json-support-in-project-milestone.yml
 delete mode 100644 changelogs/unreleased/34604-fix-generated-url-for-external-repository.yml
 delete mode 100644 changelogs/unreleased/35475-lazy-diff.yml
 delete mode 100644 changelogs/unreleased/38167-ui-bug-when-creating-new-branch.yml
 delete mode 100644 changelogs/unreleased/39584-nesting-depth-5-framework-dropdowns.yml
 delete mode 100644 changelogs/unreleased/39880-merge-method-api.yml
 delete mode 100644 changelogs/unreleased/40781-os-to-ce.yml
 delete mode 100644 changelogs/unreleased/41224-pipeline-icons.yml
 delete mode 100644 changelogs/unreleased/41436-use-simpler-env-vars-for-auto-devops-replicas.yml
 delete mode 100644 changelogs/unreleased/41758-after-changing-username-url-still-redirects-to-old-route.yml
 delete mode 100644 changelogs/unreleased/41902-add-api-option-to-overwrite-project-description-on-project-export.yml
 delete mode 100644 changelogs/unreleased/41967_issue_api_closed_by_info.yml
 delete mode 100644 changelogs/unreleased/42028-xss-diffs.yml
 delete mode 100644 changelogs/unreleased/42037-long-instance-names-group-names-covers-namespace-dropdown.yml
 delete mode 100644 changelogs/unreleased/42448-change-commit-row-actions-and-sha-design-for-project-commit-list.yml
 delete mode 100644 changelogs/unreleased/42568-pipeline-empty-state.yml
 delete mode 100644 changelogs/unreleased/42579-fix-sidebar-dropdown-hover-style.yml
 delete mode 100644 changelogs/unreleased/42880-loss-of-input-text-on-comments-after-preview.yml
 delete mode 100644 changelogs/unreleased/43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries.yml
 delete mode 100644 changelogs/unreleased/43215-update-design-for-verifying-domains.yml
 delete mode 100644 changelogs/unreleased/43246-checkfilter.yml
 delete mode 100644 changelogs/unreleased/43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name.yml
 delete mode 100644 changelogs/unreleased/43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information.yml
 delete mode 100644 changelogs/unreleased/43512-add-support-for-omniauth-jwt-provider.yml
 delete mode 100644 changelogs/unreleased/43525-limit-number-of-failed-logins-using-ldap.yml
 delete mode 100644 changelogs/unreleased/43552-user-owned-projects-query-performance-improvement.yml
 delete mode 100644 changelogs/unreleased/43603-ci-lint-support.yml
 delete mode 100644 changelogs/unreleased/43702-update-label-dropdown-wording.yml
 delete mode 100644 changelogs/unreleased/43717-breadcrumb-on-admin-runner-page.yml
 delete mode 100644 changelogs/unreleased/43720-update-fe-webpack-docs.yml
 delete mode 100644 changelogs/unreleased/43745-store-metadata-checksum-for-artifacts.yml
 delete mode 100644 changelogs/unreleased/43771-improve-avatar-error-message.yml
 delete mode 100644 changelogs/unreleased/43786-on-the-issuable-list-add-tooltips-to-icons.yml
 delete mode 100644 changelogs/unreleased/43805-list-gitaly-calls-and-arguments-in-the-performance-bar.yml
 delete mode 100644 changelogs/unreleased/43806-update-ruby-saml-to-1-7-2.yml
 delete mode 100644 changelogs/unreleased/43933-always-notify-mentions.yml
 delete mode 100644 changelogs/unreleased/43949-verify-job-artifacts.yml
 delete mode 100644 changelogs/unreleased/43976-fix-access-token-clipboard-button-style.yml
 delete mode 100644 changelogs/unreleased/44022-singular-1-diff.yml
 delete mode 100644 changelogs/unreleased/44139-fix-issue-boards-dup-keys.yml
 delete mode 100644 changelogs/unreleased/44160-update-foreman-to-0-84-0.yml
 delete mode 100644 changelogs/unreleased/44191-reduce-redis-usage-from-merge-request-diffs-caching.yml
 delete mode 100644 changelogs/unreleased/44218-add-internationalization-support-for-the-prometheus-merge-request-widget.yml
 delete mode 100644 changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml
 delete mode 100644 changelogs/unreleased/44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary.yml
 delete mode 100644 changelogs/unreleased/44269-show-failure-reason-on-upgrade-tooltip-of-jobs.yml
 delete mode 100644 changelogs/unreleased/44280-fix-code-search.yml
 delete mode 100644 changelogs/unreleased/44291-usage-ping-for-kubernetes-integration.yml
 delete mode 100644 changelogs/unreleased/44382-ui-breakdown-for-create-merge-request.yml
 delete mode 100644 changelogs/unreleased/44383-cleanup-framework-header.yml
 delete mode 100644 changelogs/unreleased/44384-cleanup-css-for-nested-lists.yml
 delete mode 100644 changelogs/unreleased/44386-better-ux-for-long-name-branches.yml
 delete mode 100644 changelogs/unreleased/44388-update-rack-protection-to-2-0-1.yml
 delete mode 100644 changelogs/unreleased/44389-always-allow-http-for-ci-git-operations.yml
 delete mode 100644 changelogs/unreleased/44392-resolve-projects-creation-silently-failing-on-after-create-error.yml
 delete mode 100644 changelogs/unreleased/44425-use-gitlab_environment.yml
 delete mode 100644 changelogs/unreleased/44508-fix-fork-namespace-images.yml
 delete mode 100644 changelogs/unreleased/44657-reuse-root_ref_hash-on-branches.yml
 delete mode 100644 changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml
 delete mode 100644 changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml
 delete mode 100644 changelogs/unreleased/44774-migrate-upload-task-fails-for-upload-with-store-nil.yml
 delete mode 100644 changelogs/unreleased/44776-fix-upload-migrate-fails-for-group.yml
 delete mode 100644 changelogs/unreleased/44878-update-brakeman-3-6-1-to-4-2-1.yml
 delete mode 100644 changelogs/unreleased/44902-remove-rake-test-ci.yml
 delete mode 100644 changelogs/unreleased/45271-collpased-diff-loading.yml
 delete mode 100644 changelogs/unreleased/Link_to_project_labels_page.yml
 delete mode 100644 changelogs/unreleased/ab-37125-assigned-issues-query.yml
 delete mode 100644 changelogs/unreleased/ab-37462-cache-personal-projects-count.yml
 delete mode 100644 changelogs/unreleased/ab-43150-users-controller-show-query-limit.yml
 delete mode 100644 changelogs/unreleased/ab-44467-remove-index.yml
 delete mode 100644 changelogs/unreleased/ac-fix-use_file-race.yml
 delete mode 100644 changelogs/unreleased/ac-lfs-direct-upload-ee-to-ce.yml
 delete mode 100644 changelogs/unreleased/ac-pages-port.yml
 delete mode 100644 changelogs/unreleased/adamco-gitlab-ce-move-issue-command.yml
 delete mode 100644 changelogs/unreleased/add-canary-favicon.yml
 delete mode 100644 changelogs/unreleased/add-cpu-mem-totals.yml
 delete mode 100644 changelogs/unreleased/add-milestone-path-to-dashboard-milestones-breadcrumb-link.yml
 delete mode 100644 changelogs/unreleased/add-per-runner-job-timeout.yml
 delete mode 100644 changelogs/unreleased/add-query-counts-to-profiler-output.yml
 delete mode 100644 changelogs/unreleased/ajax-requests-in-performance-bar.yml
 delete mode 100644 changelogs/unreleased/blackst0ne-bump-html-pipeline-gem.yml
 delete mode 100644 changelogs/unreleased/blackst0ne-rails5-update-state_machines-activerecord-gem.yml
 delete mode 100644 changelogs/unreleased/blackst0ne-replace-spinach-project-issues-issues-feature.yml
 delete mode 100644 changelogs/unreleased/blackst0ne-replace-spinach-project-issues-labels-feature.yml
 delete mode 100644 changelogs/unreleased/bvl-export-import-lfs.yml
 delete mode 100644 changelogs/unreleased/bvl-import-zip-multiple-assignees.yml
 delete mode 100644 changelogs/unreleased/bvl-no-permanent-redirect.yml
 delete mode 100644 changelogs/unreleased/bvl-override-import-params.yml
 delete mode 100644 changelogs/unreleased/ci-pipeline-commit-lookup.yml
 delete mode 100644 changelogs/unreleased/da-gitaly-calculate-repository-checksum.yml
 delete mode 100644 changelogs/unreleased/dashboard-view-user-choices-issues-merge-requests.yml
 delete mode 100644 changelogs/unreleased/deploy-tokens-container-registry-specs.yml
 delete mode 100644 changelogs/unreleased/direct-upload-of-uploads.yml
 delete mode 100644 changelogs/unreleased/dm-deploy-keys-default-user.yml
 delete mode 100644 changelogs/unreleased/dm-flatten-tree-plus-chars.yml
 delete mode 100644 changelogs/unreleased/dm-internal-user-namespace.yml
 delete mode 100644 changelogs/unreleased/docs-for-failure-reason-tooltip.yml
 delete mode 100644 changelogs/unreleased/dz-improve-app-settings-2.yml
 delete mode 100644 changelogs/unreleased/escape-autocomplete-values-for-markdown.yml
 delete mode 100644 changelogs/unreleased/expose-commits-mr-api.yml
 delete mode 100644 changelogs/unreleased/feature-gb-variables-expressions-in-only-except.yml
 delete mode 100644 changelogs/unreleased/feature_detect_co_authored_commits.yml
 delete mode 100644 changelogs/unreleased/fix-40798-namespace-forking.yml
 delete mode 100644 changelogs/unreleased/fix-42459---in-branch.yml
 delete mode 100644 changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml
 delete mode 100644 changelogs/unreleased/fix-auth0-unsafe-login.yml
 delete mode 100644 changelogs/unreleased/fix-dashboard-sorting.yml
 delete mode 100644 changelogs/unreleased/fix-emoji-popup.yml
 delete mode 100644 changelogs/unreleased/fix-mattermost-delete-team.yml
 delete mode 100644 changelogs/unreleased/fix-projects-no-repository-placeholder.yml
 delete mode 100644 changelogs/unreleased/fix-references-in-group-context.yml
 delete mode 100644 changelogs/unreleased/fix-wiki-find-file-gitaly.yml
 delete mode 100644 changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml
 delete mode 100644 changelogs/unreleased/fj-174-better-ldap-connection-handling.yml
 delete mode 100644 changelogs/unreleased/fj-41900-import-endpoint-with-overwrite-support.yml
 delete mode 100644 changelogs/unreleased/fj-42685-extend-project-export-endpoint.yml
 delete mode 100644 changelogs/unreleased/fl-fix-annoying-actions.yml
 delete mode 100644 changelogs/unreleased/ide-file-row-hover-style.yml
 delete mode 100644 changelogs/unreleased/ide-folder-button-path.yml
 delete mode 100644 changelogs/unreleased/ide-project-avatar-identicon.yml
 delete mode 100644 changelogs/unreleased/increase-unicorn-memory-killer-limits.yml
 delete mode 100644 changelogs/unreleased/issue_25542.yml
 delete mode 100644 changelogs/unreleased/issue_40915.yml
 delete mode 100644 changelogs/unreleased/issue_42443.yml
 delete mode 100644 changelogs/unreleased/issue_44270.yml
 delete mode 100644 changelogs/unreleased/jej-commit-api-tracks-lfs.yml
 delete mode 100644 changelogs/unreleased/jej-mattermost-notification-confidentiality.yml
 delete mode 100644 changelogs/unreleased/jivl-realtime-update-adding-file.yml
 delete mode 100644 changelogs/unreleased/jivl-summary-statistics-prometheus-dashboard.yml
 delete mode 100644 changelogs/unreleased/jprovazn-issueref.yml
 delete mode 100644 changelogs/unreleased/jramsay-38830-tarball.yml
 delete mode 100644 changelogs/unreleased/merge-request-widget-source-branch-improvements.yml
 delete mode 100644 changelogs/unreleased/move-email-footer-info-to-single-line.yml
 delete mode 100644 changelogs/unreleased/move-registry-after-cicd-project-nav-sidebar.yml
 delete mode 100644 changelogs/unreleased/optional-api-delimiter.yml
 delete mode 100644 changelogs/unreleased/osw-41401-render-mr-commit-sha-instead-diffs.yml
 delete mode 100644 changelogs/unreleased/osw-44295-adjust-authorization-for-discussions-show.yml
 delete mode 100644 changelogs/unreleased/pages_force_https.yml
 delete mode 100644 changelogs/unreleased/poc-upload-hashing-path.yml
 delete mode 100644 changelogs/unreleased/reduce-query-count-for-mergerequestscontroller-show.yml
 delete mode 100644 changelogs/unreleased/refactor-move-assignee-title-vue-component.yml
 delete mode 100644 changelogs/unreleased/refactor-move-mr-widget-memory-usage-and-graph-components.yml
 delete mode 100644 changelogs/unreleased/refactor-move-mr-widget-nothing-to-merge-vue-component.yml
 delete mode 100644 changelogs/unreleased/refactor-move-mr-widget-sha-mismatch-vue-component.yml
 delete mode 100644 changelogs/unreleased/refactor-move-mr-widget-unresolved-discussions-vue-component.yml
 delete mode 100644 changelogs/unreleased/refactor-move-time-tracking-comparison-pane-vue-component.yml
 delete mode 100644 changelogs/unreleased/refactor-move-time-tracking-vue-components.yml
 delete mode 100644 changelogs/unreleased/remove-pages-tar-support.yml
 delete mode 100644 changelogs/unreleased/sh-add-cleanup-rpc-gitaly.yml
 delete mode 100644 changelogs/unreleased/sh-appearance-cache-key-version.yml
 delete mode 100644 changelogs/unreleased/sh-gitlab-sidekiq-logger.yml
 delete mode 100644 changelogs/unreleased/sh-memoize-repository-empty.yml
 delete mode 100644 changelogs/unreleased/sh-move-sidekiq-exporter-logs.yml
 delete mode 100644 changelogs/unreleased/tc-re-add-read-only-banner.yml
 delete mode 100644 changelogs/unreleased/ui-mr-counter-cache.yml
 delete mode 100644 changelogs/unreleased/update-gitlab-ci-yml-services-docs.yml
 delete mode 100644 changelogs/unreleased/update-spec-import-path-for-vue-mount-component-helper.yml
 delete mode 100644 changelogs/unreleased/update-unresolved-discussions-vue-component.yml
 delete mode 100644 changelogs/unreleased/use-chronic-duration-attribute-for-project-build-timeout.yml
 delete mode 100644 changelogs/unreleased/winh-41174-projects-groups-badges-ui.yml
 delete mode 100644 changelogs/unreleased/winh-deprecate-old-modal.yml
 delete mode 100644 changelogs/unreleased/workhorse-gitaly-mandatory.yml
 delete mode 100644 changelogs/unreleased/zj-bump-gitaly.yml
 delete mode 100644 changelogs/unreleased/zj-feature-gate-remove-http-api.yml
 delete mode 100644 changelogs/unreleased/zj-opt-out-delete-refs.yml
 delete mode 100644 changelogs/unreleased/zj-opt-out-list-commits-by-oid.yml
 delete mode 100644 changelogs/unreleased/zj-remote-repo-exists.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d56c86523f5..a423e93d691 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,213 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.7.0 (2018-04-22)
+
+### Security (6 changes, 2 of them are from the community)
+
+- Fixed some SSRF vulnerabilities in services, hooks and integrations. !2337
+- Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0. !17734 (Takuya Noguchi)
+- Update rack-protection to 2.0.1. !17835 (Takuya Noguchi)
+- Adds confidential notes channel for Slack/Mattermost.
+- Fix XSS on diff view stored on filenames.
+- Fix GitLab Auth0 integration signing in the wrong user.
+
+### Fixed (65 changes, 20 of them are from the community)
+
+- File uploads in remote storage now support project renaming. !4597
+- Fixed bug in dropdown selector when selecting the same selection again. !14631 (bitsapien)
+- Fixed group deletion linked to Mattermost. !16209 (Julien Millau)
+- Create commit API and Web IDE obey LFS filters. !16718
+- Set breadcrumb for admin/runners/show. !17431 (Takuya Noguchi)
+- Enable restore rake task to handle nested storage directories. !17516 (Balasankar C)
+- Fix hover style of dropdown items in the right sidebar. !17519
+- Improve empty state for canceled job. !17646
+- Fix generated URL when listing repoitories for import. !17692
+- Use singular in the diff stats if only one line has been changed. !17697 (Jan Beckmann)
+- Long instance urls do not overflow anymore during project creation. !17717
+- Fix importing multiple assignees from GitLab export. !17718
+- Correct copy text for the promote milestone and label modals. !17726
+- Fix search results stripping last endline when parsing the results. !17777 (Jasper Maes)
+- Add read-only banner to all pages. !17798
+- Fix viewing diffs on old merge requests. !17805
+- Fix forking to subgroup via API when namespace is given by name. !17815 (Jan Beckmann)
+- Fix UI breakdown for Create merge request button. !17821 (Takuya Noguchi)
+- Unify format for nested non-task lists. !17823 (Takuya Noguchi)
+- UX re-design branch items with flexbox. !17832 (Takuya Noguchi)
+- Use porcelain commit lookup method on CI::CreatePipelineService. !17911
+- Update dashboard milestones breadcrumb link. !17933 (George Tsiolis)
+- Deleting a MR you are assigned to should decrements counter. !17951 (m b)
+- Update no repository placeholder. !17964 (George Tsiolis)
+- Drop JSON response in Project Milestone along with avoiding error. !17977 (Takuya Noguchi)
+- Fix personal access token clipboard button style. !17978 (Fabian Schneider)
+- Avoid validation errors when running the Pages domain verification service. !17992
+- Project creation will now raise an error if a service template is invalid. !18013
+- Add better LDAP connection handling. !18039
+- Fix autolinking URLs containing ampersands. !18045
+- Fix exceptions raised when migrating pipeline stages in the background. !18076
+- Always display Labels section in issuable sidebar, even when the project has no labels. !18081 (Branka Martinovic)
+- Fixed gitlab:uploads:migrate task ignoring some uploads. !18082
+- Fixed gitlab:uploads:migrate task failing for Groups' avatar. !18088
+- Increase dropdown width in pipeline graph & center action icon. !18089
+- Fix `JobsController#raw` endpoint can not read traces in database. !18101
+- Fix `gitlab-rake gitlab:two_factor:disable_for_all_users`. !18154
+- Adjust 404's for LegacyDiffNote discussion rendering. !18201
+- Work around Prometheus Helm chart name changes to fix integration. !18206 (joshlambert)
+- Prioritize weight over title when sorting charts. !18233
+- Verify that deploy token has valid access when pulling container registry image. !18260
+- Stop redirecting the page in pipeline main actions.
+- Fixed IDE button opening the wrong URL in tree list.
+- Ensure hooks run when a deploy key without a user pushes.
+- Fix 404 in group boards when moving issue between lists.
+- Display state indicator for issuable references in non-project scope (e.g. when referencing issuables from group scope).
+- Add missing port to artifact links.
+- Fix data race between ObjectStorage background_upload and Pages publishing.
+- Fixes unresolved discussions rendering the error state instead of the diff.
+- Don't show Jump to Discussion button on Issues.
+- Fix bug rendering group icons when forking.
+- Automatically cleanup stale worktrees and lock files upon a push.
+- Use the GitLab version as part of the appearances cache key.
+- Fix Firefox stealing formatting characters on issue notes.
+- Include matching branches and tags in protected branches / tags count. (Jan Beckmann)
+- Fix 500 error when a merge request from a fork has conflicts and has not yet been updated.
+- Test if remote repository exists when importing wikis.
+- Hide emoji popup after multiple spaces. (Jan Beckmann)
+- Fix relative uri when "#" is in branch name. (Jan)
+- Escape Markdown characters properly when using autocomplete.
+- Ignore project internal references in group context.
+- Fix finding wiki file when Gitaly is enabled.
+- Fix listing commit branch/tags that contain special characters.
+- Ensure internal users (ghost, support bot) get assigned a namespace.
+- Fix links to subdirectories of a directory with a plus character in its path.
+
+### Deprecated (1 change)
+
+- Remove support for legacy tar.gz pages artifacts. !18090
+
+### Changed (22 changes, 2 of them are from the community)
+
+- Add yellow favicon when `CANARY=true` to differientate canary environment. !12477
+- Use human readable value build_timeout in Project. !17386
+- Improved visual styles and consistency for commit hash and possible actions across commit lists. !17406
+- Don't create permanent redirect routes. !17521
+- Add empty repo check before running AutoDevOps pipeline. !17605
+- Update wording to specify create/manage project vs group labels in labels dropdown. !17640
+- Add tooltips to icons in lists of issues and merge requests. !17700
+- Change avatar error message to include allowed file formats. !17747 (Fabian Schneider)
+- Polish design for verifying domains. !17767
+- Move email footer info to a single line. !17916
+- Add average and maximum summary statistics to the prometheus dashboard. !17921
+- Add additional cluster usage metrics to usage ping. !17922
+- Move 'Registry' after 'CI/CD' in project navigation sidebar. !18018 (Elias Werberich)
+- Redesign application settings to match project settings. !18019
+- Allow HTTP(s) when git request is made by GitLab CI. !18021
+- Added hover background color to IDE file list rows.
+- Make project avatar in IDE consistent with the rest of GitLab.
+- Show issues of subgroups in group-level issue board.
+- Repository checksum calculation is handled by Gitaly when feature is enabled.
+- Allow viewing timings for AJAX requests in the performance bar.
+- Fixes remove source branch checkbox being visible when user cannot remove the branch.
+- Make /-/ delimiter optional for search endpoints.
+
+### Performance (24 changes, 11 of them are from the community)
+
+- Move AssigneeTitle vue component. !17397 (George Tsiolis)
+- Move TimeTrackingCollapsedState vue component. !17399 (George Tsiolis)
+- Move MemoryGraph and MemoryUsage vue components. !17533 (George Tsiolis)
+- Move UnresolvedDiscussions vue component. !17538 (George Tsiolis)
+- Move NothingToMerge vue component. !17544 (George Tsiolis)
+- Move ShaMismatch vue component. !17546 (George Tsiolis)
+- Stop caching highlighted diffs in Redis unnecessarily. !17746
+- Add i18n and update specs for ShaMismatch vue component. !17870 (George Tsiolis)
+- Update spec import path for vue mount component helper. !17880 (George Tsiolis)
+- Move TimeTrackingComparisonPane vue component. !17931 (George Tsiolis)
+- Improves the performance of projects list page. !17934
+- Remove N+1 query for Noteable association. !17956
+- Improve performance of loading issues with lots of references to merge requests. !17986
+- Reuse root_ref_hash for performance on Branches. !17998 (Takuya Noguchi)
+- Update asciidoctor-plantuml to 0.0.8. !18022 (Takuya Noguchi)
+- Cache personal projects count. !18197
+- Reduce complexity of issuable finder query. !18219
+- Reduce number of queries when viewing a merge request.
+- Free open file descriptors and libgit2 buffers in UpdatePagesService.
+- Memoize Git::Repository#has_visible_content?.
+- Require at least one filter when listing issues or merge requests on dashboard page.
+- lazy load diffs on merge request discussions.
+- Bulk deleting refs is handled by Gitaly by default.
+- ListCommitsByOid is executed by Gitaly by default.
+
+### Added (38 changes, 7 of them are from the community)
+
+- Add HTTPS-only pages. !16273 (rfwatson)
+- adds closed by informations in issue api. !17042 (haseebeqx)
+- Projects and groups badges settings UI. !17114
+- Add per-runner configured job timeout. !17221
+- Add alternate archive route for simplified packaging. !17225
+- Add support for pipeline variables expressions in only/except. !17316
+- Add object storage support for LFS objects, CI artifacts, and uploads. !17358
+- Added confirmation modal for changing username. !17405
+- Implement foreground verification of CI artifacts. !17578
+- Extend API for exporting a project with direct upload URL. !17686
+- Move ci/lint under project's namespace. !17729
+- Add Total CPU/Memory consumption metrics for Kubernetes. !17731
+- Adds the option to the project export API to override the project description and display GitLab export description once imported. !17744
+- Port direct upload of LFS artifacts from EE. !17752
+- Adds support for OmniAuth JWT provider. !17774
+- Display error message on job's tooltip if this one fails. !17782
+- Add 'Assigned Issues' and 'Assigned Merge Requests' as dashboard view choices for users. !17860 (Elias Werberich)
+- Extend API for importing a project export with overwrite support. !17883
+- Create Deploy Tokens to allow permanent access to repository and registry. !17894
+- Detect commit message trailers and link users properly to their accounts on Gitlab. !17919 (cousine)
+- Adds cancel btn to new pages domain page. !18026 (Jacopo Beschi @jacopo-beschi)
+- API: Add parameter merge_method to projects. !18031 (Jan Beckmann)
+- Introduce simpler env vars for auto devops REPLICAS and CANARY_REPLICAS #41436. !18036
+- Allow overriding params on project import through API. !18086
+- Support LFS objects when importing/exporting GitLab project archives. !18115
+- Store sha256 checksum of artifact metadata. !18149
+- Limit the number of failed logins when using LDAP for authentication. !43525
+- Allow assigning and filtering issuables by ancestor group labels.
+- Include subgroup issues when searching for group issues using the API.
+- Allow to store uploads by default on Object Storage.
+- Add slash command for moving issues. (Adam Pahlevi)
+- Render MR commit SHA instead "diffs" when viable.
+- Send @mention notifications even if a user has explicitly unsubscribed from item.
+- Add support for Sidekiq JSON logging.
+- Add Gitaly call details to performance bar.
+- Add support for patch link extension for commit links on GitLab Flavored Markdown.
+- Allow feature gates to be removed through the API.
+- Allow merge requests related to a commit to be found via API.
+
+### Other (27 changes, 11 of them are from the community)
+
+- Send notification emails when push to a merge request. !7610 (YarNayar)
+- Rename modal.vue to deprecated_modal.vue. !17438
+- Atomic generation of internal ids for issues. !17580
+- Use object ID to prevent duplicate keys Vue warning on Issue Boards page during development. !17682
+- Update foreman from 0.78.0 to 0.84.0. !17690 (Takuya Noguchi)
+- Add realtime pipeline status for adding/viewing files. !17705
+- Update documentation to reflect current minimum required versions of node and yarn. !17706
+- Update knapsack to 1.16.0. !17735 (Takuya Noguchi)
+- Update CI services documnetation. !17749
+- Added i18n support for the prometheus memory widget. !17753
+- Use specific names for filtered CI variable controller parameters. !17796
+- Apply NestingDepth (level 5) (framework/dropdowns.scss). !17820 (Takuya Noguchi)
+- Clean up selectors in framework/header.scss. !17822 (Takuya Noguchi)
+- Bump `state_machines-activerecord` to 0.5.1. !17924 (blackst0ne)
+- Increase the memory limits used in the unicorn killer. !17948
+- Replace the spinach test with an rspec analog. !17950 (blackst0ne)
+- Remove unused index from events table. !18014
+- Make all workhorse gitaly calls opt-out, take 2. !18043
+- Update brakeman 3.6.1 to 4.2.1. !18122 (Takuya Noguchi)
+- Replace the `project/issues/labels.feature` spinach test with an rspec analog. !18126 (blackst0ne)
+- Bump html-pipeline to 2.7.1. !18132 (@blackst0ne)
+- Remove test_ci rake task. !18139 (Takuya Noguchi)
+- Add documentation for Pipelines failure reasons. !18352
+- Improve JIRA event descriptions.
+- Add query counts to profiler output.
+- Move Sidekiq exporter logs to log/sidekiq_exporter.log.
+- Upgrade Gitaly to upgrade its charlock_holmes.
+
+
 ## 10.6.4 (2018-04-09)
 
 ### Fixed (8 changes, 1 of them is from the community)
diff --git a/changelogs/unreleased/17516-nested-restore-changelog.yml b/changelogs/unreleased/17516-nested-restore-changelog.yml
deleted file mode 100644
index 89753f45457..00000000000
--- a/changelogs/unreleased/17516-nested-restore-changelog.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable restore rake task to handle nested storage directories
-merge_request: 17516
-author: Balasankar C
-type: fixed
diff --git a/changelogs/unreleased/17939-osw-patch-support-gfm.yml b/changelogs/unreleased/17939-osw-patch-support-gfm.yml
deleted file mode 100644
index 576581e25d6..00000000000
--- a/changelogs/unreleased/17939-osw-patch-support-gfm.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for patch link extension for commit links on GitLab Flavored Markdown
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/20394-protected-branches-wildcard.yml b/changelogs/unreleased/20394-protected-branches-wildcard.yml
deleted file mode 100644
index 3fa8ee4f69f..00000000000
--- a/changelogs/unreleased/20394-protected-branches-wildcard.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include matching branches and tags in protected branches / tags count
-merge_request:
-author: Jan Beckmann
-type: fixed
diff --git a/changelogs/unreleased/23460-send-email-when-pushing-more-commits-to-the-merge-request.yml b/changelogs/unreleased/23460-send-email-when-pushing-more-commits-to-the-merge-request.yml
deleted file mode 100644
index a62137ea2c9..00000000000
--- a/changelogs/unreleased/23460-send-email-when-pushing-more-commits-to-the-merge-request.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Send notification emails when push to a merge request
-merge_request: 7610
-author: YarNayar
-type: feature
diff --git a/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml b/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml
deleted file mode 100644
index d96f7e54c8d..00000000000
--- a/changelogs/unreleased/27210-add-cancel-btn-to-new-page-domain.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adds cancel btn to new pages domain page
-merge_request: 18026
-author: Jacopo Beschi @jacopo-beschi
-type: added
diff --git a/changelogs/unreleased/31114-internal-ids-are-not-atomic.yml b/changelogs/unreleased/31114-internal-ids-are-not-atomic.yml
deleted file mode 100644
index bc1955bc66f..00000000000
--- a/changelogs/unreleased/31114-internal-ids-are-not-atomic.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Atomic generation of internal ids for issues.
-merge_request: 17580
-author:
-type: other
diff --git a/changelogs/unreleased/31591-project-deploy-tokens-to-allow-permanent-access.yml b/changelogs/unreleased/31591-project-deploy-tokens-to-allow-permanent-access.yml
deleted file mode 100644
index 5546d26d0fb..00000000000
--- a/changelogs/unreleased/31591-project-deploy-tokens-to-allow-permanent-access.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Create Deploy Tokens to allow permanent access to repository and registry
-merge_request: 17894
-author:
-type: added
diff --git a/changelogs/unreleased/33803-drop-json-support-in-project-milestone.yml b/changelogs/unreleased/33803-drop-json-support-in-project-milestone.yml
deleted file mode 100644
index 0382ede4565..00000000000
--- a/changelogs/unreleased/33803-drop-json-support-in-project-milestone.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Drop JSON response in Project Milestone along with avoiding error
-merge_request: 17977
-author: Takuya Noguchi
-type: fixed
diff --git a/changelogs/unreleased/34604-fix-generated-url-for-external-repository.yml b/changelogs/unreleased/34604-fix-generated-url-for-external-repository.yml
deleted file mode 100644
index c4b5f59b724..00000000000
--- a/changelogs/unreleased/34604-fix-generated-url-for-external-repository.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix generated URL when listing repoitories for import
-merge_request: 17692
-author:
-type: fixed
diff --git a/changelogs/unreleased/35475-lazy-diff.yml b/changelogs/unreleased/35475-lazy-diff.yml
deleted file mode 100644
index bafa66ebe39..00000000000
--- a/changelogs/unreleased/35475-lazy-diff.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: lazy load diffs on merge request discussions
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/38167-ui-bug-when-creating-new-branch.yml b/changelogs/unreleased/38167-ui-bug-when-creating-new-branch.yml
deleted file mode 100644
index cec06bf2dfe..00000000000
--- a/changelogs/unreleased/38167-ui-bug-when-creating-new-branch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed bug in dropdown selector when selecting the same selection again
-merge_request: 14631
-author: bitsapien
-type: fixed
diff --git a/changelogs/unreleased/39584-nesting-depth-5-framework-dropdowns.yml b/changelogs/unreleased/39584-nesting-depth-5-framework-dropdowns.yml
deleted file mode 100644
index 30a8dc63983..00000000000
--- a/changelogs/unreleased/39584-nesting-depth-5-framework-dropdowns.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Apply NestingDepth (level 5) (framework/dropdowns.scss)
-merge_request: 17820
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/39880-merge-method-api.yml b/changelogs/unreleased/39880-merge-method-api.yml
deleted file mode 100644
index dd44a752c4f..00000000000
--- a/changelogs/unreleased/39880-merge-method-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'API: Add parameter merge_method to projects'
-merge_request: 18031
-author: Jan Beckmann
-type: added
diff --git a/changelogs/unreleased/40781-os-to-ce.yml b/changelogs/unreleased/40781-os-to-ce.yml
deleted file mode 100644
index 4a364292c60..00000000000
--- a/changelogs/unreleased/40781-os-to-ce.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add object storage support for LFS objects, CI artifacts, and uploads.
-merge_request: 17358
-author:
-type: added
diff --git a/changelogs/unreleased/41224-pipeline-icons.yml b/changelogs/unreleased/41224-pipeline-icons.yml
deleted file mode 100644
index 3fe05448d1c..00000000000
--- a/changelogs/unreleased/41224-pipeline-icons.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Increase dropdown width in pipeline graph & center action icon
-merge_request: 18089
-author:
-type: fixed
diff --git a/changelogs/unreleased/41436-use-simpler-env-vars-for-auto-devops-replicas.yml b/changelogs/unreleased/41436-use-simpler-env-vars-for-auto-devops-replicas.yml
deleted file mode 100644
index ea007670332..00000000000
--- a/changelogs/unreleased/41436-use-simpler-env-vars-for-auto-devops-replicas.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Introduce simpler env vars for auto devops REPLICAS and CANARY_REPLICAS #41436'
-merge_request: 18036
-author:
-type: added
diff --git a/changelogs/unreleased/41758-after-changing-username-url-still-redirects-to-old-route.yml b/changelogs/unreleased/41758-after-changing-username-url-still-redirects-to-old-route.yml
deleted file mode 100644
index 36e79ea1ed4..00000000000
--- a/changelogs/unreleased/41758-after-changing-username-url-still-redirects-to-old-route.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added confirmation modal for changing username
-merge_request: 17405
-author:
-type: added
diff --git a/changelogs/unreleased/41902-add-api-option-to-overwrite-project-description-on-project-export.yml b/changelogs/unreleased/41902-add-api-option-to-overwrite-project-description-on-project-export.yml
deleted file mode 100644
index 60a649f22c9..00000000000
--- a/changelogs/unreleased/41902-add-api-option-to-overwrite-project-description-on-project-export.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adds the option to the project export API to override the project description and display GitLab export description once imported
-merge_request: 17744
-author:
-type: added
diff --git a/changelogs/unreleased/41967_issue_api_closed_by_info.yml b/changelogs/unreleased/41967_issue_api_closed_by_info.yml
deleted file mode 100644
index 436574c3638..00000000000
--- a/changelogs/unreleased/41967_issue_api_closed_by_info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: adds closed by informations in issue api
-merge_request: 17042
-author: haseebeqx
-type: added
diff --git a/changelogs/unreleased/42028-xss-diffs.yml b/changelogs/unreleased/42028-xss-diffs.yml
deleted file mode 100644
index a05f9d3c78d..00000000000
--- a/changelogs/unreleased/42028-xss-diffs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix XSS on diff view stored on filenames
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/42037-long-instance-names-group-names-covers-namespace-dropdown.yml b/changelogs/unreleased/42037-long-instance-names-group-names-covers-namespace-dropdown.yml
deleted file mode 100644
index f7758734a6f..00000000000
--- a/changelogs/unreleased/42037-long-instance-names-group-names-covers-namespace-dropdown.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Long instance urls do not overflow anymore during project creation
-merge_request: 17717
-author:
-type: fixed
diff --git a/changelogs/unreleased/42448-change-commit-row-actions-and-sha-design-for-project-commit-list.yml b/changelogs/unreleased/42448-change-commit-row-actions-and-sha-design-for-project-commit-list.yml
deleted file mode 100644
index 77d1ebf69df..00000000000
--- a/changelogs/unreleased/42448-change-commit-row-actions-and-sha-design-for-project-commit-list.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Improved visual styles and consistency for commit hash and possible actions
-  across commit lists
-merge_request: 17406
-author:
-type: changed
diff --git a/changelogs/unreleased/42568-pipeline-empty-state.yml b/changelogs/unreleased/42568-pipeline-empty-state.yml
deleted file mode 100644
index d36edcf1b37..00000000000
--- a/changelogs/unreleased/42568-pipeline-empty-state.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve empty state for canceled job
-merge_request: 17646
-author:
-type: fixed
diff --git a/changelogs/unreleased/42579-fix-sidebar-dropdown-hover-style.yml b/changelogs/unreleased/42579-fix-sidebar-dropdown-hover-style.yml
deleted file mode 100644
index c0a247dc895..00000000000
--- a/changelogs/unreleased/42579-fix-sidebar-dropdown-hover-style.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix hover style of dropdown items in the right sidebar
-merge_request: 17519
-author:
-type: fixed
diff --git a/changelogs/unreleased/42880-loss-of-input-text-on-comments-after-preview.yml b/changelogs/unreleased/42880-loss-of-input-text-on-comments-after-preview.yml
deleted file mode 100644
index 0e892a51bc5..00000000000
--- a/changelogs/unreleased/42880-loss-of-input-text-on-comments-after-preview.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Firefox stealing formatting characters on issue notes
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries.yml b/changelogs/unreleased/43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries.yml
deleted file mode 100644
index 686258460e0..00000000000
--- a/changelogs/unreleased/43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve performance of loading issues with lots of references to merge requests
-merge_request: 17986
-author:
-type: performance
diff --git a/changelogs/unreleased/43215-update-design-for-verifying-domains.yml b/changelogs/unreleased/43215-update-design-for-verifying-domains.yml
deleted file mode 100644
index 8326540f7b2..00000000000
--- a/changelogs/unreleased/43215-update-design-for-verifying-domains.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Polish design for verifying domains
-merge_request: 17767
-author:
-type: changed
diff --git a/changelogs/unreleased/43246-checkfilter.yml b/changelogs/unreleased/43246-checkfilter.yml
deleted file mode 100644
index e6c0e716213..00000000000
--- a/changelogs/unreleased/43246-checkfilter.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Require at least one filter when listing issues or merge requests on dashboard
-  page
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name.yml b/changelogs/unreleased/43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name.yml
deleted file mode 100644
index de1cee6e436..00000000000
--- a/changelogs/unreleased/43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use specific names for filtered CI variable controller parameters
-merge_request: 17796
-author:
-type: other
diff --git a/changelogs/unreleased/43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information.yml b/changelogs/unreleased/43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information.yml
deleted file mode 100644
index 889fd008bad..00000000000
--- a/changelogs/unreleased/43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add empty repo check before running AutoDevOps pipeline
-merge_request: 17605
-author:
-type: changed
diff --git a/changelogs/unreleased/43512-add-support-for-omniauth-jwt-provider.yml b/changelogs/unreleased/43512-add-support-for-omniauth-jwt-provider.yml
deleted file mode 100644
index 039d3de7168..00000000000
--- a/changelogs/unreleased/43512-add-support-for-omniauth-jwt-provider.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adds support for OmniAuth JWT provider
-merge_request: 17774
-author:
-type: added
diff --git a/changelogs/unreleased/43525-limit-number-of-failed-logins-using-ldap.yml b/changelogs/unreleased/43525-limit-number-of-failed-logins-using-ldap.yml
deleted file mode 100644
index f30fea3c4a7..00000000000
--- a/changelogs/unreleased/43525-limit-number-of-failed-logins-using-ldap.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Limit the number of failed logins when using LDAP for authentication
-merge_request: 43525
-author:
-type: added
diff --git a/changelogs/unreleased/43552-user-owned-projects-query-performance-improvement.yml b/changelogs/unreleased/43552-user-owned-projects-query-performance-improvement.yml
deleted file mode 100644
index 39f92c281ad..00000000000
--- a/changelogs/unreleased/43552-user-owned-projects-query-performance-improvement.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improves the performance of projects list page
-merge_request: 17934
-author:
-type: performance
diff --git a/changelogs/unreleased/43603-ci-lint-support.yml b/changelogs/unreleased/43603-ci-lint-support.yml
deleted file mode 100644
index 8e4a92c0287..00000000000
--- a/changelogs/unreleased/43603-ci-lint-support.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move ci/lint under project's namespace
-merge_request: 17729
-author:
-type: added
diff --git a/changelogs/unreleased/43702-update-label-dropdown-wording.yml b/changelogs/unreleased/43702-update-label-dropdown-wording.yml
deleted file mode 100644
index 97100ec89de..00000000000
--- a/changelogs/unreleased/43702-update-label-dropdown-wording.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update wording to specify create/manage project vs group labels in labels dropdown
-merge_request: 17640
-author:
-type: changed
diff --git a/changelogs/unreleased/43717-breadcrumb-on-admin-runner-page.yml b/changelogs/unreleased/43717-breadcrumb-on-admin-runner-page.yml
deleted file mode 100644
index 3aec71d5ac4..00000000000
--- a/changelogs/unreleased/43717-breadcrumb-on-admin-runner-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Set breadcrumb for admin/runners/show
-merge_request: 17431
-author: Takuya Noguchi
-type: fixed
diff --git a/changelogs/unreleased/43720-update-fe-webpack-docs.yml b/changelogs/unreleased/43720-update-fe-webpack-docs.yml
deleted file mode 100644
index 9e461eaaec8..00000000000
--- a/changelogs/unreleased/43720-update-fe-webpack-docs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Update documentation to reflect current minimum required versions of node and
-  yarn
-merge_request: 17706
-author:
-type: other
diff --git a/changelogs/unreleased/43745-store-metadata-checksum-for-artifacts.yml b/changelogs/unreleased/43745-store-metadata-checksum-for-artifacts.yml
deleted file mode 100644
index 6283e797930..00000000000
--- a/changelogs/unreleased/43745-store-metadata-checksum-for-artifacts.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Store sha256 checksum of artifact metadata
-merge_request: 18149
-author:
-type: added
diff --git a/changelogs/unreleased/43771-improve-avatar-error-message.yml b/changelogs/unreleased/43771-improve-avatar-error-message.yml
deleted file mode 100644
index 1fae10f4d1f..00000000000
--- a/changelogs/unreleased/43771-improve-avatar-error-message.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change avatar error message to include allowed file formats
-merge_request: 17747
-author: Fabian Schneider
-type: changed
diff --git a/changelogs/unreleased/43786-on-the-issuable-list-add-tooltips-to-icons.yml b/changelogs/unreleased/43786-on-the-issuable-list-add-tooltips-to-icons.yml
deleted file mode 100644
index 19b633daace..00000000000
--- a/changelogs/unreleased/43786-on-the-issuable-list-add-tooltips-to-icons.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add tooltips to icons in lists of issues and merge requests
-merge_request: 17700
-author:
-type: changed
diff --git a/changelogs/unreleased/43805-list-gitaly-calls-and-arguments-in-the-performance-bar.yml b/changelogs/unreleased/43805-list-gitaly-calls-and-arguments-in-the-performance-bar.yml
deleted file mode 100644
index 4c63e69f0bb..00000000000
--- a/changelogs/unreleased/43805-list-gitaly-calls-and-arguments-in-the-performance-bar.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Gitaly call details to performance bar
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/43806-update-ruby-saml-to-1-7-2.yml b/changelogs/unreleased/43806-update-ruby-saml-to-1-7-2.yml
deleted file mode 100644
index 7335d313510..00000000000
--- a/changelogs/unreleased/43806-update-ruby-saml-to-1-7-2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0
-merge_request: 17734
-author: Takuya Noguchi
-type: security
diff --git a/changelogs/unreleased/43933-always-notify-mentions.yml b/changelogs/unreleased/43933-always-notify-mentions.yml
deleted file mode 100644
index 7b494d38541..00000000000
--- a/changelogs/unreleased/43933-always-notify-mentions.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Send @mention notifications even if a user has explicitly unsubscribed from
-  item
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/43949-verify-job-artifacts.yml b/changelogs/unreleased/43949-verify-job-artifacts.yml
deleted file mode 100644
index 45e1916ae17..00000000000
--- a/changelogs/unreleased/43949-verify-job-artifacts.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Implement foreground verification of CI artifacts
-merge_request: 17578
-author:
-type: added
diff --git a/changelogs/unreleased/43976-fix-access-token-clipboard-button-style.yml b/changelogs/unreleased/43976-fix-access-token-clipboard-button-style.yml
deleted file mode 100644
index b341d5dfa7f..00000000000
--- a/changelogs/unreleased/43976-fix-access-token-clipboard-button-style.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix personal access token clipboard button style
-merge_request: 17978
-author: Fabian Schneider
-type: fixed
diff --git a/changelogs/unreleased/44022-singular-1-diff.yml b/changelogs/unreleased/44022-singular-1-diff.yml
deleted file mode 100644
index f4942925a73..00000000000
--- a/changelogs/unreleased/44022-singular-1-diff.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use singular in the diff stats if only one line has been changed
-merge_request: 17697
-author: Jan Beckmann
-type: fixed
diff --git a/changelogs/unreleased/44139-fix-issue-boards-dup-keys.yml b/changelogs/unreleased/44139-fix-issue-boards-dup-keys.yml
deleted file mode 100644
index dd5f2f06d6c..00000000000
--- a/changelogs/unreleased/44139-fix-issue-boards-dup-keys.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Use object ID to prevent duplicate keys Vue warning on Issue Boards page during
-  development
-merge_request: 17682
-author:
-type: other
diff --git a/changelogs/unreleased/44160-update-foreman-to-0-84-0.yml b/changelogs/unreleased/44160-update-foreman-to-0-84-0.yml
deleted file mode 100644
index 990d188eb78..00000000000
--- a/changelogs/unreleased/44160-update-foreman-to-0-84-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update foreman from 0.78.0 to 0.84.0
-merge_request: 17690
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/44191-reduce-redis-usage-from-merge-request-diffs-caching.yml b/changelogs/unreleased/44191-reduce-redis-usage-from-merge-request-diffs-caching.yml
deleted file mode 100644
index 8fdca6eec83..00000000000
--- a/changelogs/unreleased/44191-reduce-redis-usage-from-merge-request-diffs-caching.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Stop caching highlighted diffs in Redis unnecessarily
-merge_request: 17746
-author:
-type: performance
diff --git a/changelogs/unreleased/44218-add-internationalization-support-for-the-prometheus-merge-request-widget.yml b/changelogs/unreleased/44218-add-internationalization-support-for-the-prometheus-merge-request-widget.yml
deleted file mode 100644
index 12c73281998..00000000000
--- a/changelogs/unreleased/44218-add-internationalization-support-for-the-prometheus-merge-request-widget.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added i18n support for the prometheus memory widget
-merge_request: 17753
-author:
-type: other
diff --git a/changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml b/changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml
deleted file mode 100644
index 265d36b763f..00000000000
--- a/changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update knapsack to 1.16.0
-merge_request: 17735
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary.yml b/changelogs/unreleased/44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary.yml
deleted file mode 100644
index 934860b95fe..00000000000
--- a/changelogs/unreleased/44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix viewing diffs on old merge requests
-merge_request: 17805
-author:
-type: fixed
diff --git a/changelogs/unreleased/44269-show-failure-reason-on-upgrade-tooltip-of-jobs.yml b/changelogs/unreleased/44269-show-failure-reason-on-upgrade-tooltip-of-jobs.yml
deleted file mode 100644
index b3ae8ca7340..00000000000
--- a/changelogs/unreleased/44269-show-failure-reason-on-upgrade-tooltip-of-jobs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Display error message on job's tooltip if this one fails
-merge_request: 17782
-author:
-type: added
diff --git a/changelogs/unreleased/44280-fix-code-search.yml b/changelogs/unreleased/44280-fix-code-search.yml
deleted file mode 100644
index 07f3abb224c..00000000000
--- a/changelogs/unreleased/44280-fix-code-search.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix search results stripping last endline when parsing the results
-merge_request: 17777
-author: Jasper Maes
-type: fixed
diff --git a/changelogs/unreleased/44291-usage-ping-for-kubernetes-integration.yml b/changelogs/unreleased/44291-usage-ping-for-kubernetes-integration.yml
deleted file mode 100644
index b5c12d8f40e..00000000000
--- a/changelogs/unreleased/44291-usage-ping-for-kubernetes-integration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add additional cluster usage metrics to usage ping.
-merge_request: 17922
-author:
-type: changed
diff --git a/changelogs/unreleased/44382-ui-breakdown-for-create-merge-request.yml b/changelogs/unreleased/44382-ui-breakdown-for-create-merge-request.yml
deleted file mode 100644
index dd8c0b19d5f..00000000000
--- a/changelogs/unreleased/44382-ui-breakdown-for-create-merge-request.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix UI breakdown for Create merge request button
-merge_request: 17821
-author: Takuya Noguchi
-type: fixed
diff --git a/changelogs/unreleased/44383-cleanup-framework-header.yml b/changelogs/unreleased/44383-cleanup-framework-header.yml
deleted file mode 100644
index ef9be9f48de..00000000000
--- a/changelogs/unreleased/44383-cleanup-framework-header.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Clean up selectors in framework/header.scss
-merge_request: 17822
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/44384-cleanup-css-for-nested-lists.yml b/changelogs/unreleased/44384-cleanup-css-for-nested-lists.yml
deleted file mode 100644
index 79c470ea4e1..00000000000
--- a/changelogs/unreleased/44384-cleanup-css-for-nested-lists.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Unify format for nested non-task lists
-merge_request: 17823
-author: Takuya Noguchi
-type: fixed
diff --git a/changelogs/unreleased/44386-better-ux-for-long-name-branches.yml b/changelogs/unreleased/44386-better-ux-for-long-name-branches.yml
deleted file mode 100644
index 16712486f0f..00000000000
--- a/changelogs/unreleased/44386-better-ux-for-long-name-branches.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: UX re-design branch items with flexbox
-merge_request: 17832
-author: Takuya Noguchi
-type: fixed
diff --git a/changelogs/unreleased/44388-update-rack-protection-to-2-0-1.yml b/changelogs/unreleased/44388-update-rack-protection-to-2-0-1.yml
deleted file mode 100644
index c21d02d4d87..00000000000
--- a/changelogs/unreleased/44388-update-rack-protection-to-2-0-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update rack-protection to 2.0.1
-merge_request: 17835
-author: Takuya Noguchi
-type: security
diff --git a/changelogs/unreleased/44389-always-allow-http-for-ci-git-operations.yml b/changelogs/unreleased/44389-always-allow-http-for-ci-git-operations.yml
deleted file mode 100644
index 2e5a0302ee6..00000000000
--- a/changelogs/unreleased/44389-always-allow-http-for-ci-git-operations.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow HTTP(s) when git request is made by GitLab CI
-merge_request: 18021
-author:
-type: changed
diff --git a/changelogs/unreleased/44392-resolve-projects-creation-silently-failing-on-after-create-error.yml b/changelogs/unreleased/44392-resolve-projects-creation-silently-failing-on-after-create-error.yml
deleted file mode 100644
index 3bbd5a05b98..00000000000
--- a/changelogs/unreleased/44392-resolve-projects-creation-silently-failing-on-after-create-error.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Project creation will now raise an error if a service template is invalid
-merge_request: 18013
-author:
-type: fixed
diff --git a/changelogs/unreleased/44425-use-gitlab_environment.yml b/changelogs/unreleased/44425-use-gitlab_environment.yml
deleted file mode 100644
index a774143d5f5..00000000000
--- a/changelogs/unreleased/44425-use-gitlab_environment.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix `gitlab-rake gitlab:two_factor:disable_for_all_users`
-merge_request: 18154
-author:
-type: fixed
diff --git a/changelogs/unreleased/44508-fix-fork-namespace-images.yml b/changelogs/unreleased/44508-fix-fork-namespace-images.yml
deleted file mode 100644
index 63b4b9a5e56..00000000000
--- a/changelogs/unreleased/44508-fix-fork-namespace-images.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix bug rendering group icons when forking
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/44657-reuse-root_ref_hash-on-branches.yml b/changelogs/unreleased/44657-reuse-root_ref_hash-on-branches.yml
deleted file mode 100644
index 4f21aadd86b..00000000000
--- a/changelogs/unreleased/44657-reuse-root_ref_hash-on-branches.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reuse root_ref_hash for performance on Branches
-merge_request: 17998
-author: Takuya Noguchi
-type: performance
diff --git a/changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml b/changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml
deleted file mode 100644
index 4166d4fe320..00000000000
--- a/changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix `JobsController#raw` endpoint can not read traces in database
-merge_request: 18101
-author:
-type: fixed
diff --git a/changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml b/changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml
deleted file mode 100644
index bdfed89d2ea..00000000000
--- a/changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update asciidoctor-plantuml to 0.0.8
-merge_request: 18022
-author: Takuya Noguchi
-type: performance
diff --git a/changelogs/unreleased/44774-migrate-upload-task-fails-for-upload-with-store-nil.yml b/changelogs/unreleased/44774-migrate-upload-task-fails-for-upload-with-store-nil.yml
deleted file mode 100644
index 372f4293964..00000000000
--- a/changelogs/unreleased/44774-migrate-upload-task-fails-for-upload-with-store-nil.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed gitlab:uploads:migrate task ignoring some uploads.
-merge_request: 18082
-author:
-type: fixed
diff --git a/changelogs/unreleased/44776-fix-upload-migrate-fails-for-group.yml b/changelogs/unreleased/44776-fix-upload-migrate-fails-for-group.yml
deleted file mode 100644
index 6094fcd0b3e..00000000000
--- a/changelogs/unreleased/44776-fix-upload-migrate-fails-for-group.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed gitlab:uploads:migrate task failing for Groups' avatar.
-merge_request: 18088
-author:
-type: fixed
diff --git a/changelogs/unreleased/44878-update-brakeman-3-6-1-to-4-2-1.yml b/changelogs/unreleased/44878-update-brakeman-3-6-1-to-4-2-1.yml
deleted file mode 100644
index f5710cf4f7f..00000000000
--- a/changelogs/unreleased/44878-update-brakeman-3-6-1-to-4-2-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update brakeman 3.6.1 to 4.2.1
-merge_request: 18122
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/44902-remove-rake-test-ci.yml b/changelogs/unreleased/44902-remove-rake-test-ci.yml
deleted file mode 100644
index 459de1c2ca3..00000000000
--- a/changelogs/unreleased/44902-remove-rake-test-ci.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove test_ci rake task
-merge_request: 18139
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/45271-collpased-diff-loading.yml b/changelogs/unreleased/45271-collpased-diff-loading.yml
deleted file mode 100644
index fdd13a82a4c..00000000000
--- a/changelogs/unreleased/45271-collpased-diff-loading.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixes unresolved discussions rendering the error state instead of the diff
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/Link_to_project_labels_page.yml b/changelogs/unreleased/Link_to_project_labels_page.yml
deleted file mode 100644
index 7bdeec423fc..00000000000
--- a/changelogs/unreleased/Link_to_project_labels_page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Always display Labels section in issuable sidebar, even when the project has no labels
-merge_request: 18081
-author: Branka Martinovic
-type: fixed
diff --git a/changelogs/unreleased/ab-37125-assigned-issues-query.yml b/changelogs/unreleased/ab-37125-assigned-issues-query.yml
deleted file mode 100644
index 5d4aad08764..00000000000
--- a/changelogs/unreleased/ab-37125-assigned-issues-query.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reduce complexity of issuable finder query.
-merge_request: 18219
-author:
-type: performance
diff --git a/changelogs/unreleased/ab-37462-cache-personal-projects-count.yml b/changelogs/unreleased/ab-37462-cache-personal-projects-count.yml
deleted file mode 100644
index 55069b1f2d2..00000000000
--- a/changelogs/unreleased/ab-37462-cache-personal-projects-count.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Cache personal projects count.
-merge_request: 18197
-author:
-type: performance
diff --git a/changelogs/unreleased/ab-43150-users-controller-show-query-limit.yml b/changelogs/unreleased/ab-43150-users-controller-show-query-limit.yml
deleted file mode 100644
index 502c1176d2d..00000000000
--- a/changelogs/unreleased/ab-43150-users-controller-show-query-limit.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove N+1 query for Noteable association.
-merge_request: 17956
-author:
-type: performance
diff --git a/changelogs/unreleased/ab-44467-remove-index.yml b/changelogs/unreleased/ab-44467-remove-index.yml
deleted file mode 100644
index fb772ce85d5..00000000000
--- a/changelogs/unreleased/ab-44467-remove-index.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unused index from events table.
-merge_request: 18014
-author:
-type: other
diff --git a/changelogs/unreleased/ac-fix-use_file-race.yml b/changelogs/unreleased/ac-fix-use_file-race.yml
deleted file mode 100644
index f1315d5d50e..00000000000
--- a/changelogs/unreleased/ac-fix-use_file-race.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix data race between ObjectStorage background_upload and Pages publishing
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/ac-lfs-direct-upload-ee-to-ce.yml b/changelogs/unreleased/ac-lfs-direct-upload-ee-to-ce.yml
deleted file mode 100644
index 4db7f76e0af..00000000000
--- a/changelogs/unreleased/ac-lfs-direct-upload-ee-to-ce.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Port direct upload of LFS artifacts from EE
-merge_request: 17752
-author:
-type: added
diff --git a/changelogs/unreleased/ac-pages-port.yml b/changelogs/unreleased/ac-pages-port.yml
deleted file mode 100644
index 4f7257b4798..00000000000
--- a/changelogs/unreleased/ac-pages-port.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add missing port to artifact links
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/adamco-gitlab-ce-move-issue-command.yml b/changelogs/unreleased/adamco-gitlab-ce-move-issue-command.yml
deleted file mode 100644
index 3b057373e7d..00000000000
--- a/changelogs/unreleased/adamco-gitlab-ce-move-issue-command.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add slash command for moving issues
-merge_request:
-author: Adam Pahlevi
-type: added
diff --git a/changelogs/unreleased/add-canary-favicon.yml b/changelogs/unreleased/add-canary-favicon.yml
deleted file mode 100644
index 1af6572588d..00000000000
--- a/changelogs/unreleased/add-canary-favicon.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add yellow favicon when `CANARY=true` to differientate canary environment
-merge_request: 12477
-author:
-type: changed
diff --git a/changelogs/unreleased/add-cpu-mem-totals.yml b/changelogs/unreleased/add-cpu-mem-totals.yml
deleted file mode 100644
index bc8babab731..00000000000
--- a/changelogs/unreleased/add-cpu-mem-totals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Total CPU/Memory consumption metrics for Kubernetes
-merge_request: 17731
-author:
-type: added
diff --git a/changelogs/unreleased/add-milestone-path-to-dashboard-milestones-breadcrumb-link.yml b/changelogs/unreleased/add-milestone-path-to-dashboard-milestones-breadcrumb-link.yml
deleted file mode 100644
index 015bee99170..00000000000
--- a/changelogs/unreleased/add-milestone-path-to-dashboard-milestones-breadcrumb-link.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update dashboard milestones breadcrumb link
-merge_request: 17933
-author: George Tsiolis
-type: fixed
diff --git a/changelogs/unreleased/add-per-runner-job-timeout.yml b/changelogs/unreleased/add-per-runner-job-timeout.yml
deleted file mode 100644
index 336b4d15ddf..00000000000
--- a/changelogs/unreleased/add-per-runner-job-timeout.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add per-runner configured job timeout
-merge_request: 17221
-author:
-type: added
diff --git a/changelogs/unreleased/add-query-counts-to-profiler-output.yml b/changelogs/unreleased/add-query-counts-to-profiler-output.yml
deleted file mode 100644
index 8a90b1cbeb0..00000000000
--- a/changelogs/unreleased/add-query-counts-to-profiler-output.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add query counts to profiler output
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/ajax-requests-in-performance-bar.yml b/changelogs/unreleased/ajax-requests-in-performance-bar.yml
deleted file mode 100644
index 88cc3678c2b..00000000000
--- a/changelogs/unreleased/ajax-requests-in-performance-bar.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow viewing timings for AJAX requests in the performance bar
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/blackst0ne-bump-html-pipeline-gem.yml b/changelogs/unreleased/blackst0ne-bump-html-pipeline-gem.yml
deleted file mode 100644
index 9885c8853cc..00000000000
--- a/changelogs/unreleased/blackst0ne-bump-html-pipeline-gem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump html-pipeline to 2.7.1
-merge_request: 18132
-author: "@blackst0ne"
-type: other
diff --git a/changelogs/unreleased/blackst0ne-rails5-update-state_machines-activerecord-gem.yml b/changelogs/unreleased/blackst0ne-rails5-update-state_machines-activerecord-gem.yml
deleted file mode 100644
index a9c6fcbf428..00000000000
--- a/changelogs/unreleased/blackst0ne-rails5-update-state_machines-activerecord-gem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump `state_machines-activerecord` to 0.5.1
-merge_request: 17924
-author: blackst0ne
-type: other
diff --git a/changelogs/unreleased/blackst0ne-replace-spinach-project-issues-issues-feature.yml b/changelogs/unreleased/blackst0ne-replace-spinach-project-issues-issues-feature.yml
deleted file mode 100644
index 7defdc0a28f..00000000000
--- a/changelogs/unreleased/blackst0ne-replace-spinach-project-issues-issues-feature.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Replace the spinach test with an rspec analog
-merge_request: 17950
-author: blackst0ne
-type: other
diff --git a/changelogs/unreleased/blackst0ne-replace-spinach-project-issues-labels-feature.yml b/changelogs/unreleased/blackst0ne-replace-spinach-project-issues-labels-feature.yml
deleted file mode 100644
index 4e1bb15f150..00000000000
--- a/changelogs/unreleased/blackst0ne-replace-spinach-project-issues-labels-feature.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Replace the `project/issues/labels.feature` spinach test with an rspec analog
-merge_request: 18126
-author: blackst0ne
-type: other
diff --git a/changelogs/unreleased/bvl-export-import-lfs.yml b/changelogs/unreleased/bvl-export-import-lfs.yml
deleted file mode 100644
index dd1f499c3a3..00000000000
--- a/changelogs/unreleased/bvl-export-import-lfs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Support LFS objects when importing/exporting GitLab project archives
-merge_request: 18115
-author:
-type: added
diff --git a/changelogs/unreleased/bvl-import-zip-multiple-assignees.yml b/changelogs/unreleased/bvl-import-zip-multiple-assignees.yml
deleted file mode 100644
index 86bd5faf8ed..00000000000
--- a/changelogs/unreleased/bvl-import-zip-multiple-assignees.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix importing multiple assignees from GitLab export
-merge_request: 17718
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-no-permanent-redirect.yml b/changelogs/unreleased/bvl-no-permanent-redirect.yml
deleted file mode 100644
index c34a3789b58..00000000000
--- a/changelogs/unreleased/bvl-no-permanent-redirect.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Don't create permanent redirect routes
-merge_request: 17521
-author:
-type: changed
diff --git a/changelogs/unreleased/bvl-override-import-params.yml b/changelogs/unreleased/bvl-override-import-params.yml
deleted file mode 100644
index 18cfef873df..00000000000
--- a/changelogs/unreleased/bvl-override-import-params.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow overriding params on project import through API
-merge_request: 18086
-author:
-type: added
diff --git a/changelogs/unreleased/ci-pipeline-commit-lookup.yml b/changelogs/unreleased/ci-pipeline-commit-lookup.yml
deleted file mode 100644
index b2a1e4c2163..00000000000
--- a/changelogs/unreleased/ci-pipeline-commit-lookup.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use porcelain commit lookup method on CI::CreatePipelineService
-merge_request: 17911
-author:
-type: fixed
diff --git a/changelogs/unreleased/da-gitaly-calculate-repository-checksum.yml b/changelogs/unreleased/da-gitaly-calculate-repository-checksum.yml
deleted file mode 100644
index de09f87a7c9..00000000000
--- a/changelogs/unreleased/da-gitaly-calculate-repository-checksum.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Repository checksum calculation is handled by Gitaly when feature is enabled
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/dashboard-view-user-choices-issues-merge-requests.yml b/changelogs/unreleased/dashboard-view-user-choices-issues-merge-requests.yml
deleted file mode 100644
index 92a03070d78..00000000000
--- a/changelogs/unreleased/dashboard-view-user-choices-issues-merge-requests.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add 'Assigned Issues' and 'Assigned Merge Requests' as dashboard view choices for users
-merge_request: 17860
-author: Elias Werberich
-type: added
diff --git a/changelogs/unreleased/deploy-tokens-container-registry-specs.yml b/changelogs/unreleased/deploy-tokens-container-registry-specs.yml
deleted file mode 100644
index d86f955c966..00000000000
--- a/changelogs/unreleased/deploy-tokens-container-registry-specs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Verify that deploy token has valid access when pulling container registry image
-merge_request: 18260
-author:
-type: fixed
diff --git a/changelogs/unreleased/direct-upload-of-uploads.yml b/changelogs/unreleased/direct-upload-of-uploads.yml
deleted file mode 100644
index 7900fa5f58d..00000000000
--- a/changelogs/unreleased/direct-upload-of-uploads.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow to store uploads by default on Object Storage
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/dm-deploy-keys-default-user.yml b/changelogs/unreleased/dm-deploy-keys-default-user.yml
deleted file mode 100644
index b82d67d028c..00000000000
--- a/changelogs/unreleased/dm-deploy-keys-default-user.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ensure hooks run when a deploy key without a user pushes
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/dm-flatten-tree-plus-chars.yml b/changelogs/unreleased/dm-flatten-tree-plus-chars.yml
deleted file mode 100644
index 23f1b30d8fa..00000000000
--- a/changelogs/unreleased/dm-flatten-tree-plus-chars.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix links to subdirectories of a directory with a plus character in its path
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/dm-internal-user-namespace.yml b/changelogs/unreleased/dm-internal-user-namespace.yml
deleted file mode 100644
index 8517c116795..00000000000
--- a/changelogs/unreleased/dm-internal-user-namespace.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ensure internal users (ghost, support bot) get assigned a namespace
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/docs-for-failure-reason-tooltip.yml b/changelogs/unreleased/docs-for-failure-reason-tooltip.yml
deleted file mode 100644
index ef37654b189..00000000000
--- a/changelogs/unreleased/docs-for-failure-reason-tooltip.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add documentation for Pipelines failure reasons
-merge_request: 18352
-author:
-type: other
diff --git a/changelogs/unreleased/dz-improve-app-settings-2.yml b/changelogs/unreleased/dz-improve-app-settings-2.yml
deleted file mode 100644
index ebe571decb8..00000000000
--- a/changelogs/unreleased/dz-improve-app-settings-2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Redesign application settings to match project settings
-merge_request: 18019
-author:
-type: changed
diff --git a/changelogs/unreleased/escape-autocomplete-values-for-markdown.yml b/changelogs/unreleased/escape-autocomplete-values-for-markdown.yml
deleted file mode 100644
index eea9da4c579..00000000000
--- a/changelogs/unreleased/escape-autocomplete-values-for-markdown.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Escape Markdown characters properly when using autocomplete
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/expose-commits-mr-api.yml b/changelogs/unreleased/expose-commits-mr-api.yml
deleted file mode 100644
index 77ea2f27431..00000000000
--- a/changelogs/unreleased/expose-commits-mr-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow merge requests related to a commit to be found via API
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/feature-gb-variables-expressions-in-only-except.yml b/changelogs/unreleased/feature-gb-variables-expressions-in-only-except.yml
deleted file mode 100644
index 84977ce11c8..00000000000
--- a/changelogs/unreleased/feature-gb-variables-expressions-in-only-except.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for pipeline variables expressions in only/except
-merge_request: 17316
-author:
-type: added
diff --git a/changelogs/unreleased/feature_detect_co_authored_commits.yml b/changelogs/unreleased/feature_detect_co_authored_commits.yml
deleted file mode 100644
index 7b1269ed982..00000000000
--- a/changelogs/unreleased/feature_detect_co_authored_commits.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Detect commit message trailers and link users properly to their accounts
-  on Gitlab
-merge_request: 17919
-author: cousine
-type: added
diff --git a/changelogs/unreleased/fix-40798-namespace-forking.yml b/changelogs/unreleased/fix-40798-namespace-forking.yml
deleted file mode 100644
index 095235725f8..00000000000
--- a/changelogs/unreleased/fix-40798-namespace-forking.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix forking to subgroup via API when namespace is given by name
-merge_request: 17815
-author: Jan Beckmann
-type: fixed
diff --git a/changelogs/unreleased/fix-42459---in-branch.yml b/changelogs/unreleased/fix-42459---in-branch.yml
deleted file mode 100644
index 26cc2046206..00000000000
--- a/changelogs/unreleased/fix-42459---in-branch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix relative uri when "#" is in branch name
-merge_request:
-author: Jan
-type: fixed
diff --git a/changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml b/changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml
deleted file mode 100644
index e21554f091a..00000000000
--- a/changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix 500 error when a merge request from a fork has conflicts and has not yet
-  been updated
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-auth0-unsafe-login.yml b/changelogs/unreleased/fix-auth0-unsafe-login.yml
deleted file mode 100644
index 01c6ea69dcc..00000000000
--- a/changelogs/unreleased/fix-auth0-unsafe-login.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix GitLab Auth0 integration signing in the wrong user
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/fix-dashboard-sorting.yml b/changelogs/unreleased/fix-dashboard-sorting.yml
deleted file mode 100644
index 2ba13a93fa9..00000000000
--- a/changelogs/unreleased/fix-dashboard-sorting.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prioritize weight over title when sorting charts
-merge_request: 18233
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-emoji-popup.yml b/changelogs/unreleased/fix-emoji-popup.yml
deleted file mode 100644
index c81d061a5d7..00000000000
--- a/changelogs/unreleased/fix-emoji-popup.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Hide emoji popup after multiple spaces
-merge_request:
-author: Jan Beckmann
-type: fixed
diff --git a/changelogs/unreleased/fix-mattermost-delete-team.yml b/changelogs/unreleased/fix-mattermost-delete-team.yml
deleted file mode 100644
index d14ae023114..00000000000
--- a/changelogs/unreleased/fix-mattermost-delete-team.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed group deletion linked to Mattermost
-merge_request: 16209
-author: Julien Millau
-type: fixed
diff --git a/changelogs/unreleased/fix-projects-no-repository-placeholder.yml b/changelogs/unreleased/fix-projects-no-repository-placeholder.yml
deleted file mode 100644
index 3d11c897020..00000000000
--- a/changelogs/unreleased/fix-projects-no-repository-placeholder.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update no repository placeholder
-merge_request: 17964
-author: George Tsiolis
-type: fixed
diff --git a/changelogs/unreleased/fix-references-in-group-context.yml b/changelogs/unreleased/fix-references-in-group-context.yml
deleted file mode 100644
index b436c2089ed..00000000000
--- a/changelogs/unreleased/fix-references-in-group-context.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ignore project internal references in group context
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-wiki-find-file-gitaly.yml b/changelogs/unreleased/fix-wiki-find-file-gitaly.yml
deleted file mode 100644
index 5c536be7ae5..00000000000
--- a/changelogs/unreleased/fix-wiki-find-file-gitaly.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix finding wiki file when Gitaly is enabled
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml b/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml
deleted file mode 100644
index 7fa6f6a5874..00000000000
--- a/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed some SSRF vulnerabilities in services, hooks and integrations
-merge_request: 2337
-author:
-type: security
diff --git a/changelogs/unreleased/fj-174-better-ldap-connection-handling.yml b/changelogs/unreleased/fj-174-better-ldap-connection-handling.yml
deleted file mode 100644
index be0b83505fb..00000000000
--- a/changelogs/unreleased/fj-174-better-ldap-connection-handling.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add better LDAP connection handling
-merge_request: 18039
-author:
-type: fixed
diff --git a/changelogs/unreleased/fj-41900-import-endpoint-with-overwrite-support.yml b/changelogs/unreleased/fj-41900-import-endpoint-with-overwrite-support.yml
deleted file mode 100644
index 0553cc684ce..00000000000
--- a/changelogs/unreleased/fj-41900-import-endpoint-with-overwrite-support.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Extend API for importing a project export with overwrite support
-merge_request: 17883
-author:
-type: added
diff --git a/changelogs/unreleased/fj-42685-extend-project-export-endpoint.yml b/changelogs/unreleased/fj-42685-extend-project-export-endpoint.yml
deleted file mode 100644
index a06499d821a..00000000000
--- a/changelogs/unreleased/fj-42685-extend-project-export-endpoint.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Extend API for exporting a project with direct upload URL
-merge_request: 17686
-author:
-type: added
diff --git a/changelogs/unreleased/fl-fix-annoying-actions.yml b/changelogs/unreleased/fl-fix-annoying-actions.yml
deleted file mode 100644
index fe17f9a8978..00000000000
--- a/changelogs/unreleased/fl-fix-annoying-actions.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Stop redirecting the page in pipeline main actions
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/ide-file-row-hover-style.yml b/changelogs/unreleased/ide-file-row-hover-style.yml
deleted file mode 100644
index 158379a5aef..00000000000
--- a/changelogs/unreleased/ide-file-row-hover-style.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added hover background color to IDE file list rows
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/ide-folder-button-path.yml b/changelogs/unreleased/ide-folder-button-path.yml
deleted file mode 100644
index 84a122fab75..00000000000
--- a/changelogs/unreleased/ide-folder-button-path.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed IDE button opening the wrong URL in tree list
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/ide-project-avatar-identicon.yml b/changelogs/unreleased/ide-project-avatar-identicon.yml
deleted file mode 100644
index 2b8b00018a8..00000000000
--- a/changelogs/unreleased/ide-project-avatar-identicon.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make project avatar in IDE consistent with the rest of GitLab
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/increase-unicorn-memory-killer-limits.yml b/changelogs/unreleased/increase-unicorn-memory-killer-limits.yml
deleted file mode 100644
index 6d7d2df4f4a..00000000000
--- a/changelogs/unreleased/increase-unicorn-memory-killer-limits.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Increase the memory limits used in the unicorn killer
-merge_request: 17948
-author:
-type: other
diff --git a/changelogs/unreleased/issue_25542.yml b/changelogs/unreleased/issue_25542.yml
deleted file mode 100644
index eba491f7e2a..00000000000
--- a/changelogs/unreleased/issue_25542.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve JIRA event descriptions
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/issue_40915.yml b/changelogs/unreleased/issue_40915.yml
deleted file mode 100644
index 2b6d98e69a6..00000000000
--- a/changelogs/unreleased/issue_40915.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow assigning and filtering issuables by ancestor group labels
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/issue_42443.yml b/changelogs/unreleased/issue_42443.yml
deleted file mode 100644
index 954fbd98a4b..00000000000
--- a/changelogs/unreleased/issue_42443.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include subgroup issues when searching for group issues using the API
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/issue_44270.yml b/changelogs/unreleased/issue_44270.yml
deleted file mode 100644
index 6234162be30..00000000000
--- a/changelogs/unreleased/issue_44270.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Show issues of subgroups in group-level issue board
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/jej-commit-api-tracks-lfs.yml b/changelogs/unreleased/jej-commit-api-tracks-lfs.yml
deleted file mode 100644
index 8284abf9f28..00000000000
--- a/changelogs/unreleased/jej-commit-api-tracks-lfs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Create commit API and Web IDE obey LFS filters
-merge_request: 16718
-author:
-type: fixed
diff --git a/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml b/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml
deleted file mode 100644
index d5219b5d019..00000000000
--- a/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adds confidential notes channel for Slack/Mattermost
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/jivl-realtime-update-adding-file.yml b/changelogs/unreleased/jivl-realtime-update-adding-file.yml
deleted file mode 100644
index df1bdb1648d..00000000000
--- a/changelogs/unreleased/jivl-realtime-update-adding-file.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add realtime pipeline status for adding/viewing files
-merge_request: 17705
-author:
-type: other
diff --git a/changelogs/unreleased/jivl-summary-statistics-prometheus-dashboard.yml b/changelogs/unreleased/jivl-summary-statistics-prometheus-dashboard.yml
deleted file mode 100644
index c5cdbcf7b40..00000000000
--- a/changelogs/unreleased/jivl-summary-statistics-prometheus-dashboard.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add average and maximum summary statistics to the prometheus dashboard
-merge_request: 17921
-author:
-type: changed
diff --git a/changelogs/unreleased/jprovazn-issueref.yml b/changelogs/unreleased/jprovazn-issueref.yml
deleted file mode 100644
index ee19cac7b19..00000000000
--- a/changelogs/unreleased/jprovazn-issueref.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Display state indicator for issuable references in non-project scope (e.g.
-  when referencing issuables from group scope).
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/jramsay-38830-tarball.yml b/changelogs/unreleased/jramsay-38830-tarball.yml
deleted file mode 100644
index 6d40c305614..00000000000
--- a/changelogs/unreleased/jramsay-38830-tarball.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add alternate archive route for simplified packaging
-merge_request: 17225
-author:
-type: added
diff --git a/changelogs/unreleased/merge-request-widget-source-branch-improvements.yml b/changelogs/unreleased/merge-request-widget-source-branch-improvements.yml
deleted file mode 100644
index 942eb6062fd..00000000000
--- a/changelogs/unreleased/merge-request-widget-source-branch-improvements.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fixes remove source branch checkbox being visible when user cannot remove the
-  branch
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/move-email-footer-info-to-single-line.yml b/changelogs/unreleased/move-email-footer-info-to-single-line.yml
deleted file mode 100644
index 87ed5638056..00000000000
--- a/changelogs/unreleased/move-email-footer-info-to-single-line.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move email footer info to a single line
-merge_request: 17916
-author:
-type: changed
diff --git a/changelogs/unreleased/move-registry-after-cicd-project-nav-sidebar.yml b/changelogs/unreleased/move-registry-after-cicd-project-nav-sidebar.yml
deleted file mode 100644
index 03a6fd42228..00000000000
--- a/changelogs/unreleased/move-registry-after-cicd-project-nav-sidebar.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-  title: Move 'Registry' after 'CI/CD' in project navigation sidebar
-  merge_request: 18018
-  author: Elias Werberich
-  type: changed
diff --git a/changelogs/unreleased/optional-api-delimiter.yml b/changelogs/unreleased/optional-api-delimiter.yml
deleted file mode 100644
index 0bcd0787306..00000000000
--- a/changelogs/unreleased/optional-api-delimiter.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make /-/ delimiter optional for search endpoints
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/osw-41401-render-mr-commit-sha-instead-diffs.yml b/changelogs/unreleased/osw-41401-render-mr-commit-sha-instead-diffs.yml
deleted file mode 100644
index 44973641325..00000000000
--- a/changelogs/unreleased/osw-41401-render-mr-commit-sha-instead-diffs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Render MR commit SHA instead "diffs" when viable
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/osw-44295-adjust-authorization-for-discussions-show.yml b/changelogs/unreleased/osw-44295-adjust-authorization-for-discussions-show.yml
deleted file mode 100644
index 978c5468bb1..00000000000
--- a/changelogs/unreleased/osw-44295-adjust-authorization-for-discussions-show.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adjust 404's for LegacyDiffNote discussion rendering
-merge_request: 18201
-author:
-type: fixed
diff --git a/changelogs/unreleased/pages_force_https.yml b/changelogs/unreleased/pages_force_https.yml
deleted file mode 100644
index da7e29087f3..00000000000
--- a/changelogs/unreleased/pages_force_https.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add HTTPS-only pages
-merge_request: 16273
-author: rfwatson
-type: added
diff --git a/changelogs/unreleased/poc-upload-hashing-path.yml b/changelogs/unreleased/poc-upload-hashing-path.yml
deleted file mode 100644
index 7970405bea1..00000000000
--- a/changelogs/unreleased/poc-upload-hashing-path.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: File uploads in remote storage now support project renaming.
-merge_request: 4597
-author:
-type: fixed
diff --git a/changelogs/unreleased/reduce-query-count-for-mergerequestscontroller-show.yml b/changelogs/unreleased/reduce-query-count-for-mergerequestscontroller-show.yml
deleted file mode 100644
index 1f793fe5e7c..00000000000
--- a/changelogs/unreleased/reduce-query-count-for-mergerequestscontroller-show.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reduce number of queries when viewing a merge request
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/refactor-move-assignee-title-vue-component.yml b/changelogs/unreleased/refactor-move-assignee-title-vue-component.yml
deleted file mode 100644
index f6521339c39..00000000000
--- a/changelogs/unreleased/refactor-move-assignee-title-vue-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move AssigneeTitle vue component
-merge_request: 17397
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/refactor-move-mr-widget-memory-usage-and-graph-components.yml b/changelogs/unreleased/refactor-move-mr-widget-memory-usage-and-graph-components.yml
deleted file mode 100644
index 96e63343963..00000000000
--- a/changelogs/unreleased/refactor-move-mr-widget-memory-usage-and-graph-components.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move MemoryGraph and MemoryUsage vue components
-merge_request: 17533
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/refactor-move-mr-widget-nothing-to-merge-vue-component.yml b/changelogs/unreleased/refactor-move-mr-widget-nothing-to-merge-vue-component.yml
deleted file mode 100644
index dc8ff95dc27..00000000000
--- a/changelogs/unreleased/refactor-move-mr-widget-nothing-to-merge-vue-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move NothingToMerge vue component
-merge_request: 17544
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/refactor-move-mr-widget-sha-mismatch-vue-component.yml b/changelogs/unreleased/refactor-move-mr-widget-sha-mismatch-vue-component.yml
deleted file mode 100644
index ac41fe23d3d..00000000000
--- a/changelogs/unreleased/refactor-move-mr-widget-sha-mismatch-vue-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move ShaMismatch vue component
-merge_request: 17546
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/refactor-move-mr-widget-unresolved-discussions-vue-component.yml b/changelogs/unreleased/refactor-move-mr-widget-unresolved-discussions-vue-component.yml
deleted file mode 100644
index a31f1f372a8..00000000000
--- a/changelogs/unreleased/refactor-move-mr-widget-unresolved-discussions-vue-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move UnresolvedDiscussions vue component
-merge_request: 17538
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/refactor-move-time-tracking-comparison-pane-vue-component.yml b/changelogs/unreleased/refactor-move-time-tracking-comparison-pane-vue-component.yml
deleted file mode 100644
index 88a4b8ec8c1..00000000000
--- a/changelogs/unreleased/refactor-move-time-tracking-comparison-pane-vue-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move TimeTrackingComparisonPane vue component
-merge_request: 17931
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/refactor-move-time-tracking-vue-components.yml b/changelogs/unreleased/refactor-move-time-tracking-vue-components.yml
deleted file mode 100644
index 8151655250a..00000000000
--- a/changelogs/unreleased/refactor-move-time-tracking-vue-components.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move TimeTrackingCollapsedState vue component
-merge_request: 17399
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/remove-pages-tar-support.yml b/changelogs/unreleased/remove-pages-tar-support.yml
deleted file mode 100644
index 73448687912..00000000000
--- a/changelogs/unreleased/remove-pages-tar-support.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove support for legacy tar.gz pages artifacts
-merge_request: 18090
-author:
-type: deprecated
diff --git a/changelogs/unreleased/sh-add-cleanup-rpc-gitaly.yml b/changelogs/unreleased/sh-add-cleanup-rpc-gitaly.yml
deleted file mode 100644
index 81b48fc255b..00000000000
--- a/changelogs/unreleased/sh-add-cleanup-rpc-gitaly.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Automatically cleanup stale worktrees and lock files upon a push
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-appearance-cache-key-version.yml b/changelogs/unreleased/sh-appearance-cache-key-version.yml
deleted file mode 100644
index c17a3dc36cd..00000000000
--- a/changelogs/unreleased/sh-appearance-cache-key-version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use the GitLab version as part of the appearances cache key
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-gitlab-sidekiq-logger.yml b/changelogs/unreleased/sh-gitlab-sidekiq-logger.yml
deleted file mode 100644
index f68d45d2f38..00000000000
--- a/changelogs/unreleased/sh-gitlab-sidekiq-logger.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for Sidekiq JSON logging
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/sh-memoize-repository-empty.yml b/changelogs/unreleased/sh-memoize-repository-empty.yml
deleted file mode 100644
index 64db3ca0371..00000000000
--- a/changelogs/unreleased/sh-memoize-repository-empty.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Memoize Git::Repository#has_visible_content?
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-move-sidekiq-exporter-logs.yml b/changelogs/unreleased/sh-move-sidekiq-exporter-logs.yml
deleted file mode 100644
index 1990f4f6124..00000000000
--- a/changelogs/unreleased/sh-move-sidekiq-exporter-logs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move Sidekiq exporter logs to log/sidekiq_exporter.log
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/tc-re-add-read-only-banner.yml b/changelogs/unreleased/tc-re-add-read-only-banner.yml
deleted file mode 100644
index 35bcd7e184e..00000000000
--- a/changelogs/unreleased/tc-re-add-read-only-banner.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add read-only banner to all pages
-merge_request: 17798
-author:
-type: fixed
diff --git a/changelogs/unreleased/ui-mr-counter-cache.yml b/changelogs/unreleased/ui-mr-counter-cache.yml
deleted file mode 100644
index 5e241bfe93f..00000000000
--- a/changelogs/unreleased/ui-mr-counter-cache.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Deleting a MR you are assigned to should decrements counter
-merge_request: 17951
-author: m b
-type: fixed
diff --git a/changelogs/unreleased/update-gitlab-ci-yml-services-docs.yml b/changelogs/unreleased/update-gitlab-ci-yml-services-docs.yml
deleted file mode 100644
index c76495ec959..00000000000
--- a/changelogs/unreleased/update-gitlab-ci-yml-services-docs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update CI services documnetation
-merge_request: 17749
-author:
-type: other
diff --git a/changelogs/unreleased/update-spec-import-path-for-vue-mount-component-helper.yml b/changelogs/unreleased/update-spec-import-path-for-vue-mount-component-helper.yml
deleted file mode 100644
index 9c13bfbaf6f..00000000000
--- a/changelogs/unreleased/update-spec-import-path-for-vue-mount-component-helper.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update spec import path for vue mount component helper
-merge_request: 17880
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/update-unresolved-discussions-vue-component.yml b/changelogs/unreleased/update-unresolved-discussions-vue-component.yml
deleted file mode 100644
index 246eaaae2bd..00000000000
--- a/changelogs/unreleased/update-unresolved-discussions-vue-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add i18n and update specs for ShaMismatch vue component
-merge_request: 17870
-author: George Tsiolis
-type: performance
diff --git a/changelogs/unreleased/use-chronic-duration-attribute-for-project-build-timeout.yml b/changelogs/unreleased/use-chronic-duration-attribute-for-project-build-timeout.yml
deleted file mode 100644
index 675d347b64c..00000000000
--- a/changelogs/unreleased/use-chronic-duration-attribute-for-project-build-timeout.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use human readable value build_timeout in Project
-merge_request: 17386
-author:
-type: changed
diff --git a/changelogs/unreleased/winh-41174-projects-groups-badges-ui.yml b/changelogs/unreleased/winh-41174-projects-groups-badges-ui.yml
deleted file mode 100644
index 14114eca2b2..00000000000
--- a/changelogs/unreleased/winh-41174-projects-groups-badges-ui.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Projects and groups badges settings UI
-merge_request: 17114
-author:
-type: added
diff --git a/changelogs/unreleased/winh-deprecate-old-modal.yml b/changelogs/unreleased/winh-deprecate-old-modal.yml
deleted file mode 100644
index 4fae1fafbea..00000000000
--- a/changelogs/unreleased/winh-deprecate-old-modal.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Rename modal.vue to deprecated_modal.vue
-merge_request: 17438
-author:
-type: other
diff --git a/changelogs/unreleased/workhorse-gitaly-mandatory.yml b/changelogs/unreleased/workhorse-gitaly-mandatory.yml
deleted file mode 100644
index 77b62302e86..00000000000
--- a/changelogs/unreleased/workhorse-gitaly-mandatory.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make all workhorse gitaly calls opt-out, take 2
-merge_request: 18043
-author:
-type: other
diff --git a/changelogs/unreleased/zj-bump-gitaly.yml b/changelogs/unreleased/zj-bump-gitaly.yml
deleted file mode 100644
index eb28bed70e4..00000000000
--- a/changelogs/unreleased/zj-bump-gitaly.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Gitaly to upgrade its charlock_holmes
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/zj-feature-gate-remove-http-api.yml b/changelogs/unreleased/zj-feature-gate-remove-http-api.yml
deleted file mode 100644
index 2095f60146c..00000000000
--- a/changelogs/unreleased/zj-feature-gate-remove-http-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow feature gates to be removed through the API
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/zj-opt-out-delete-refs.yml b/changelogs/unreleased/zj-opt-out-delete-refs.yml
deleted file mode 100644
index b02a45eee17..00000000000
--- a/changelogs/unreleased/zj-opt-out-delete-refs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bulk deleting refs is handled by Gitaly by default
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/zj-opt-out-list-commits-by-oid.yml b/changelogs/unreleased/zj-opt-out-list-commits-by-oid.yml
deleted file mode 100644
index 3871293ee04..00000000000
--- a/changelogs/unreleased/zj-opt-out-list-commits-by-oid.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: ListCommitsByOid is executed by Gitaly by default
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/zj-remote-repo-exists.yml b/changelogs/unreleased/zj-remote-repo-exists.yml
deleted file mode 100644
index f024b83159b..00000000000
--- a/changelogs/unreleased/zj-remote-repo-exists.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Test if remote repository exists when importing wikis
-merge_request:
-author:
-type: fixed
-- 
cgit v1.2.3


From d9e8bb4bf1953086db50448c70bad8ed6ea92463 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 20 Apr 2018 10:08:46 +0000
Subject: Add documentation on how to configure Redis Sentinel by persistent
 class

---
 doc/administration/high_availability/redis.md | 41 +++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index fd2677996b1..430f865f1e7 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -650,6 +650,47 @@ gitlab_rails['redis_sentinels'] = [
 Omnibus GitLab configures some things behind the curtains to make the sysadmins'
 lives easier. If you want to know what happens underneath keep reading.
 
+### Running multiple Redis clusters
+
+GitLab supports running [separate Redis clusters for different persistent
+classes](https://docs.gitlab.com/omnibus/settings/redis.html#running-with-multiple-redis-instances):
+cache, queues, and shared_state. To make this work with Sentinel:
+
+1. Set the appropriate variable in `/etc/gitlab/gitlab.rb` for each instance you are using:
+
+    ```ruby
+    gitlab_rails['redis_cache_instance'] = REDIS_CACHE_URL
+    gitlab_rails['redis_queues_instance'] = REDIS_QUEUES_URL
+    gitlab_rails['redis_shared_state_instance'] = REDIS_SHARED_STATE_URL
+    ```
+    **Note**: Redis URLs should be in the format: `redis://:PASSWORD@SENTINEL_MASTER_NAME`
+
+    1. PASSWORD is the plaintext password for the Redis instance
+    2. SENTINEL_MASTER_NAME is the Sentinel master name (e.g. `gitlab-redis-cache`)
+1. Include an array of hashes with host/port combinations, such as the following:
+
+    ```ruby
+    gitlab_rails['redis_cache_sentinels'] = [
+      { host: REDIS_CACHE_SENTINEL_HOST, port: PORT1 },
+      { host: REDIS_CACHE_SENTINEL_HOST2, port: PORT2 }
+    ]
+    gitlab_rails['redis_queues_sentinels'] = [
+      { host: REDIS_QUEUES_SENTINEL_HOST, port: PORT1 },
+      { host: REDIS_QUEUES_SENTINEL_HOST2, port: PORT2 }
+    ]
+    gitlab_rails['redis_shared_state_sentinels'] = [
+      { host: SHARED_STATE_SENTINEL_HOST, port: PORT1 },
+      { host: SHARED_STATE_SENTINEL_HOST2, port: PORT2 }
+    ]
+    ```
+1. Note that for each persistence class, GitLab will default to using the
+   configuration specified in `gitlab_rails['redis_sentinels']` unless
+   overriden by the settings above.
+1. Be sure to include BOTH configuration options for each persistent classes. For example,
+   if you choose to configure a cache instance, you must specify both `gitlab_rails['redis_cache_instance']`
+   and `gitlab_rails['redis_cache_sentinels']` for GitLab to generate the proper configuration files.
+1. Run `gitlab-ctl reconfigure`
+
 ### Control running services
 
 In the previous example, we've used `redis_sentinel_role` and
-- 
cgit v1.2.3


From 4e2b96d6af561a09dc3623c893e7e2ca212100f6 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 20 Apr 2018 14:57:14 +0100
Subject: Updates test to check svg for commit icon is being rendered

---
 .../vue_shared/components/commit_spec.js           | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/spec/javascripts/vue_shared/components/commit_spec.js b/spec/javascripts/vue_shared/components/commit_spec.js
index 9aea9de1ad6..74c6fbba7ee 100644
--- a/spec/javascripts/vue_shared/components/commit_spec.js
+++ b/spec/javascripts/vue_shared/components/commit_spec.js
@@ -66,7 +66,7 @@ describe('Commit component', () => {
 
     it('should render a link to the ref url', () => {
       expect(component.$el.querySelector('.ref-name').getAttribute('href')).toEqual(
-        props.commitRef.ref_url,
+        props.commitRef.ref_url
       );
     });
 
@@ -76,15 +76,21 @@ describe('Commit component', () => {
 
     it('should render the commit short sha with a link to the commit url', () => {
       expect(component.$el.querySelector('.commit-sha').getAttribute('href')).toEqual(
-        props.commitUrl,
+        props.commitUrl
       );
       expect(component.$el.querySelector('.commit-sha').textContent).toContain(props.shortSha);
     });
 
+    it('should render icon for commit', () => {
+      expect(
+        component.$el.querySelector('.js-commit-icon use').getAttribute('xlink:href')
+      ).toContain('commit');
+    });
+
     describe('Given commit title and author props', () => {
       it('should render a link to the author profile', () => {
         expect(
-          component.$el.querySelector('.commit-title .avatar-image-container').getAttribute('href'),
+          component.$el.querySelector('.commit-title .avatar-image-container').getAttribute('href')
         ).toEqual(props.author.path);
       });
 
@@ -92,22 +98,22 @@ describe('Commit component', () => {
         expect(
           component.$el
             .querySelector('.commit-title .avatar-image-container img')
-            .getAttribute('data-original-title'),
+            .getAttribute('data-original-title')
         ).toContain(props.author.username);
         expect(
           component.$el
             .querySelector('.commit-title .avatar-image-container img')
-            .getAttribute('alt'),
+            .getAttribute('alt')
         ).toContain(`${props.author.username}'s avatar`);
       });
     });
 
     it('should render the commit title', () => {
       expect(component.$el.querySelector('a.commit-row-message').getAttribute('href')).toEqual(
-        props.commitUrl,
+        props.commitUrl
       );
       expect(component.$el.querySelector('a.commit-row-message').textContent).toContain(
-        props.title,
+        props.title
       );
     });
   });
@@ -130,7 +136,7 @@ describe('Commit component', () => {
       component = mountComponent(CommitComponent, props);
 
       expect(component.$el.querySelector('.commit-title span').textContent).toContain(
-        "Can't find HEAD commit for this branch",
+        "Can't find HEAD commit for this branch"
       );
     });
   });
-- 
cgit v1.2.3


From 9ea2fc85a3387e7bbb10558b3f2302f05abe5b64 Mon Sep 17 00:00:00 2001
From: Andreas Brandl <abrandl@gitlab.com>
Date: Fri, 20 Apr 2018 14:00:15 +0000
Subject: Atomic internal ids for all models

---
 app/models/concerns/atomic_internal_id.rb          |  5 +--
 app/models/concerns/nonatomic_internal_id.rb       | 22 ------------
 app/models/deployment.rb                           |  4 ++-
 app/models/internal_id.rb                          |  3 +-
 app/models/merge_request.rb                        |  4 ++-
 app/models/milestone.rb                            |  5 ++-
 ...ab-44259-atomic-internal-ids-for-all-models.yml |  5 +++
 ...d_further_scope_columns_to_internal_id_table.rb | 15 ++++++++
 ...2_add_index_constraints_to_internal_id_table.rb | 40 ++++++++++++++++++++++
 db/schema.rb                                       |  7 ++--
 spec/models/deployment_spec.rb                     |  9 +++++
 spec/models/merge_request_spec.rb                  |  8 ++++-
 spec/models/milestone_spec.rb                      | 20 +++++++++++
 .../models/atomic_internal_id_spec.rb              |  8 +++++
 14 files changed, 124 insertions(+), 31 deletions(-)
 delete mode 100644 app/models/concerns/nonatomic_internal_id.rb
 create mode 100644 changelogs/unreleased/ab-44259-atomic-internal-ids-for-all-models.yml
 create mode 100644 db/migrate/20180416155103_add_further_scope_columns_to_internal_id_table.rb
 create mode 100644 db/migrate/20180417090132_add_index_constraints_to_internal_id_table.rb

diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb
index 4b66725a3e6..22f516a172f 100644
--- a/app/models/concerns/atomic_internal_id.rb
+++ b/app/models/concerns/atomic_internal_id.rb
@@ -27,8 +27,9 @@ module AtomicInternalId
   module ClassMethods
     def has_internal_id(column, scope:, init:) # rubocop:disable Naming/PredicateName
       before_validation(on: :create) do
-        if read_attribute(column).blank?
-          scope_attrs = { scope => association(scope).reader }
+        scope_value = association(scope).reader
+        if read_attribute(column).blank? && scope_value
+          scope_attrs = { scope_value.class.table_name.singularize.to_sym => scope_value }
           usage = self.class.table_name.to_sym
 
           new_iid = InternalId.generate_next(self, scope_attrs, usage, init)
diff --git a/app/models/concerns/nonatomic_internal_id.rb b/app/models/concerns/nonatomic_internal_id.rb
deleted file mode 100644
index 9d0c9b8512f..00000000000
--- a/app/models/concerns/nonatomic_internal_id.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module NonatomicInternalId
-  extend ActiveSupport::Concern
-
-  included do
-    validate :set_iid, on: :create
-    validates :iid, presence: true, numericality: true
-  end
-
-  def set_iid
-    if iid.blank?
-      parent = project || group
-      records = parent.public_send(self.class.name.tableize) # rubocop:disable GitlabSecurity/PublicSend
-      max_iid = records.maximum(:iid)
-
-      self.iid = max_iid.to_i + 1
-    end
-  end
-
-  def to_param
-    iid.to_s
-  end
-end
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index e18ea8bfea4..254764eefde 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -1,11 +1,13 @@
 class Deployment < ActiveRecord::Base
-  include NonatomicInternalId
+  include AtomicInternalId
 
   belongs_to :project, required: true
   belongs_to :environment, required: true
   belongs_to :user
   belongs_to :deployable, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations
 
+  has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.deployments&.maximum(:iid) }
+
   validates :sha, presence: true
   validates :ref, presence: true
 
diff --git a/app/models/internal_id.rb b/app/models/internal_id.rb
index 96a43006642..189942c5ad8 100644
--- a/app/models/internal_id.rb
+++ b/app/models/internal_id.rb
@@ -12,8 +12,9 @@
 # * (Optionally) add columns to `internal_ids` if needed for scope.
 class InternalId < ActiveRecord::Base
   belongs_to :project
+  belongs_to :namespace
 
-  enum usage: { issues: 0 }
+  enum usage: { issues: 0, merge_requests: 1, deployments: 2, milestones: 3, epics: 4 }
 
   validates :usage, presence: true
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 91d8be5559b..8f964a488aa 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1,5 +1,5 @@
 class MergeRequest < ActiveRecord::Base
-  include NonatomicInternalId
+  include AtomicInternalId
   include Issuable
   include Noteable
   include Referable
@@ -18,6 +18,8 @@ class MergeRequest < ActiveRecord::Base
   belongs_to :source_project, class_name: "Project"
   belongs_to :merge_user, class_name: "User"
 
+  has_internal_id :iid, scope: :target_project, init: ->(s) { s&.target_project&.merge_requests&.maximum(:iid) }
+
   has_many :merge_request_diffs
 
   has_one :merge_request_diff,
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index a66a0015827..d14e3a4ded5 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -8,7 +8,7 @@ class Milestone < ActiveRecord::Base
   Started = MilestoneStruct.new('Started', '#started', -3)
 
   include CacheMarkdownField
-  include NonatomicInternalId
+  include AtomicInternalId
   include Sortable
   include Referable
   include StripAttribute
@@ -21,6 +21,9 @@ class Milestone < ActiveRecord::Base
   belongs_to :project
   belongs_to :group
 
+  has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.milestones&.maximum(:iid) }
+  has_internal_id :iid, scope: :group, init: ->(s) { s&.group&.milestones&.maximum(:iid) }
+
   has_many :issues
   has_many :labels, -> { distinct.reorder('labels.title') },  through: :issues
   has_many :merge_requests
diff --git a/changelogs/unreleased/ab-44259-atomic-internal-ids-for-all-models.yml b/changelogs/unreleased/ab-44259-atomic-internal-ids-for-all-models.yml
new file mode 100644
index 00000000000..e154f7dbc85
--- /dev/null
+++ b/changelogs/unreleased/ab-44259-atomic-internal-ids-for-all-models.yml
@@ -0,0 +1,5 @@
+---
+title: Transition to atomic internal ids for all models.
+merge_request: 44259
+author:
+type: other
diff --git a/db/migrate/20180416155103_add_further_scope_columns_to_internal_id_table.rb b/db/migrate/20180416155103_add_further_scope_columns_to_internal_id_table.rb
new file mode 100644
index 00000000000..37e2d19e022
--- /dev/null
+++ b/db/migrate/20180416155103_add_further_scope_columns_to_internal_id_table.rb
@@ -0,0 +1,15 @@
+class AddFurtherScopeColumnsToInternalIdTable < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    change_column_null :internal_ids, :project_id, true
+    add_column :internal_ids, :namespace_id, :integer, null: true
+  end
+
+  def down
+    change_column_null :internal_ids, :project_id, false
+    remove_column :internal_ids, :namespace_id
+  end
+end
diff --git a/db/migrate/20180417090132_add_index_constraints_to_internal_id_table.rb b/db/migrate/20180417090132_add_index_constraints_to_internal_id_table.rb
new file mode 100644
index 00000000000..582b89a3948
--- /dev/null
+++ b/db/migrate/20180417090132_add_index_constraints_to_internal_id_table.rb
@@ -0,0 +1,40 @@
+class AddIndexConstraintsToInternalIdTable < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :internal_ids, [:usage, :namespace_id], unique: true, where: 'namespace_id IS NOT NULL'
+
+    replace_index(:internal_ids, [:usage, :project_id], name: 'index_internal_ids_on_usage_and_project_id') do
+      add_concurrent_index :internal_ids, [:usage, :project_id], unique: true, where: 'project_id IS NOT NULL'
+    end
+
+    add_concurrent_foreign_key :internal_ids, :namespaces, column: :namespace_id, on_delete: :cascade
+  end
+
+  def down
+    remove_concurrent_index :internal_ids, [:usage, :namespace_id]
+
+    replace_index(:internal_ids, [:usage, :project_id], name: 'index_internal_ids_on_usage_and_project_id') do
+      add_concurrent_index :internal_ids, [:usage, :project_id], unique: true
+    end
+
+    remove_foreign_key :internal_ids, column: :namespace_id
+  end
+
+  private
+  def replace_index(table, columns, name:)
+    temporary_name = "#{name}_old"
+
+    if index_exists?(table, columns, name: name)
+      rename_index table, name, temporary_name
+    end
+
+    yield
+
+    remove_concurrent_index_by_name table, temporary_name
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1d272bdb779..df621956c80 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -896,12 +896,14 @@ ActiveRecord::Schema.define(version: 20180418053107) do
   add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree
 
   create_table "internal_ids", id: :bigserial, force: :cascade do |t|
-    t.integer "project_id", null: false
+    t.integer "project_id"
     t.integer "usage", null: false
     t.integer "last_value", null: false
+    t.integer "namespace_id"
   end
 
-  add_index "internal_ids", ["usage", "project_id"], name: "index_internal_ids_on_usage_and_project_id", unique: true, using: :btree
+  add_index "internal_ids", ["usage", "namespace_id"], name: "index_internal_ids_on_usage_and_namespace_id", unique: true, where: "(namespace_id IS NOT NULL)", using: :btree
+  add_index "internal_ids", ["usage", "project_id"], name: "index_internal_ids_on_usage_and_project_id", unique: true, where: "(project_id IS NOT NULL)", using: :btree
 
   create_table "issue_assignees", id: false, force: :cascade do |t|
     t.integer "user_id", null: false
@@ -2113,6 +2115,7 @@ ActiveRecord::Schema.define(version: 20180418053107) do
   add_foreign_key "gpg_signatures", "gpg_keys", on_delete: :nullify
   add_foreign_key "gpg_signatures", "projects", on_delete: :cascade
   add_foreign_key "group_custom_attributes", "namespaces", column: "group_id", on_delete: :cascade
+  add_foreign_key "internal_ids", "namespaces", name: "fk_162941d509", on_delete: :cascade
   add_foreign_key "internal_ids", "projects", on_delete: :cascade
   add_foreign_key "issue_assignees", "issues", name: "fk_b7d881734a", on_delete: :cascade
   add_foreign_key "issue_assignees", "users", name: "fk_5e0c8d9154", on_delete: :cascade
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index ac30cd27e0c..aee70bcfb29 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -16,6 +16,15 @@ describe Deployment do
   it { is_expected.to validate_presence_of(:ref) }
   it { is_expected.to validate_presence_of(:sha) }
 
+  describe 'modules' do
+    it_behaves_like 'AtomicInternalId' do
+      let(:internal_id_attribute) { :iid }
+      let(:instance) { build(:deployment) }
+      let(:scope_attrs) { { project: instance.project } }
+      let(:usage) { :deployments }
+    end
+  end
+
   describe 'after_create callbacks' do
     let(:environment) { create(:environment) }
     let(:store) { Gitlab::EtagCaching::Store.new }
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index f73f44ca0ad..becb146422e 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -17,11 +17,17 @@ describe MergeRequest do
   describe 'modules' do
     subject { described_class }
 
-    it { is_expected.to include_module(NonatomicInternalId) }
     it { is_expected.to include_module(Issuable) }
     it { is_expected.to include_module(Referable) }
     it { is_expected.to include_module(Sortable) }
     it { is_expected.to include_module(Taskable) }
+
+    it_behaves_like 'AtomicInternalId' do
+      let(:internal_id_attribute) { :iid }
+      let(:instance) { build(:merge_request) }
+      let(:scope_attrs) { { project: instance.target_project } }
+      let(:usage) { :merge_requests }
+    end
   end
 
   describe 'validation' do
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index c7460981a32..4bb9717d33e 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -1,6 +1,26 @@
 require 'spec_helper'
 
 describe Milestone do
+  describe 'modules' do
+    context 'with a project' do
+      it_behaves_like 'AtomicInternalId' do
+        let(:internal_id_attribute) { :iid }
+        let(:instance) { build(:milestone, project: build(:project), group: nil) }
+        let(:scope_attrs) { { project: instance.project } }
+        let(:usage) { :milestones }
+      end
+    end
+
+    context 'with a group' do
+      it_behaves_like 'AtomicInternalId' do
+        let(:internal_id_attribute) { :iid }
+        let(:instance) { build(:milestone, project: nil, group: build(:group)) }
+        let(:scope_attrs) { { namespace: instance.group } }
+        let(:usage) { :milestones }
+      end
+    end
+  end
+
   describe "Validation" do
     before do
       allow(subject).to receive(:set_iid).and_return(false)
diff --git a/spec/support/shared_examples/models/atomic_internal_id_spec.rb b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
index 144af4fc475..6a6e13418a9 100644
--- a/spec/support/shared_examples/models/atomic_internal_id_spec.rb
+++ b/spec/support/shared_examples/models/atomic_internal_id_spec.rb
@@ -19,6 +19,14 @@ shared_examples_for 'AtomicInternalId' do
       it { is_expected.to validate_numericality_of(internal_id_attribute) }
     end
 
+    describe 'Creating an instance' do
+      subject { instance.save! }
+
+      it 'saves a new instance properly' do
+        expect { subject }.not_to raise_error
+      end
+    end
+
     describe 'internal id generation' do
       subject { instance.save! }
 
-- 
cgit v1.2.3


From cdb5f98506aa3ca847aaf0dbcab1ef97010c29b9 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 20 Apr 2018 09:09:01 -0700
Subject: Downgrade MySQL CI service from 8.0 to 5.7

MySQL 8.0 made the default authentication mode `caching_sha2_password`, and
this breaks our CI builds at the moment. Downgrade until we can figure
out how to support this.

Closes #45606
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f97feca9f7b..87c3944dcce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ stages:
 
 .use-mysql: &use-mysql
   services:
-    - mysql:latest
+    - mysql:5.7
     - redis:alpine
 
 .rails5-variables: &rails5-variables
-- 
cgit v1.2.3


From 49518bc62526763c392ed214f4d26d5113470cbc Mon Sep 17 00:00:00 2001
From: Lukas Eipert <git@leipert.io>
Date: Fri, 20 Apr 2018 17:34:43 +0000
Subject: Dedupe yarn dependencies

---
 yarn.lock | 289 ++++++++------------------------------------------------------
 1 file changed, 37 insertions(+), 252 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 55a86a9a577..f05278cfde5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -77,14 +77,7 @@ abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
-accepts@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
-  dependencies:
-    mime-types "~2.1.11"
-    negotiator "0.6.1"
-
-accepts@~1.3.4:
+accepts@~1.3.3, accepts@~1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
   dependencies:
@@ -118,11 +111,7 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
-
-acorn@^5.2.1, acorn@^5.3.0, acorn@^5.4.1:
+acorn@^5.0.0, acorn@^5.2.1, acorn@^5.3.0, acorn@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
@@ -160,16 +149,7 @@ ajv@^4.7.0, ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    json-schema-traverse "^0.3.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^5.1.0:
+ajv@^5.0.0, ajv@^5.1.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -242,7 +222,7 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0, ansi-styles@^3.2.0:
+ansi-styles@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
   dependencies:
@@ -420,13 +400,7 @@ async@1.x, async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.2, async@^2.1.4:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
-  dependencies:
-    lodash "^4.14.0"
-
-async@^2.4.1:
+async@^2.1.2, async@^2.1.4, async@^2.4.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -1196,11 +1170,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.1.1:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
-
-bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1:
+bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1268,14 +1238,7 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-brace-expansion@^1.0.0, brace-expansion@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace-expansion@^1.1.7:
+brace-expansion@^1.0.0, brace-expansion@^1.1.7, brace-expansion@^1.1.8:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -1621,15 +1584,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
-chalk@^2.3.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
   dependencies:
@@ -2027,18 +1982,10 @@ copy-webpack-plugin@^4.4.1:
     p-limit "^1.0.0"
     serialize-javascript "^1.4.0"
 
-core-js@^2.2.0:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
-core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
-
-core-js@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
-
 core-js@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
@@ -2117,7 +2064,7 @@ cryptiles@3.x.x:
   dependencies:
     boom "5.x.x"
 
-crypto-browserify@^3.0.0:
+crypto-browserify@^3.0.0, crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
   dependencies:
@@ -2133,21 +2080,6 @@ crypto-browserify@^3.0.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-browserify@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -2401,7 +2333,7 @@ de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
 
-debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@~2.6.4, debug@~2.6.6:
+debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -2413,7 +2345,7 @@ debug@2.2.0, debug@~2.2.0:
   dependencies:
     ms "0.7.1"
 
-debug@2.6.8, debug@^2.1.1, debug@^2.6.6, debug@^2.6.8:
+debug@2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
@@ -2764,13 +2696,7 @@ encodeurl@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
-end-of-stream@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
-  dependencies:
-    once "^1.4.0"
-
-end-of-stream@^1.1.0:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   dependencies:
@@ -3095,14 +3021,7 @@ eslint@^3.18.0:
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-espree@^3.4.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.0.tgz#98358625bdd055861ea27e2867ea729faf463d8d"
-  dependencies:
-    acorn "^5.1.1"
-    acorn-jsx "^3.0.0"
-
-espree@^3.5.2:
+espree@^3.4.0, espree@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
   dependencies:
@@ -3730,18 +3649,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -4228,11 +4136,7 @@ ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
-ignore@^3.2.0:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
-
-ignore@^3.3.5, ignore@^3.3.7:
+ignore@^3.2.0, ignore@^3.3.5, ignore@^3.3.7:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
@@ -4424,14 +4328,10 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.0:
+is-buffer@^1.1.0, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
-is-buffer@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
-
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -4547,16 +4447,7 @@ is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
 
-is-my-json-valid@^2.10.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-my-json-valid@^2.12.4:
+is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
   version "2.17.2"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
   dependencies:
@@ -4732,10 +4623,6 @@ isbinaryfile@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
 
-isexe@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -5298,7 +5185,7 @@ lodash.words@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.words/-/lodash.words-4.2.0.tgz#5ecfeaf8ecf8acaa8e0c8386295f1993c9cf4036"
 
-lodash@4.17.4, lodash@^4.11.1, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.3.0:
+lodash@4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -5306,7 +5193,7 @@ lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
@@ -5534,15 +5421,11 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.29.0 < 2":
-  version "1.29.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
-
-mime-db@~1.33.0:
+"mime-db@>= 1.29.0 < 2", mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
+mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
   version "2.1.18"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
@@ -6100,16 +5983,12 @@ p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
-p-limit@^1.0.0:
+p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
-
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -6167,11 +6046,7 @@ pako@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
 
-pako@~1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.5.tgz#d2205dfe5b9da8af797e7c163db4d1f84e4600bc"
-
-pako@~1.0.5:
+pako@~1.0.2, pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
 
@@ -6649,7 +6524,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.1:
+postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.8:
   version "6.0.19"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
   dependencies:
@@ -6657,22 +6532,6 @@ postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^5.2.0"
 
-postcss@^6.0.14:
-  version "6.0.15"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.15.tgz#f460cd6269fede0d1bf6defff0b934a9845d974d"
-  dependencies:
-    chalk "^2.3.0"
-    source-map "^0.6.1"
-    supports-color "^5.1.0"
-
-postcss@^6.0.8:
-  version "6.0.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.14.tgz#5534c72114739e75d0afcf017db853099f562885"
-  dependencies:
-    chalk "^2.3.0"
-    source-map "^0.6.1"
-    supports-color "^4.4.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6685,14 +6544,10 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@1.11.1:
+prettier@1.11.1, prettier@^1.7.0:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
 
-prettier@^1.7.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.2.tgz#bff83e7fd573933c607875e5ba3abbdffb96aeb8"
-
 prismjs@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz#118d95fb7a66dba2272e343b345f5236659db365"
@@ -6711,11 +6566,7 @@ process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
-process@^0.11.0:
-  version "0.11.9"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
-
-process@~0.11.0:
+process@^0.11.0, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
@@ -6894,16 +6745,7 @@ raw-loader@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
 
-rc@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-rc@^1.1.6, rc@^1.1.7:
+rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
   dependencies:
@@ -6975,7 +6817,7 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.3.0, readable-stream@^2.3.3:
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
   dependencies:
@@ -6996,19 +6838,7 @@ readable-stream@1.1.x, "readable-stream@1.x >=1.1.9":
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.1.0, readable-stream@^2.2.2, readable-stream@^2.2.9:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@~2.0.0, readable-stream@~2.0.5, readable-stream@~2.0.6:
+readable-stream@~2.0.0, readable-stream@~2.0.5, readable-stream@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
@@ -7350,18 +7180,12 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
-rimraf@^2.2.8:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
-  dependencies:
-    glob "^7.0.5"
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
@@ -7464,11 +7288,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -7937,7 +7757,7 @@ stream-each@^1.1.0:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
 
-stream-http@^2.0.0:
+stream-http@^2.0.0, stream-http@^2.3.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
   dependencies:
@@ -7947,16 +7767,6 @@ stream-http@^2.0.0:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
-stream-http@^2.3.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.3.tgz#4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.1.0"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -7989,14 +7799,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -8076,25 +7879,13 @@ supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0, supports-color@^4.4.0:
+supports-color@^4.2.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^5.2.0:
+supports-color@^5.1.0, supports-color@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
   dependencies:
@@ -8828,13 +8619,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.1.1, which@^1.2.1, which@^1.2.9:
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
-  dependencies:
-    isexe "^1.1.1"
-
-which@^1.2.14:
+which@^1.1.1, which@^1.2.1, which@^1.2.14, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
-- 
cgit v1.2.3


From e40bc1b190f51ca42ac12d79b87a0338f2ab0357 Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Wed, 11 Apr 2018 12:04:35 -0500
Subject: Create autodevops settings sections

---
 app/presenters/project_presenter.rb                |  2 +-
 app/views/projects/empty.html.haml                 |  2 +-
 .../settings/ci_cd/_autodevops_form.html.haml      | 40 ++++++++++++++
 app/views/projects/settings/ci_cd/_form.html.haml  | 38 -------------
 app/views/projects/settings/ci_cd/show.html.haml   | 16 +++++-
 app/views/shared/_auto_devops_callout.html.haml    |  2 +-
 ...43466-make-auto-devops-settings-first-class.yml |  5 ++
 .../projects/settings/pipelines_settings_spec.rb   | 24 ++++++---
 .../show/user_sees_setup_shortcut_buttons_spec.rb  |  8 +--
 spec/javascripts/settings_panels_spec.js           |  4 +-
 spec/presenters/project_presenter_spec.rb          |  2 +-
 .../ci_cd/_autodevops_form.html.haml_spec.rb       | 62 ++++++++++++++++++++++
 .../settings/ci_cd/_form.html.haml_spec.rb         | 62 ----------------------
 13 files changed, 148 insertions(+), 119 deletions(-)
 create mode 100644 app/views/projects/settings/ci_cd/_autodevops_form.html.haml
 create mode 100644 changelogs/unreleased/43466-make-auto-devops-settings-first-class.yml
 create mode 100644 spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
 delete mode 100644 spec/views/projects/settings/ci_cd/_form.html.haml_spec.rb

diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 484ac64580d..5313d1df125 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -260,7 +260,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
     if current_user && can?(current_user, :admin_pipeline, project) && repository.gitlab_ci_yml.blank? && !show_auto_devops_callout
       OpenStruct.new(enabled: auto_devops_enabled?,
                      label: auto_devops_enabled? ? _('Auto DevOps enabled') : _('Enable Auto DevOps'),
-                     link: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+                     link: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
     elsif auto_devops_enabled?
       OpenStruct.new(enabled: true,
                      label: _('Auto DevOps enabled'),
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index b15fe514a08..a417960a2de 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -22,7 +22,7 @@
 
       %hr
       %p
-        - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps (Beta)'), project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings'))
+        - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps (Beta)'), project_settings_ci_cd_path(@project, anchor: 'js-autodevops-settings'))
         - link_to_add_kubernetes_cluster = link_to(s_('AutoDevOps|add a Kubernetes cluster'), new_project_cluster_path(@project))
         = s_('AutoDevOps|You can automatically build and test your application if you %{link_to_auto_devops_settings} for this project. You can automatically deploy it as well, if you %{link_to_add_kubernetes_cluster}.').html_safe % { link_to_auto_devops_settings: link_to_auto_devops_settings, link_to_add_kubernetes_cluster: link_to_add_kubernetes_cluster }
 
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
new file mode 100644
index 00000000000..347bb4cded3
--- /dev/null
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -0,0 +1,40 @@
+.row.prepend-top-default
+  .col-lg-12
+    = form_for @project, url: project_settings_ci_cd_path(@project) do |f|
+      = form_errors(@project)
+      %fieldset.builds-feature
+        .form-group
+          - message = auto_devops_warning_message(@project)
+          - if message
+            %p.settings-message.text-center
+              = message.html_safe
+          = f.fields_for :auto_devops_attributes, @auto_devops do |form|
+            .radio
+              = form.label :enabled_true do
+                = form.radio_button :enabled, 'true'
+                %strong Enable Auto DevOps
+                %br
+                %span.descr
+                  The Auto DevOps pipeline configuration will be used when there is no <code>.gitlab-ci.yml</code> in the project.
+
+            .radio
+              = form.label :enabled_false do
+                = form.radio_button :enabled, 'false'
+                %strong Disable Auto DevOps
+                %br
+                %span.descr
+                  An explicit <code>.gitlab-ci.yml</code> needs to be specified before you can begin using Continuous Integration and Delivery.
+
+            .radio
+              = form.label :enabled_ do
+                = form.radio_button :enabled, ''
+                %strong Instance default (#{Gitlab::CurrentSettings.auto_devops_enabled? ? 'enabled' : 'disabled'})
+                %br
+                %span.descr
+                  Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific <code>.gitlab-ci.yml</code>.
+
+              %p.prepend-top-10.append-bottom-10
+                You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.
+              = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
+
+          = f.submit 'Save changes', class: "btn btn-save prepend-top-15"
diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml
index 20868f9ba5d..80c226ad273 100644
--- a/app/views/projects/settings/ci_cd/_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_form.html.haml
@@ -3,44 +3,6 @@
     = form_for @project, url: project_settings_ci_cd_path(@project) do |f|
       = form_errors(@project)
       %fieldset.builds-feature
-        .form-group
-          %h5 Auto DevOps (Beta)
-          %p
-            Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.
-            = link_to 'Learn more about Auto DevOps', help_page_path('topics/autodevops/index.md')
-            - message = auto_devops_warning_message(@project)
-            - if message
-              %p.settings-message.text-center
-                = message.html_safe
-          = f.fields_for :auto_devops_attributes, @auto_devops do |form|
-            .radio
-              = form.label :enabled_true do
-                = form.radio_button :enabled, 'true'
-                %strong Enable Auto DevOps
-                %br
-                %span.descr
-                  The Auto DevOps pipeline configuration will be used when there is no <code>.gitlab-ci.yml</code> in the project.
-
-            .radio
-              = form.label :enabled_false do
-                = form.radio_button :enabled, 'false'
-                %strong Disable Auto DevOps
-                %br
-                %span.descr
-                  An explicit <code>.gitlab-ci.yml</code> needs to be specified before you can begin using Continuous Integration and Delivery.
-
-            .radio
-              = form.label :enabled_ do
-                = form.radio_button :enabled, ''
-                %strong Instance default (#{Gitlab::CurrentSettings.auto_devops_enabled? ? 'enabled' : 'disabled'})
-                %br
-                %span.descr
-                  Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific <code>.gitlab-ci.yml</code>.
-            %p
-              You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.
-            = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
-
-        %hr
         .form-group.append-bottom-default.js-secret-runner-token
           = f.label :runners_token, "Runner token", class: 'label-light'
           .form-control.js-secret-value-placeholder
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index 09268c9943b..7ff3b1986b8 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -5,17 +5,29 @@
 - expanded = Rails.env.test?
 - general_expanded = @project.errors.empty? ? expanded : true
 
-%section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) }
+%section.settings.general-ci-settings.no-animate{ class: ('expanded' if general_expanded) }
   .settings-header
     %h4
       General pipelines settings
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Update your CI/CD configuration, like job timeout or Auto DevOps.
+      Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report.
   .settings-content
     = render 'form'
 
+%section.settings#js-autodevops-settings.autodevops-settings.no-animate{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      Auto DevOps (Beta)
+    %button.btn.js-settings-toggle{ type: 'button' }
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.
+      = link_to 'Learn more about Auto DevOps', help_page_path('topics/autodevops/index.md')
+  .settings-content
+    = render 'autodevops_form'
+
 %section.settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
diff --git a/app/views/shared/_auto_devops_callout.html.haml b/app/views/shared/_auto_devops_callout.html.haml
index e9ac192f5f7..c6c8549ee81 100644
--- a/app/views/shared/_auto_devops_callout.html.haml
+++ b/app/views/shared/_auto_devops_callout.html.haml
@@ -9,7 +9,7 @@
       - link = link_to(s_('AutoDevOps|Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer')
       = s_('AutoDevOps|Learn more in the %{link_to_documentation}').html_safe % { link_to_documentation: link }
     .banner-buttons
-      = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings'), class: 'btn js-close-callout'
+      = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-autodevops-settings'), class: 'btn js-close-callout'
 
   %button.btn-transparent.banner-close.close.js-close-callout{ type: 'button',
   'aria-label' => 'Dismiss Auto DevOps box' }
diff --git a/changelogs/unreleased/43466-make-auto-devops-settings-first-class.yml b/changelogs/unreleased/43466-make-auto-devops-settings-first-class.yml
new file mode 100644
index 00000000000..f5c5415159c
--- /dev/null
+++ b/changelogs/unreleased/43466-make-auto-devops-settings-first-class.yml
@@ -0,0 +1,5 @@
+---
+title: Create settings section for autodevops
+merge_request: 18321
+author:
+type: changed
diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index d9020333f28..340a5b222ee 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -27,10 +27,14 @@ describe "Projects > Settings > Pipelines settings" do
       visit project_settings_ci_cd_path(project)
 
       fill_in('Test coverage parsing', with: 'coverage_regex')
-      click_on 'Save changes'
+      page.within '.general-ci-settings' do
+        click_on 'Save changes'
+      end
 
       expect(page.status_code).to eq(200)
-      expect(page).to have_button('Save changes', disabled: false)
+      page.within '.general-ci-settings' do
+        expect(page).to have_button('Save changes', disabled: false)
+      end
       expect(page).to have_field('Test coverage parsing', with: 'coverage_regex')
     end
 
@@ -38,10 +42,14 @@ describe "Projects > Settings > Pipelines settings" do
       visit project_settings_ci_cd_path(project)
 
       page.check('Auto-cancel redundant, pending pipelines')
-      click_on 'Save changes'
+      page.within '.general-ci-settings' do
+        click_on 'Save changes'
+      end
 
       expect(page.status_code).to eq(200)
-      expect(page).to have_button('Save changes', disabled: false)
+      page.within '.general-ci-settings' do
+        expect(page).to have_button('Save changes', disabled: false)
+      end
 
       checkbox = find_field('project_auto_cancel_pending_pipelines')
       expect(checkbox).to be_checked
@@ -51,9 +59,11 @@ describe "Projects > Settings > Pipelines settings" do
       it 'update auto devops settings' do
         visit project_settings_ci_cd_path(project)
 
-        fill_in('project_auto_devops_attributes_domain', with: 'test.com')
-        page.choose('project_auto_devops_attributes_enabled_false')
-        click_on 'Save changes'
+        page.within '.autodevops-settings' do
+          fill_in('project_auto_devops_attributes_domain', with: 'test.com')
+          page.choose('project_auto_devops_attributes_enabled_false')
+          click_on 'Save changes'
+        end
 
         expect(page.status_code).to eq(200)
         expect(project.auto_devops).to be_present
diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
index a906fa20233..044cce75c00 100644
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -65,7 +65,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
       describe 'Auto DevOps button' do
         it '"Enable Auto DevOps" button linked to settings page' do
           page.within('.project-stats') do
-            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
           end
         end
 
@@ -75,7 +75,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
           visit project_path(project)
 
           page.within('.project-stats') do
-            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
           end
         end
       end
@@ -212,7 +212,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
       describe 'Auto DevOps button' do
         it '"Enable Auto DevOps" button linked to settings page' do
           page.within('.project-stats') do
-            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
           end
         end
 
@@ -222,7 +222,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
           visit project_path(project)
 
           page.within('.project-stats') do
-            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
           end
         end
 
diff --git a/spec/javascripts/settings_panels_spec.js b/spec/javascripts/settings_panels_spec.js
index d433f8c3e07..b22ef7373b3 100644
--- a/spec/javascripts/settings_panels_spec.js
+++ b/spec/javascripts/settings_panels_spec.js
@@ -13,9 +13,9 @@ describe('Settings Panels', () => {
     });
 
     it('should expand linked hash fragment panel', () => {
-      location.hash = '#js-general-pipeline-settings';
+      location.hash = '#js-autodevops-settings';
 
-      const pipelineSettingsPanel = document.querySelector('#js-general-pipeline-settings');
+      const pipelineSettingsPanel = document.querySelector('#js-autodevops-settings');
       // Our test environment automatically expands everything so we need to clear that out first
       pipelineSettingsPanel.classList.remove('expanded');
 
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index 55962f345d4..4c58817b349 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -321,7 +321,7 @@ describe ProjectPresenter do
 
           expect(presenter.autodevops_anchor_data).to eq(OpenStruct.new(enabled: false,
                                                                         label: 'Enable Auto DevOps',
-                                                                        link: presenter.project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings')))
+                                                                        link: presenter.project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings')))
         end
       end
     end
diff --git a/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb b/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
new file mode 100644
index 00000000000..d15391911c1
--- /dev/null
+++ b/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe 'projects/settings/ci_cd/_autodevops_form' do
+  let(:project) { create(:project, :repository) }
+
+  before do
+    assign :project, project
+  end
+
+  context 'when kubernetes is not active' do
+    context 'when auto devops domain is not defined' do
+      it 'shows warning message' do
+        render
+
+        expect(rendered).to have_css('.settings-message')
+        expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a domain name and a')
+        expect(rendered).to have_link('Kubernetes cluster')
+      end
+    end
+
+    context 'when auto devops domain is defined' do
+      before do
+        project.build_auto_devops(domain: 'example.com')
+      end
+
+      it 'shows warning message' do
+        render
+
+        expect(rendered).to have_css('.settings-message')
+        expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a')
+        expect(rendered).to have_link('Kubernetes cluster')
+      end
+    end
+  end
+
+  context 'when kubernetes is active' do
+    before do
+      create(:kubernetes_service, project: project)
+    end
+
+    context 'when auto devops domain is not defined' do
+      it 'shows warning message' do
+        render
+
+        expect(rendered).to have_css('.settings-message')
+        expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a domain name to work correctly.')
+      end
+    end
+
+    context 'when auto devops domain is defined' do
+      before do
+        project.build_auto_devops(domain: 'example.com')
+      end
+
+      it 'does not show warning message' do
+        render
+
+        expect(rendered).not_to have_css('.settings-message')
+      end
+    end
+  end
+end
diff --git a/spec/views/projects/settings/ci_cd/_form.html.haml_spec.rb b/spec/views/projects/settings/ci_cd/_form.html.haml_spec.rb
deleted file mode 100644
index be9a4d9c57c..00000000000
--- a/spec/views/projects/settings/ci_cd/_form.html.haml_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'spec_helper'
-
-describe 'projects/settings/ci_cd/_form' do
-  let(:project) { create(:project, :repository) }
-
-  before do
-    assign :project, project
-  end
-
-  context 'when kubernetes is not active' do
-    context 'when auto devops domain is not defined' do
-      it 'shows warning message' do
-        render
-
-        expect(rendered).to have_css('.settings-message')
-        expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a domain name and a')
-        expect(rendered).to have_link('Kubernetes cluster')
-      end
-    end
-
-    context 'when auto devops domain is defined' do
-      before do
-        project.build_auto_devops(domain: 'example.com')
-      end
-
-      it 'shows warning message' do
-        render
-
-        expect(rendered).to have_css('.settings-message')
-        expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a')
-        expect(rendered).to have_link('Kubernetes cluster')
-      end
-    end
-  end
-
-  context 'when kubernetes is active' do
-    before do
-      create(:kubernetes_service, project: project)
-    end
-
-    context 'when auto devops domain is not defined' do
-      it 'shows warning message' do
-        render
-
-        expect(rendered).to have_css('.settings-message')
-        expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a domain name to work correctly.')
-      end
-    end
-
-    context 'when auto devops domain is defined' do
-      before do
-        project.build_auto_devops(domain: 'example.com')
-      end
-
-      it 'does not show warning message' do
-        render
-
-        expect(rendered).not_to have_css('.settings-message')
-      end
-    end
-  end
-end
-- 
cgit v1.2.3


From 4745361c1f714812d6d07ba5b8a1dc686e9e74e4 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Thu, 12 Apr 2018 10:51:25 -0500
Subject: Ensure an autodevops instance exists for pipelines settings

---
 spec/features/projects/settings/pipelines_settings_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index 340a5b222ee..03e24471621 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -8,6 +8,7 @@ describe "Projects > Settings > Pipelines settings" do
   before do
     sign_in(user)
     project.add_role(user, role)
+    create(:project_auto_devops, project: project)
   end
 
   context 'for developer' do
@@ -27,14 +28,17 @@ describe "Projects > Settings > Pipelines settings" do
       visit project_settings_ci_cd_path(project)
 
       fill_in('Test coverage parsing', with: 'coverage_regex')
+
       page.within '.general-ci-settings' do
         click_on 'Save changes'
       end
 
       expect(page.status_code).to eq(200)
+
       page.within '.general-ci-settings' do
         expect(page).to have_button('Save changes', disabled: false)
       end
+
       expect(page).to have_field('Test coverage parsing', with: 'coverage_regex')
     end
 
@@ -47,6 +51,7 @@ describe "Projects > Settings > Pipelines settings" do
       end
 
       expect(page.status_code).to eq(200)
+
       page.within '.general-ci-settings' do
         expect(page).to have_button('Save changes', disabled: false)
       end
@@ -68,6 +73,7 @@ describe "Projects > Settings > Pipelines settings" do
         expect(page.status_code).to eq(200)
         expect(project.auto_devops).to be_present
         expect(project.auto_devops).not_to be_enabled
+        expect(project.auto_devops.domain).to eq('test.com')
       end
     end
   end
-- 
cgit v1.2.3


From ea7127dea929bd47b9142f1550841e196898b7b3 Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Tue, 17 Apr 2018 11:37:16 -0500
Subject: Changed anchor not to have the js prefix, add i18n

---
 app/presenters/project_presenter.rb                |  2 +-
 app/views/projects/empty.html.haml                 |  2 +-
 .../settings/ci_cd/_autodevops_form.html.haml      | 26 +++++++++++-----------
 app/views/projects/settings/ci_cd/show.html.haml   | 14 ++++++------
 app/views/shared/_auto_devops_callout.html.haml    |  2 +-
 .../projects/settings/pipelines_settings_spec.rb   | 10 ++++-----
 .../show/user_sees_setup_shortcut_buttons_spec.rb  |  8 +++----
 spec/javascripts/settings_panels_spec.js           |  4 ++--
 spec/presenters/project_presenter_spec.rb          |  2 +-
 9 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 5313d1df125..63ead5538cb 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -260,7 +260,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
     if current_user && can?(current_user, :admin_pipeline, project) && repository.gitlab_ci_yml.blank? && !show_auto_devops_callout
       OpenStruct.new(enabled: auto_devops_enabled?,
                      label: auto_devops_enabled? ? _('Auto DevOps enabled') : _('Enable Auto DevOps'),
-                     link: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+                     link: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
     elsif auto_devops_enabled?
       OpenStruct.new(enabled: true,
                      label: _('Auto DevOps enabled'),
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index a417960a2de..2f69da593cd 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -22,7 +22,7 @@
 
       %hr
       %p
-        - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps (Beta)'), project_settings_ci_cd_path(@project, anchor: 'js-autodevops-settings'))
+        - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps (Beta)'), project_settings_ci_cd_path(@project, anchor: 'autodevops-settings'))
         - link_to_add_kubernetes_cluster = link_to(s_('AutoDevOps|add a Kubernetes cluster'), new_project_cluster_path(@project))
         = s_('AutoDevOps|You can automatically build and test your application if you %{link_to_auto_devops_settings} for this project. You can automatically deploy it as well, if you %{link_to_add_kubernetes_cluster}.').html_safe % { link_to_auto_devops_settings: link_to_auto_devops_settings, link_to_add_kubernetes_cluster: link_to_add_kubernetes_cluster }
 
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
index 347bb4cded3..7b410101c05 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -5,6 +5,7 @@
       %fieldset.builds-feature
         .form-group
           - message = auto_devops_warning_message(@project)
+          - ci_file_formatted = '<code>.gitlab-ci.yml</code>'.html_safe
           - if message
             %p.settings-message.text-center
               = message.html_safe
@@ -12,29 +13,28 @@
             .radio
               = form.label :enabled_true do
                 = form.radio_button :enabled, 'true'
-                %strong Enable Auto DevOps
+                %strong= s_('CICD|Enable Auto DevOps')
                 %br
-                %span.descr
-                  The Auto DevOps pipeline configuration will be used when there is no <code>.gitlab-ci.yml</code> in the project.
+                = s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted }
 
             .radio
               = form.label :enabled_false do
                 = form.radio_button :enabled, 'false'
-                %strong Disable Auto DevOps
+                %strong= s_('CICD|Disable Auto DevOps')
                 %br
-                %span.descr
-                  An explicit <code>.gitlab-ci.yml</code> needs to be specified before you can begin using Continuous Integration and Delivery.
+                = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted }
 
             .radio
               = form.label :enabled_ do
                 = form.radio_button :enabled, ''
-                %strong Instance default (#{Gitlab::CurrentSettings.auto_devops_enabled? ? 'enabled' : 'disabled'})
+                %strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" }
                 %br
-                %span.descr
-                  Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific <code>.gitlab-ci.yml</code>.
+                = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted }
 
-              %p.prepend-top-10.append-bottom-10
-                You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.
-              = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
+            = form.label :domain, class:"prepend-top-10" do
+              = _('Domain')
+            = 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.')
 
-          = f.submit 'Save changes', class: "btn btn-save prepend-top-15"
+          = f.submit 'Save changes', class: "btn btn-success prepend-top-15"
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index 7ff3b1986b8..5f596a019f7 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -5,7 +5,7 @@
 - expanded = Rails.env.test?
 - general_expanded = @project.errors.empty? ? expanded : true
 
-%section.settings.general-ci-settings.no-animate{ class: ('expanded' if general_expanded) }
+%section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) }
   .settings-header
     %h4
       General pipelines settings
@@ -16,15 +16,15 @@
   .settings-content
     = render 'form'
 
-%section.settings#js-autodevops-settings.autodevops-settings.no-animate{ class: ('expanded' if expanded) }
+%section.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Auto DevOps (Beta)
-    %button.btn.js-settings-toggle{ type: 'button' }
-      = expanded ? 'Collapse' : 'Expand'
+      = s_('CICD|Auto DevOps (Beta)')
+    %button.btn.btn-default.js-settings-toggle{ type: 'button' }
+      = expanded ? _('Collapse') : _('Expand')
     %p
-      Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.
-      = link_to 'Learn more about Auto DevOps', help_page_path('topics/autodevops/index.md')
+      = s_('CICD|Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.')
+      = link_to s_('CICD|Learn more about Auto DevOps'), help_page_path('topics/autodevops/index.md')
   .settings-content
     = render 'autodevops_form'
 
diff --git a/app/views/shared/_auto_devops_callout.html.haml b/app/views/shared/_auto_devops_callout.html.haml
index c6c8549ee81..d3fa324e460 100644
--- a/app/views/shared/_auto_devops_callout.html.haml
+++ b/app/views/shared/_auto_devops_callout.html.haml
@@ -9,7 +9,7 @@
       - link = link_to(s_('AutoDevOps|Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer')
       = s_('AutoDevOps|Learn more in the %{link_to_documentation}').html_safe % { link_to_documentation: link }
     .banner-buttons
-      = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-autodevops-settings'), class: 'btn js-close-callout'
+      = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'autodevops-settings'), class: 'btn js-close-callout'
 
   %button.btn-transparent.banner-close.close.js-close-callout{ type: 'button',
   'aria-label' => 'Dismiss Auto DevOps box' }
diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index 03e24471621..e875a88a52b 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -29,13 +29,13 @@ describe "Projects > Settings > Pipelines settings" do
 
       fill_in('Test coverage parsing', with: 'coverage_regex')
 
-      page.within '.general-ci-settings' do
+      page.within '#js-general-pipeline-settings' do
         click_on 'Save changes'
       end
 
       expect(page.status_code).to eq(200)
 
-      page.within '.general-ci-settings' do
+      page.within '#js-general-pipeline-settings' do
         expect(page).to have_button('Save changes', disabled: false)
       end
 
@@ -46,13 +46,13 @@ describe "Projects > Settings > Pipelines settings" do
       visit project_settings_ci_cd_path(project)
 
       page.check('Auto-cancel redundant, pending pipelines')
-      page.within '.general-ci-settings' do
+      page.within '#js-general-pipeline-settings' do
         click_on 'Save changes'
       end
 
       expect(page.status_code).to eq(200)
 
-      page.within '.general-ci-settings' do
+      page.within '#js-general-pipeline-settings' do
         expect(page).to have_button('Save changes', disabled: false)
       end
 
@@ -64,7 +64,7 @@ describe "Projects > Settings > Pipelines settings" do
       it 'update auto devops settings' do
         visit project_settings_ci_cd_path(project)
 
-        page.within '.autodevops-settings' do
+        page.within '#autodevops-settings' do
           fill_in('project_auto_devops_attributes_domain', with: 'test.com')
           page.choose('project_auto_devops_attributes_enabled_false')
           click_on 'Save changes'
diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
index 044cce75c00..e44361fbe26 100644
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -65,7 +65,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
       describe 'Auto DevOps button' do
         it '"Enable Auto DevOps" button linked to settings page' do
           page.within('.project-stats') do
-            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
           end
         end
 
@@ -75,7 +75,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
           visit project_path(project)
 
           page.within('.project-stats') do
-            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
           end
         end
       end
@@ -212,7 +212,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
       describe 'Auto DevOps button' do
         it '"Enable Auto DevOps" button linked to settings page' do
           page.within('.project-stats') do
-            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
           end
         end
 
@@ -222,7 +222,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
           visit project_path(project)
 
           page.within('.project-stats') do
-            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings'))
+            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings'))
           end
         end
 
diff --git a/spec/javascripts/settings_panels_spec.js b/spec/javascripts/settings_panels_spec.js
index b22ef7373b3..4fba36bd4de 100644
--- a/spec/javascripts/settings_panels_spec.js
+++ b/spec/javascripts/settings_panels_spec.js
@@ -13,9 +13,9 @@ describe('Settings Panels', () => {
     });
 
     it('should expand linked hash fragment panel', () => {
-      location.hash = '#js-autodevops-settings';
+      location.hash = '#autodevops-settings';
 
-      const pipelineSettingsPanel = document.querySelector('#js-autodevops-settings');
+      const pipelineSettingsPanel = document.querySelector('#autodevops-settings');
       // Our test environment automatically expands everything so we need to clear that out first
       pipelineSettingsPanel.classList.remove('expanded');
 
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index 4c58817b349..0a130c59037 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -321,7 +321,7 @@ describe ProjectPresenter do
 
           expect(presenter.autodevops_anchor_data).to eq(OpenStruct.new(enabled: false,
                                                                         label: 'Enable Auto DevOps',
-                                                                        link: presenter.project_settings_ci_cd_path(project, anchor: 'js-autodevops-settings')))
+                                                                        link: presenter.project_settings_ci_cd_path(project, anchor: 'autodevops-settings')))
         end
       end
     end
-- 
cgit v1.2.3


From a2071f2b8bd0888b5067dfd0c538e336280c5f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Thu, 19 Apr 2018 19:05:53 -0500
Subject: Fix missing namespace for some internal users

---
 ...king-ghost-user-or-gitlab-support-bot-in-ui.yml |  5 ++
 ..._create_missing_namespace_for_internal_users.rb | 66 ++++++++++++++++++++++
 ...te_missing_namespace_for_internal_users_spec.rb | 42 ++++++++++++++
 3 files changed, 113 insertions(+)
 create mode 100644 changelogs/unreleased/rd-44635-error-500-when-clicking-ghost-user-or-gitlab-support-bot-in-ui.yml
 create mode 100644 db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb
 create mode 100644 spec/migrations/create_missing_namespace_for_internal_users_spec.rb

diff --git a/changelogs/unreleased/rd-44635-error-500-when-clicking-ghost-user-or-gitlab-support-bot-in-ui.yml b/changelogs/unreleased/rd-44635-error-500-when-clicking-ghost-user-or-gitlab-support-bot-in-ui.yml
new file mode 100644
index 00000000000..a08a75ceda6
--- /dev/null
+++ b/changelogs/unreleased/rd-44635-error-500-when-clicking-ghost-user-or-gitlab-support-bot-in-ui.yml
@@ -0,0 +1,5 @@
+---
+title: Fix missing namespace for some internal users
+merge_request: 18357
+author:
+type: fixed
diff --git a/db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb b/db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb
new file mode 100644
index 00000000000..8fc558be733
--- /dev/null
+++ b/db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb
@@ -0,0 +1,66 @@
+class CreateMissingNamespaceForInternalUsers < ActiveRecord::Migration
+  DOWNTIME = false
+
+  def up
+    connection.exec_query(users_query.to_sql).rows.each do |id, username|
+      create_namespace(id, username)
+      # When testing locally I've noticed that these internal users are missing
+      # the notification email, for more details visit the below link:
+      # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18357#note_68327560
+      set_notification_email(id)
+    end
+  end
+
+  def down
+    # no-op
+  end
+
+  private
+
+  def users
+    @users ||= Arel::Table.new(:users)
+  end
+
+  def namespaces
+    @namespaces ||= Arel::Table.new(:namespaces)
+  end
+
+  def users_query
+    condition = users[:ghost].eq(true)
+
+    if column_exists?(:users, :support_bot)
+      condition = condition.or(users[:support_bot].eq(true))
+    end
+
+    users.join(namespaces, Arel::Nodes::OuterJoin)
+      .on(namespaces[:type].eq(nil).and(namespaces[:owner_id].eq(users[:id])))
+      .where(namespaces[:owner_id].eq(nil))
+      .where(condition)
+      .project(users[:id], users[:username])
+  end
+
+  def create_namespace(user_id, username)
+    path = Uniquify.new.string(username) do |str|
+      query = "SELECT id FROM namespaces WHERE parent_id IS NULL AND path='#{str}' LIMIT 1"
+      connection.exec_query(query).present?
+    end
+
+    insert_query = "INSERT INTO namespaces(owner_id, path, name) VALUES(#{user_id}, '#{path}', '#{path}')"
+    namespace_id = connection.insert_sql(insert_query)
+
+    create_route(namespace_id)
+  end
+
+  def create_route(namespace_id)
+    return unless namespace_id
+
+    row = connection.exec_query("SELECT id, path FROM namespaces WHERE id=#{namespace_id}").first
+    id, path = row.values_at('id', 'path')
+
+    execute("INSERT INTO routes(source_id, source_type, path, name) VALUES(#{id}, 'Namespace', '#{path}', '#{path}')")
+  end
+
+  def set_notification_email(user_id)
+    execute "UPDATE users SET notification_email = email WHERE notification_email IS NULL AND id = #{user_id}"
+  end
+end
diff --git a/spec/migrations/create_missing_namespace_for_internal_users_spec.rb b/spec/migrations/create_missing_namespace_for_internal_users_spec.rb
new file mode 100644
index 00000000000..ac3a4b1f68f
--- /dev/null
+++ b/spec/migrations/create_missing_namespace_for_internal_users_spec.rb
@@ -0,0 +1,42 @@
+require 'spec_helper'
+require Rails.root.join('db', 'migrate', '20180413022611_create_missing_namespace_for_internal_users.rb')
+
+describe CreateMissingNamespaceForInternalUsers, :migration do
+  let(:users) { table(:users) }
+  let(:namespaces) { table(:namespaces) }
+  let(:routes) { table(:routes) }
+
+  internal_user_types = [:ghost]
+  internal_user_types << :support_bot if ActiveRecord::Base.connection.column_exists?(:users, :support_bot)
+
+  internal_user_types.each do |attr|
+    context "for #{attr} user" do
+      let(:internal_user) do
+        users.create!(email: 'test@example.com', projects_limit: 100, username: 'test', attr => true)
+      end
+
+      it 'creates the missing namespace' do
+        expect(namespaces.find_by(owner_id: internal_user.id)).to be_nil
+
+        migrate!
+
+        namespace = Namespace.find_by(type: nil, owner_id: internal_user.id)
+        route = namespace.route
+
+        expect(namespace.path).to eq(route.path)
+        expect(namespace.name).to eq(route.name)
+      end
+
+      it 'sets notification email' do
+        users.update(internal_user.id, notification_email: nil)
+
+        expect(users.find(internal_user.id).notification_email).to be_nil
+
+        migrate!
+
+        user = users.find(internal_user.id)
+        expect(user.notification_email).to eq(user.email)
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 3327bf6247c9f99d373a31b10edbb3f6c0b868df Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Sun, 22 Apr 2018 10:42:44 -0500
Subject: Removes 'no job log' from trace action

'No job log' message is no longer necessary since we returned an image
when a build does not have a trace. See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18278 for more
details

Closes #45625
---
 app/controllers/projects/jobs_controller.rb              | 2 --
 changelogs/unreleased/45625-job-log-shows-no-job-log.yml | 5 +++++
 spec/controllers/projects/jobs_controller_spec.rb        | 5 +----
 3 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/45625-job-log-shows-no-job-log.yml

diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb
index 7497b5012ec..dd12d30a085 100644
--- a/app/controllers/projects/jobs_controller.rb
+++ b/app/controllers/projects/jobs_controller.rb
@@ -78,8 +78,6 @@ class Projects::JobsController < Projects::ApplicationController
             result.merge!(trace.to_h)
           end
 
-          result[:html] = result[:html].presence || 'No job log'
-
           render json: result
         end
       end
diff --git a/changelogs/unreleased/45625-job-log-shows-no-job-log.yml b/changelogs/unreleased/45625-job-log-shows-no-job-log.yml
new file mode 100644
index 00000000000..5f60e818cc1
--- /dev/null
+++ b/changelogs/unreleased/45625-job-log-shows-no-job-log.yml
@@ -0,0 +1,5 @@
+---
+title: Removes 'No Job log' message from build trace
+merge_request: 18523
+author:
+type: fixed
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index f677cec3408..b9a979044fe 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -190,10 +190,7 @@ describe Projects::JobsController do
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['id']).to eq job.id
         expect(json_response['status']).to eq job.status
-      end
-
-      it 'returns no job log message' do
-        expect(json_response['html']).to eq('No job log')
+        expect(json_response['html']).to be_nil
       end
     end
 
-- 
cgit v1.2.3


From 92acc463818ab3c1321fd62eb63eb1facfd2d14c Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Mon, 23 Apr 2018 15:09:48 +1100
Subject: Add missing changelog type to docs

---
 .../unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml     | 5 +++++
 doc/development/changelog.md                                         | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml

diff --git a/changelogs/unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml b/changelogs/unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml
new file mode 100644
index 00000000000..f8790fa45aa
--- /dev/null
+++ b/changelogs/unreleased/blackst0ne-add-missing-changelog-type-to-docs.yml
@@ -0,0 +1,5 @@
+---
+title: Add missing changelog type to docs
+merge_request: 18526
+author: "@blackst0ne"
+type: other
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index d5a4acff481..a9fa5ae834f 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -22,7 +22,7 @@ The `merge_request` value is a reference to a merge request that adds this
 entry, and the `author` key is used to give attribution to community
 contributors. **Both are optional**.
 The `type` field maps the category of the change,
-valid options are: added, fixed, changed, deprecated, removed, security, other. **Type field is mandatory**.
+valid options are: added, fixed, changed, deprecated, removed, security, performance, other. **Type field is mandatory**.
 
 Community contributors and core team members are encouraged to add their name to
 the `author` field. GitLab team members **should not**.
-- 
cgit v1.2.3


From 720bdfc4bdb277a56e1277962720191ac2bdbf1e Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Mon, 23 Apr 2018 04:15:10 +0000
Subject: fix revoke header on deploy token docs

---
 doc/user/project/deploy_tokens/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md
index 86fc58020e8..34154b69d2d 100644
--- a/doc/user/project/deploy_tokens/index.md
+++ b/doc/user/project/deploy_tokens/index.md
@@ -23,7 +23,7 @@ You can create as many deploy tokens as you like from the settings of your proje
 
 ![Personal access tokens page](img/deploy_tokens.png)
 
-## Revoking a personal access token
+## Revoking a deploy token
 
 At any time, you can revoke any deploy token by just clicking the
 respective **Revoke** button under the 'Active deploy tokens' area.
-- 
cgit v1.2.3


From 807b7a161d876e078b3f036465377da0c5de2a81 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Fri, 20 Apr 2018 13:02:42 +0200
Subject: Flowdock uses Gitaly, not Grit

Prior to this change, Flowdock used Grit to get the difference between
commits and post that to the remote service. This required direct path
access, which doesn't work with Gitaly.

Fixes gitlab-org/gitaly#1113
---
 app/models/project_services/flowdock_service.rb | 48 ++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb
index 4d23a17a545..da01ac1b7cf 100644
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
@@ -1,5 +1,51 @@
 require "flowdock-git-hook"
 
+# Flow dock depends on Grit to compute the number of commits between two given
+# commits. To make this depend on Gitaly, a monkey patch is applied
+module Flowdock
+  class Git
+    # pass down a Repository all the way down
+    def repo
+      @options[:repo]
+    end
+
+    def config
+      {}
+    end
+
+    def messages
+      Git::Builder.new(repo: repo,
+                       ref: @ref,
+                       before: @from,
+                       after: @to,
+                       commit_url: @commit_url,
+                       branch_url: @branch_url,
+                       diff_url: @diff_url,
+                       repo_url: @repo_url,
+                       repo_name: @repo_name,
+                       permanent_refs: @permanent_refs,
+                       tags: tags
+                      ).to_hashes
+    end
+
+    class Builder
+      def commits
+        @repo.commits_between(@before, @after).map do |commit|
+          {
+            url: @opts[:commit_url] ? @opts[:commit_url] % [commit.sha] : nil,
+            id: commit.sha,
+            message: commit.message,
+            author: {
+              name: commit.author_name,
+              email: commit.author_email
+            }
+          }
+        end
+      end
+    end
+  end
+end
+
 class FlowdockService < Service
   prop_accessor :token
   validates :token, presence: true, if: :activated?
@@ -34,7 +80,7 @@ class FlowdockService < Service
       data[:before],
       data[:after],
       token: token,
-      repo: project.repository.path_to_repo,
+      repo: project.repository,
       repo_url: "#{Gitlab.config.gitlab.url}/#{project.full_path}",
       commit_url: "#{Gitlab.config.gitlab.url}/#{project.full_path}/commit/%s",
       diff_url: "#{Gitlab.config.gitlab.url}/#{project.full_path}/compare/%s...%s"
-- 
cgit v1.2.3


From c62557b0f732f1bcf7263ea380b1a4213effdacb Mon Sep 17 00:00:00 2001
From: Ash McKenzie <amckenzie@gitlab.com>
Date: Mon, 23 Apr 2018 17:18:36 +1000
Subject: Update repository storages documentation URL

---
 app/views/admin/application_settings/_repository_storage.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml
index ac31977e1a9..4eebb59110a 100644
--- a/app/views/admin/application_settings/_repository_storage.html.haml
+++ b/app/views/admin/application_settings/_repository_storage.html.haml
@@ -21,7 +21,7 @@
           .help-block
             Manage repository storage paths. Learn more in the
             = succeed "." do
-              = link_to "repository storages documentation", help_page_path("administration/repository_storages")
+              = link_to "repository storages documentation", help_page_path("administration/repository_storage_paths")
     .sub-section
       %h4 Circuit breaker
       .form-group
-- 
cgit v1.2.3


From 5716167775280e5a830443ccb095e2879814f783 Mon Sep 17 00:00:00 2001
From: Mark Fletcher <mark@gitlab.com>
Date: Sat, 21 Apr 2018 19:02:21 +0100
Subject: Fix project creation for user endpoint bug

In this endpoint the `jobs_enabled` parameter must be
translated to `builds_enabled` before being passed to
the `Projects::CreateService`.
---
 .../unreleased/45576-fix-create-project-for-user-endpoint.yml  |  5 +++++
 lib/api/projects.rb                                            | 10 ++++++++--
 spec/requests/api/projects_spec.rb                             |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/45576-fix-create-project-for-user-endpoint.yml

diff --git a/changelogs/unreleased/45576-fix-create-project-for-user-endpoint.yml b/changelogs/unreleased/45576-fix-create-project-for-user-endpoint.yml
new file mode 100644
index 00000000000..12631c75b44
--- /dev/null
+++ b/changelogs/unreleased/45576-fix-create-project-for-user-endpoint.yml
@@ -0,0 +1,5 @@
+---
+title: Fix project creation for user endpoint when jobs_enabled parameter supplied
+merge_request:
+author:
+type: fixed
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 51b3b0459f3..8871792060b 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -74,6 +74,11 @@ module API
 
         present options[:with].prepare_relation(projects, options), options
       end
+
+      def translate_params_for_compatibility(params)
+        params[:builds_enabled] = params.delete(:jobs_enabled) if params.key?(:jobs_enabled)
+        params
+      end
     end
 
     resource :users, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
@@ -123,7 +128,7 @@ module API
       end
       post do
         attrs = declared_params(include_missing: false)
-        attrs[:builds_enabled] = attrs.delete(:jobs_enabled) if attrs.key?(:jobs_enabled)
+        attrs = translate_params_for_compatibility(attrs)
         project = ::Projects::CreateService.new(current_user, attrs).execute
 
         if project.saved?
@@ -155,6 +160,7 @@ module API
         not_found!('User') unless user
 
         attrs = declared_params(include_missing: false)
+        attrs = translate_params_for_compatibility(attrs)
         project = ::Projects::CreateService.new(user, attrs).execute
 
         if project.saved?
@@ -276,7 +282,7 @@ module API
         authorize! :rename_project, user_project if attrs[:name].present?
         authorize! :change_visibility_level, user_project if attrs[:visibility].present?
 
-        attrs[:builds_enabled] = attrs.delete(:jobs_enabled) if attrs.key?(:jobs_enabled)
+        attrs = translate_params_for_compatibility(attrs)
 
         result = ::Projects::UpdateService.new(user_project, current_user, attrs).execute
 
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 17272cb00e5..85a571b8f0e 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -685,7 +685,8 @@ describe API::Projects do
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false,
-        request_access_enabled: true
+        request_access_enabled: true,
+        jobs_enabled: true
       })
 
       post api("/projects/user/#{user.id}", admin), project
-- 
cgit v1.2.3


From a011667788fc64602d0755abb6c457bb278d066b Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 9 Apr 2018 17:13:06 +0530
Subject: Emit `onValueClick` event on component when container is clicked

---
 .../sidebar/labels_select/dropdown_value_collapsed.vue         |  6 ++++++
 .../sidebar/labels_select/dropdown_value_collapsed_spec.js     | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
index 5cf728fe050..68fa2ab8d01 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
@@ -26,6 +26,11 @@ export default {
       return labelsString;
     },
   },
+  methods: {
+    handleClick() {
+      this.$emit('onValueClick');
+    },
+  },
 };
 </script>
 
@@ -36,6 +41,7 @@ export default {
     data-placement="left"
     data-container="body"
     :title="labelsList"
+    @click="handleClick"
   >
     <i
       aria-hidden="true"
diff --git a/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js b/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
index 39040670a87..da74595bcdc 100644
--- a/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
+++ b/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
@@ -56,6 +56,16 @@ describe('DropdownValueCollapsedComponent', () => {
     });
   });
 
+  describe('methods', () => {
+    describe('handleClick', () => {
+      it('emits onValueClick event on component', () => {
+        spyOn(vm, '$emit');
+        vm.handleClick();
+        expect(vm.$emit).toHaveBeenCalledWith('onValueClick');
+      });
+    });
+  });
+
   describe('template', () => {
     it('renders component container element with tooltip`', () => {
       expect(vm.$el.dataset.placement).toBe('left');
-- 
cgit v1.2.3


From c87c55bb35f3c20b8a4116cf5298628f7339b042 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 20 Apr 2018 12:21:48 +0300
Subject: Add 2FA filter to users API for admins only

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/finders/users_finder.rb     | 12 ++++++++++++
 doc/api/users.md                |  1 +
 lib/api/users.rb                |  2 +-
 spec/requests/api/users_spec.rb | 12 ++++++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb
index edde8022ec9..65824a51919 100644
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@@ -32,6 +32,7 @@ class UsersFinder
     users = by_active(users)
     users = by_external_identity(users)
     users = by_external(users)
+    users = by_2fa(users)
     users = by_created_at(users)
     users = by_custom_attributes(users)
 
@@ -76,4 +77,15 @@ class UsersFinder
 
     users.external
   end
+
+  def by_2fa(users)
+    case params[:two_factor]
+    when 'enabled'
+      users.with_two_factor
+    when 'disabled'
+      users.without_two_factor
+    else
+      users
+    end
+  end
 end
diff --git a/doc/api/users.md b/doc/api/users.md
index a4447e32908..ca5afa04687 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -55,6 +55,7 @@ GET /users
 | --------- | ---- | -------- | ----------- |
 | `order_by` | string | no | Return projects ordered by `id`, `name`, `username`, `created_at`, or `updated_at` fields. Default is `id` |
 | `sort` | string | no | Return projects sorted in `asc` or `desc` order. Default is `desc` |
+| `two_factor` | string | no | Filter users by Two-factor authentication. Filter values are `enabled` or `disabled`. By default it returns all users |
 
 ```json
 [
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 3920171205f..14b8a796c8e 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -77,7 +77,7 @@ module API
         authenticated_as_admin! if params[:external].present? || (params[:extern_uid].present? && params[:provider].present?)
 
         unless current_user&.admin?
-          params.except!(:created_after, :created_before, :order_by, :sort)
+          params.except!(:created_after, :created_before, :order_by, :sort, :two_factor)
         end
 
         users = UsersFinder.new(current_user, params).execute
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index f406d2ffb22..e8196980a8c 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -212,6 +212,18 @@ describe API::Users do
         expect(json_response.last['id']).to eq(user.id)
       end
 
+      it 'returns users with 2fa enabled' do
+        admin
+        user
+        user_with_2fa = create(:user, :two_factor_via_otp)
+
+        get api('/users', admin), { two_factor: 'enabled' }
+
+        expect(response).to match_response_schema('public_api/v4/user/admins')
+        expect(json_response.size).to eq(1)
+        expect(json_response.first['id']).to eq(user_with_2fa.id)
+      end
+
       it 'returns 400 when provided incorrect sort params' do
         get api('/users', admin), { order_by: 'magic', sort: 'asc' }
 
-- 
cgit v1.2.3


From 04716cb0e7bb6708fd625f42a9ae802c510f1df5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 20 Apr 2018 12:32:42 +0300
Subject: Add changelog for 2fa filter in users api

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 changelogs/unreleased/dz-add-2fa-filter-admin-api.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/dz-add-2fa-filter-admin-api.yml

diff --git a/changelogs/unreleased/dz-add-2fa-filter-admin-api.yml b/changelogs/unreleased/dz-add-2fa-filter-admin-api.yml
new file mode 100644
index 00000000000..df479e69380
--- /dev/null
+++ b/changelogs/unreleased/dz-add-2fa-filter-admin-api.yml
@@ -0,0 +1,5 @@
+---
+title: Add 2FA filter to users API for admins only
+merge_request: 18503
+author:
+type: changed
-- 
cgit v1.2.3


From 2f57341bf6af2543c1d92b34edd15f7c4bc47bef Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 9 Apr 2018 17:14:12 +0530
Subject: Emit `toggleCollapse`, `onDropdownClose` on component

---
 .../vue_shared/components/sidebar/labels_select/base.vue | 14 +++++++++++++-
 .../components/sidebar/labels_select/base_spec.js        | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue
index 5ede53d8d01..70b46a9c2bb 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue
@@ -1,4 +1,5 @@
 <script>
+import $ from 'jquery';
 import { __ } from '~/locale';
 import LabelsSelect from '~/labels_select';
 import LoadingIcon from '../../loading_icon.vue';
@@ -98,11 +99,18 @@ export default {
     this.labelsDropdown = new LabelsSelect(this.$refs.dropdownButton, {
       handleClick: this.handleClick,
     });
+    $(this.$refs.dropdown).on('hidden.gl.dropdown', this.handleDropdownHidden);
   },
   methods: {
     handleClick(label) {
       this.$emit('onLabelClick', label);
     },
+    handleCollapsedValueClick() {
+      this.$emit('toggleCollapse');
+    },
+    handleDropdownHidden() {
+      this.$emit('onDropdownClose');
+    },
   },
 };
 </script>
@@ -112,6 +120,7 @@ export default {
     <dropdown-value-collapsed
       v-if="showCreate"
       :labels="context.labels"
+      @onValueClick="handleCollapsedValueClick"
     />
     <dropdown-title
       :can-edit="canEdit"
@@ -133,7 +142,10 @@ export default {
         :name="hiddenInputName"
         :label="label"
       />
-      <div class="dropdown">
+      <div
+        class="dropdown"
+        ref="dropdown"
+      >
         <dropdown-button
           :ability-name="abilityName"
           :field-name="hiddenInputName"
diff --git a/spec/javascripts/vue_shared/components/sidebar/labels_select/base_spec.js b/spec/javascripts/vue_shared/components/sidebar/labels_select/base_spec.js
index 6fe95153204..e8685ab48be 100644
--- a/spec/javascripts/vue_shared/components/sidebar/labels_select/base_spec.js
+++ b/spec/javascripts/vue_shared/components/sidebar/labels_select/base_spec.js
@@ -73,6 +73,22 @@ describe('BaseComponent', () => {
         expect(vm.$emit).toHaveBeenCalledWith('onLabelClick', mockLabels[0]);
       });
     });
+
+    describe('handleCollapsedValueClick', () => {
+      it('emits toggleCollapse event on component', () => {
+        spyOn(vm, '$emit');
+        vm.handleCollapsedValueClick();
+        expect(vm.$emit).toHaveBeenCalledWith('toggleCollapse');
+      });
+    });
+
+    describe('handleDropdownHidden', () => {
+      it('emits onDropdownClose event on component', () => {
+        spyOn(vm, '$emit');
+        vm.handleDropdownHidden();
+        expect(vm.$emit).toHaveBeenCalledWith('onDropdownClose');
+      });
+    });
   });
 
   describe('mounted', () => {
-- 
cgit v1.2.3


From 44a222adea18eb4b543d696c961e69196a4928f5 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 20 Apr 2018 15:38:34 +0100
Subject: Use axios request to interact with API instead of UJS

---
 .../components/graph/action_component.vue          |  2 +-
 .../components/graph/dropdown_action_component.vue | 53 ----------------------
 .../components/graph/dropdown_job_component.vue    | 29 ++++++------
 .../pipelines/components/graph/job_component.vue   | 18 +-------
 app/assets/stylesheets/pages/pipelines.scss        |  8 ++++
 .../graph/dropdown_action_component_spec.js        | 32 -------------
 .../pipelines/graph/job_component_spec.js          | 11 -----
 7 files changed, 24 insertions(+), 129 deletions(-)
 delete mode 100644 app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue
 delete mode 100644 spec/javascripts/pipelines/graph/dropdown_action_component_spec.js

diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue
index e99d949801f..558bf812fef 100644
--- a/app/assets/javascripts/pipelines/components/graph/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue
@@ -62,7 +62,7 @@ export default {
     @click="onClickAction"
     v-tooltip
     :title="tooltipText"
-    class="btn btn-blank btn-transparent ci-action-icon-container ci-action-icon-wrapper"
+    class="js-ci-action btn btn-blank btn-transparent ci-action-icon-container ci-action-icon-wrapper"
     :class="cssClass"
     data-container="body"
     :disabled="isDisabled"
diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue
deleted file mode 100644
index 7c4fd65e36f..00000000000
--- a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<script>
-  import icon from '../../../vue_shared/components/icon.vue';
-  import tooltip from '../../../vue_shared/directives/tooltip';
-
-  /**
-   * Renders either a cancel, retry or play icon pointing to the given path.
-   * TODO: Remove UJS from here and use an async request instead.
-   */
-  export default {
-    components: {
-      icon,
-    },
-
-    directives: {
-      tooltip,
-    },
-    props: {
-      tooltipText: {
-        type: String,
-        required: true,
-      },
-
-      link: {
-        type: String,
-        required: true,
-      },
-
-      actionMethod: {
-        type: String,
-        required: true,
-      },
-
-      actionIcon: {
-        type: String,
-        required: true,
-      },
-    },
-  };
-</script>
-<template>
-  <a
-    v-tooltip
-    :data-method="actionMethod"
-    :title="tooltipText"
-    :href="link"
-    rel="nofollow"
-    class="ci-action-icon-wrapper js-ci-status-icon"
-    data-container="body"
-    aria-label="Job's action"
-  >
-    <icon :name="actionIcon" />
-  </a>
-</template>
diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
index be213c2ee78..30e40259146 100644
--- a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
@@ -1,7 +1,7 @@
 <script>
   import $ from 'jquery';
-  import jobNameComponent from './job_name_component.vue';
-  import jobComponent from './job_component.vue';
+  import JobNameComponent from './job_name_component.vue';
+  import JobComponent from './job_component.vue';
   import tooltip from '../../../vue_shared/directives/tooltip';
 
   /**
@@ -33,8 +33,8 @@
     },
 
     components: {
-      jobComponent,
-      jobNameComponent,
+      JobComponent,
+      JobNameComponent,
     },
 
     props: {
@@ -56,17 +56,17 @@
 
     methods: {
       /**
-     * When the user right clicks or cmd/ctrl + click in the job name
-     * the dropdown should not be closed and the link should open in another tab,
-     * so we stop propagation of the click event inside the dropdown.
-     *
-     * Since this component is rendered multiple times per page we need to guarantee we only
-     * target the click event of this component.
-     */
+       * When the user right clicks or cmd/ctrl + click in the job name or the action icon
+       * the dropdown should not be closed so we stop propagation of the click event inside the dropdown.
+       *
+       * Since this component is rendered multiple times per page we need to guarantee we only
+       * target the click event of this component.
+       */
       stopDropdownClickPropagation() {
-        $(this.$el
-          .querySelectorAll('.js-grouped-pipeline-dropdown a.mini-pipeline-graph-dropdown-item'))
-          .on('click', (e) => {
+        $(
+          '.js-grouped-pipeline-dropdown button, .js-grouped-pipeline-dropdown a.mini-pipeline-graph-dropdown-item',
+          this.$el,
+        ).on('click', (e) => {
             e.stopPropagation();
           });
       },
@@ -101,7 +101,6 @@
             :key="i">
             <job-component
               :job="item"
-              :is-dropdown="true"
               css-class-job-name="mini-pipeline-graph-dropdown-item"
             />
           </li>
diff --git a/app/assets/javascripts/pipelines/components/graph/job_component.vue b/app/assets/javascripts/pipelines/components/graph/job_component.vue
index c6e5ae6df41..29680235a9e 100644
--- a/app/assets/javascripts/pipelines/components/graph/job_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/job_component.vue
@@ -1,6 +1,5 @@
 <script>
 import ActionComponent from './action_component.vue';
-import DropdownActionComponent from './dropdown_action_component.vue';
 import JobNameComponent from './job_name_component.vue';
 import tooltip from '../../../vue_shared/directives/tooltip';
 
@@ -32,7 +31,6 @@ import tooltip from '../../../vue_shared/directives/tooltip';
 export default {
   components: {
     ActionComponent,
-    DropdownActionComponent,
     JobNameComponent,
   },
 
@@ -51,12 +49,6 @@ export default {
       default: '',
     },
 
-    isDropdown: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-
     actionDisabled: {
       type: String,
       required: false,
@@ -134,19 +126,11 @@ export default {
     </div>
 
     <action-component
-      v-if="hasAction && !isDropdown"
+      v-if="hasAction"
       :tooltip-text="status.action.title"
       :link="status.action.path"
       :action-icon="status.action.icon"
       :button-disabled="actionDisabled"
     />
-
-    <dropdown-action-component
-      v-if="hasAction && isDropdown"
-      :tooltip-text="status.action.title"
-      :link="status.action.path"
-      :action-icon="status.action.icon"
-      :action-method="status.action.method"
-    />
   </div>
 </template>
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 855ebf7d86d..3a8ec779c14 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -468,6 +468,14 @@
     margin-bottom: 10px;
     white-space: normal;
 
+    .ci-job-dropdown-container {
+      // override dropdown.scss
+      .dropdown-menu li button {
+        padding: 0;
+        text-align: center;
+      }
+    }
+
     // ensure .build-content has hover style when action-icon is hovered
     .ci-job-dropdown-container:hover .build-content {
       @extend .build-content:hover;
diff --git a/spec/javascripts/pipelines/graph/dropdown_action_component_spec.js b/spec/javascripts/pipelines/graph/dropdown_action_component_spec.js
deleted file mode 100644
index ba721bc53c6..00000000000
--- a/spec/javascripts/pipelines/graph/dropdown_action_component_spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Vue from 'vue';
-import dropdownActionComponent from '~/pipelines/components/graph/dropdown_action_component.vue';
-
-describe('action component', () => {
-  let component;
-
-  beforeEach((done) => {
-    const DropdownActionComponent = Vue.extend(dropdownActionComponent);
-    component = new DropdownActionComponent({
-      propsData: {
-        tooltipText: 'bar',
-        link: 'foo',
-        actionMethod: 'post',
-        actionIcon: 'cancel',
-      },
-    }).$mount();
-
-    Vue.nextTick(done);
-  });
-
-  it('should render a link', () => {
-    expect(component.$el.getAttribute('href')).toEqual('foo');
-  });
-
-  it('should render the provided title as a bootstrap tooltip', () => {
-    expect(component.$el.getAttribute('data-original-title')).toEqual('bar');
-  });
-
-  it('should render an svg', () => {
-    expect(component.$el.querySelector('svg')).toBeDefined();
-  });
-});
diff --git a/spec/javascripts/pipelines/graph/job_component_spec.js b/spec/javascripts/pipelines/graph/job_component_spec.js
index c9677ae209a..073dae56c25 100644
--- a/spec/javascripts/pipelines/graph/job_component_spec.js
+++ b/spec/javascripts/pipelines/graph/job_component_spec.js
@@ -93,17 +93,6 @@ describe('pipeline graph job component', () => {
     });
   });
 
-  describe('dropdown', () => {
-    it('should render the dropdown action icon', () => {
-      component = mountComponent(JobComponent, {
-        job: mockJob,
-        isDropdown: true,
-      });
-
-      expect(component.$el.querySelector('a.ci-action-icon-wrapper')).toBeDefined();
-    });
-  });
-
   it('should render provided class name', () => {
     component = mountComponent(JobComponent, {
       job: mockJob,
-- 
cgit v1.2.3


From 023d4f6f2f3d88d0966fe01e6ef921fd03a309fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 29 Mar 2018 11:47:54 +0200
Subject: Move spec helpers/matchers/shared examples/contexts to their relevant
 folder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .rubocop_todo.yml                                  |   8 +-
 db/fixtures/development/17_cycle_analytics.rb      |   2 +-
 .../testing_guide/testing_rake_tasks.md            |   2 +-
 features/support/env.rb                            |   6 +-
 spec/factories/commits.rb                          |   2 +-
 spec/factories/gpg_key_subkeys.rb                  |   2 -
 spec/factories/gpg_keys.rb                         |   2 +-
 spec/factories/gpg_signature.rb                    |   2 -
 spec/factories/notes.rb                            |   2 +-
 spec/factories/projects.rb                         |   2 +-
 spec/spec_helper.rb                                |  59 +--
 spec/support/api_helpers.rb                        |  50 --
 spec/support/background_migrations_matchers.rb     |  26 --
 spec/support/bare_repo_operations.rb               |  62 ---
 spec/support/board_helpers.rb                      |  16 -
 spec/support/capybara.rb                           |   2 +
 spec/support/capybara_helpers.rb                   |  47 --
 .../support/chat_slash_commands_shared_examples.rb |  97 ----
 spec/support/cookie_helper.rb                      |  34 --
 spec/support/cycle_analytics_helpers.rb            | 141 ------
 spec/support/database_connection_helpers.rb        |   9 -
 spec/support/devise_helpers.rb                     |  17 -
 spec/support/drag_to_helper.rb                     |  13 -
 spec/support/dropzone_helper.rb                    |  76 ---
 spec/support/email_format_shared_examples.rb       |  44 --
 spec/support/email_helpers.rb                      |  37 --
 spec/support/factory_bot.rb                        |   3 -
 spec/support/fake_migration_classes.rb             |  11 -
 spec/support/fake_u2f_device.rb                    |  40 --
 spec/support/filter_item_select_helper.rb          |  19 -
 spec/support/filter_spec_helper.rb                 |  87 ----
 spec/support/filtered_search_helpers.rb            | 148 ------
 spec/support/fixture_helpers.rb                    |  15 -
 spec/support/generate-seed-repo-rb                 |   2 +-
 spec/support/git_http_helpers.rb                   |  68 ---
 spec/support/gitlab-git-test.git/README.md         |   2 +-
 spec/support/gitlab_verify.rb                      |  45 --
 spec/support/gpg_helpers.rb                        | 517 ---------------------
 spec/support/group_members_shared_example.rb       |  27 --
 spec/support/helpers/api_helpers.rb                |  50 ++
 spec/support/helpers/bare_repo_operations.rb       |  62 +++
 spec/support/helpers/board_helpers.rb              |  16 +
 spec/support/helpers/capybara_helpers.rb           |  43 ++
 spec/support/helpers/cookie_helper.rb              |  34 ++
 spec/support/helpers/cycle_analytics_helpers.rb    | 137 ++++++
 .../support/helpers/database_connection_helpers.rb |   9 +
 spec/support/helpers/devise_helpers.rb             |  17 +
 spec/support/helpers/drag_to_helper.rb             |  13 +
 spec/support/helpers/dropzone_helper.rb            |  76 +++
 spec/support/helpers/email_helpers.rb              |  37 ++
 spec/support/helpers/fake_migration_classes.rb     |  11 +
 spec/support/helpers/fake_u2f_device.rb            |  40 ++
 spec/support/helpers/filter_item_select_helper.rb  |  19 +
 spec/support/helpers/filter_spec_helper.rb         |  87 ++++
 spec/support/helpers/filtered_search_helpers.rb    | 148 ++++++
 spec/support/helpers/fixture_helpers.rb            |  11 +
 spec/support/helpers/git_http_helpers.rb           |  68 +++
 spec/support/helpers/gitlab_verify_helpers.rb      |  25 +
 spec/support/helpers/gpg_helpers.rb                | 517 +++++++++++++++++++++
 spec/support/helpers/import_spec_helper.rb         |  33 ++
 spec/support/helpers/input_helper.rb               |   7 +
 spec/support/helpers/inspect_requests.rb           |  17 +
 spec/support/helpers/issue_helpers.rb              |  13 +
 .../support/helpers/javascript_fixtures_helpers.rb |  66 +++
 spec/support/helpers/jira_service_helper.rb        |  88 ++++
 spec/support/helpers/kubernetes_helpers.rb         | 104 +++++
 spec/support/helpers/ldap_helpers.rb               |  49 ++
 spec/support/helpers/live_debugger.rb              |  17 +
 spec/support/helpers/login_helpers.rb              | 162 +++++++
 spec/support/helpers/markdown_feature.rb           | 128 +++++
 spec/support/helpers/merge_request_helpers.rb      |  22 +
 spec/support/helpers/migrations_helpers.rb         |  92 ++++
 spec/support/helpers/mobile_helpers.rb             |  17 +
 spec/support/helpers/project_forks_helper.rb       |  54 +++
 spec/support/helpers/prometheus_helpers.rb         | 202 ++++++++
 spec/support/helpers/query_recorder.rb             |  38 ++
 spec/support/helpers/quick_actions_helpers.rb      |  10 +
 spec/support/helpers/rake_helpers.rb               |  19 +
 spec/support/helpers/reactive_caching_helpers.rb   |  48 ++
 spec/support/helpers/redis_without_keys.rb         |   8 +
 spec/support/helpers/reference_parser_helpers.rb   |  39 ++
 spec/support/helpers/repo_helpers.rb               | 118 +++++
 spec/support/helpers/search_helpers.rb             |   5 +
 spec/support/helpers/seed_helper.rb                | 110 +++++
 spec/support/helpers/seed_repo.rb                  | 153 ++++++
 spec/support/helpers/select2_helper.rb             |  35 ++
 spec/support/helpers/selection_helper.rb           |   6 +
 spec/support/helpers/sorting_helper.rb             |  18 +
 spec/support/helpers/stub_configuration.rb         | 102 ++++
 spec/support/helpers/stub_env.rb                   |  36 ++
 spec/support/helpers/stub_feature_flags.rb         |   8 +
 spec/support/helpers/stub_gitlab_calls.rb          | 129 +++++
 spec/support/helpers/stub_gitlab_data.rb           |   5 +
 spec/support/helpers/stub_object_storage.rb        |  48 ++
 spec/support/helpers/test_env.rb                   | 366 +++++++++++++++
 spec/support/helpers/upload_helpers.rb             |  16 +
 spec/support/helpers/user_activities_helpers.rb    |   7 +
 spec/support/helpers/wait_for_requests.rb          |  78 ++++
 spec/support/helpers/workhorse_helpers.rb          |  21 +
 spec/support/import_spec_helper.rb                 |  33 --
 spec/support/input_helper.rb                       |   7 -
 spec/support/inspect_requests.rb                   |  17 -
 spec/support/issuable_shared_examples.rb           |  38 --
 .../issuables_list_metadata_shared_examples.rb     |  46 --
 spec/support/issue_helpers.rb                      |  13 -
 .../issue_tracker_service_shared_example.rb        |  22 -
 spec/support/javascript_fixtures_helpers.rb        |  66 ---
 spec/support/jira_service_helper.rb                |  88 ----
 spec/support/json_response.rb                      |   5 +
 spec/support/json_response_helpers.rb              |   9 -
 spec/support/kubernetes_helpers.rb                 | 104 -----
 spec/support/ldap_helpers.rb                       |  49 --
 spec/support/ldap_shared_examples.rb               |  69 ---
 .../legacy_path_redirect_shared_examples.rb        |  13 -
 spec/support/live_debugger.rb                      |  17 -
 spec/support/login_helpers.rb                      | 162 -------
 spec/support/malicious_regexp_shared_examples.rb   |   8 -
 spec/support/markdown_feature.rb                   | 128 -----
 .../matchers/background_migrations_matchers.rb     |  26 ++
 spec/support/matchers/exceed_query_limit.rb        |  64 +++
 spec/support/mentionable_shared_examples.rb        | 144 ------
 spec/support/merge_request_helpers.rb              |  22 -
 spec/support/migrations_helpers.rb                 |  92 ----
 spec/support/milestone_tabs_examples.rb            |  84 ----
 spec/support/mobile_helpers.rb                     |  17 -
 spec/support/notify_shared_examples.rb             | 199 --------
 spec/support/prepare-gitlab-git-test-for-commit    |   2 +-
 spec/support/project_forks_helper.rb               |  54 ---
 spec/support/prometheus_helpers.rb                 | 202 --------
 spec/support/query_recorder.rb                     | 103 ----
 spec/support/rake_helpers.rb                       |  19 -
 spec/support/reactive_caching_helpers.rb           |  48 --
 spec/support/redis_without_keys.rb                 |   8 -
 spec/support/reference_parser_helpers.rb           |  39 --
 spec/support/reference_parser_shared_examples.rb   |  47 --
 spec/support/repo_helpers.rb                       | 118 -----
 spec/support/routing_helpers.rb                    |   3 -
 spec/support/rspec.rb                              |  12 +
 spec/support/search_helpers.rb                     |   5 -
 spec/support/seed.rb                               |   7 +
 spec/support/seed_helper.rb                        | 118 -----
 spec/support/seed_repo.rb                          | 153 ------
 spec/support/select2_helper.rb                     |  35 --
 spec/support/selection_helper.rb                   |   6 -
 spec/support/services_shared_context.rb            |  37 --
 .../json_response_shared_context.rb                |   3 +
 .../shared_contexts/services_shared_context.rb     |  37 ++
 .../chat_slash_commands_shared_examples.rb         |  97 ++++
 .../email_format_shared_examples.rb                |  44 ++
 spec/support/shared_examples/gitlab_verify.rb      |  19 +
 .../group_members_shared_example.rb                |  27 ++
 .../shared_examples/issuable_shared_examples.rb    |  38 ++
 .../issuables_list_metadata_shared_examples.rb     |  46 ++
 .../issue_tracker_service_shared_example.rb        |  22 +
 .../shared_examples/ldap_shared_examples.rb        |  69 +++
 .../legacy_path_redirect_shared_examples.rb        |  13 +
 .../malicious_regexp_shared_examples.rb            |   8 +
 .../shared_examples/mentionable_shared_examples.rb | 144 ++++++
 .../shared_examples/milestone_tabs_examples.rb     |  84 ++++
 .../shared_examples/notify_shared_examples.rb      | 199 ++++++++
 .../reference_parser_shared_examples.rb            |  47 ++
 ...ack_mattermost_notifications_shared_examples.rb | 429 +++++++++++++++++
 spec/support/shared_examples/snippet_visibility.rb | 322 +++++++++++++
 .../shared_examples/snippets_shared_examples.rb    |  18 +
 .../shared_examples/taskable_shared_examples.rb    | 108 +++++
 .../time_tracking_shared_examples.rb               |  85 ++++
 .../unique_ip_check_shared_examples.rb             |  68 +++
 .../shared_examples/update_invalid_issuable.rb     |  57 +++
 .../updating_mentions_shared_examples.rb           |  36 ++
 ...ack_mattermost_notifications_shared_examples.rb | 429 -----------------
 spec/support/snippet_visibility.rb                 | 322 -------------
 spec/support/snippets_shared_examples.rb           |  18 -
 spec/support/stub_configuration.rb                 |  99 ----
 spec/support/stub_env.rb                           |  36 --
 spec/support/stub_feature_flags.rb                 |   8 -
 spec/support/stub_gitlab_calls.rb                  | 129 -----
 spec/support/stub_gitlab_data.rb                   |   5 -
 spec/support/stub_object_storage.rb                |  48 --
 spec/support/taskable_shared_examples.rb           | 108 -----
 spec/support/test_env.rb                           | 366 ---------------
 spec/support/time_tracking_shared_examples.rb      |  85 ----
 spec/support/unique_ip_check_shared_examples.rb    |  68 ---
 spec/support/update_invalid_issuable.rb            |  57 ---
 spec/support/updating_mentions_shared_examples.rb  |  36 --
 spec/support/upload_helpers.rb                     |  16 -
 spec/support/user_activities_helpers.rb            |   7 -
 spec/support/wait_for_requests.rb                  |  78 ----
 spec/support/workhorse_helpers.rb                  |  21 -
 188 files changed, 6099 insertions(+), 6073 deletions(-)
 delete mode 100644 spec/support/api_helpers.rb
 delete mode 100644 spec/support/background_migrations_matchers.rb
 delete mode 100644 spec/support/bare_repo_operations.rb
 delete mode 100644 spec/support/board_helpers.rb
 delete mode 100644 spec/support/capybara_helpers.rb
 delete mode 100644 spec/support/chat_slash_commands_shared_examples.rb
 delete mode 100644 spec/support/cookie_helper.rb
 delete mode 100644 spec/support/cycle_analytics_helpers.rb
 delete mode 100644 spec/support/database_connection_helpers.rb
 delete mode 100644 spec/support/devise_helpers.rb
 delete mode 100644 spec/support/drag_to_helper.rb
 delete mode 100644 spec/support/dropzone_helper.rb
 delete mode 100644 spec/support/email_format_shared_examples.rb
 delete mode 100644 spec/support/email_helpers.rb
 delete mode 100644 spec/support/factory_bot.rb
 delete mode 100644 spec/support/fake_migration_classes.rb
 delete mode 100644 spec/support/fake_u2f_device.rb
 delete mode 100644 spec/support/filter_item_select_helper.rb
 delete mode 100644 spec/support/filter_spec_helper.rb
 delete mode 100644 spec/support/filtered_search_helpers.rb
 delete mode 100644 spec/support/fixture_helpers.rb
 delete mode 100644 spec/support/git_http_helpers.rb
 delete mode 100644 spec/support/gitlab_verify.rb
 delete mode 100644 spec/support/gpg_helpers.rb
 delete mode 100644 spec/support/group_members_shared_example.rb
 create mode 100644 spec/support/helpers/api_helpers.rb
 create mode 100644 spec/support/helpers/bare_repo_operations.rb
 create mode 100644 spec/support/helpers/board_helpers.rb
 create mode 100644 spec/support/helpers/capybara_helpers.rb
 create mode 100644 spec/support/helpers/cookie_helper.rb
 create mode 100644 spec/support/helpers/cycle_analytics_helpers.rb
 create mode 100644 spec/support/helpers/database_connection_helpers.rb
 create mode 100644 spec/support/helpers/devise_helpers.rb
 create mode 100644 spec/support/helpers/drag_to_helper.rb
 create mode 100644 spec/support/helpers/dropzone_helper.rb
 create mode 100644 spec/support/helpers/email_helpers.rb
 create mode 100644 spec/support/helpers/fake_migration_classes.rb
 create mode 100644 spec/support/helpers/fake_u2f_device.rb
 create mode 100644 spec/support/helpers/filter_item_select_helper.rb
 create mode 100644 spec/support/helpers/filter_spec_helper.rb
 create mode 100644 spec/support/helpers/filtered_search_helpers.rb
 create mode 100644 spec/support/helpers/fixture_helpers.rb
 create mode 100644 spec/support/helpers/git_http_helpers.rb
 create mode 100644 spec/support/helpers/gitlab_verify_helpers.rb
 create mode 100644 spec/support/helpers/gpg_helpers.rb
 create mode 100644 spec/support/helpers/import_spec_helper.rb
 create mode 100644 spec/support/helpers/input_helper.rb
 create mode 100644 spec/support/helpers/inspect_requests.rb
 create mode 100644 spec/support/helpers/issue_helpers.rb
 create mode 100644 spec/support/helpers/javascript_fixtures_helpers.rb
 create mode 100644 spec/support/helpers/jira_service_helper.rb
 create mode 100644 spec/support/helpers/kubernetes_helpers.rb
 create mode 100644 spec/support/helpers/ldap_helpers.rb
 create mode 100644 spec/support/helpers/live_debugger.rb
 create mode 100644 spec/support/helpers/login_helpers.rb
 create mode 100644 spec/support/helpers/markdown_feature.rb
 create mode 100644 spec/support/helpers/merge_request_helpers.rb
 create mode 100644 spec/support/helpers/migrations_helpers.rb
 create mode 100644 spec/support/helpers/mobile_helpers.rb
 create mode 100644 spec/support/helpers/project_forks_helper.rb
 create mode 100644 spec/support/helpers/prometheus_helpers.rb
 create mode 100644 spec/support/helpers/query_recorder.rb
 create mode 100644 spec/support/helpers/quick_actions_helpers.rb
 create mode 100644 spec/support/helpers/rake_helpers.rb
 create mode 100644 spec/support/helpers/reactive_caching_helpers.rb
 create mode 100644 spec/support/helpers/redis_without_keys.rb
 create mode 100644 spec/support/helpers/reference_parser_helpers.rb
 create mode 100644 spec/support/helpers/repo_helpers.rb
 create mode 100644 spec/support/helpers/search_helpers.rb
 create mode 100644 spec/support/helpers/seed_helper.rb
 create mode 100644 spec/support/helpers/seed_repo.rb
 create mode 100644 spec/support/helpers/select2_helper.rb
 create mode 100644 spec/support/helpers/selection_helper.rb
 create mode 100644 spec/support/helpers/sorting_helper.rb
 create mode 100644 spec/support/helpers/stub_configuration.rb
 create mode 100644 spec/support/helpers/stub_env.rb
 create mode 100644 spec/support/helpers/stub_feature_flags.rb
 create mode 100644 spec/support/helpers/stub_gitlab_calls.rb
 create mode 100644 spec/support/helpers/stub_gitlab_data.rb
 create mode 100644 spec/support/helpers/stub_object_storage.rb
 create mode 100644 spec/support/helpers/test_env.rb
 create mode 100644 spec/support/helpers/upload_helpers.rb
 create mode 100644 spec/support/helpers/user_activities_helpers.rb
 create mode 100644 spec/support/helpers/wait_for_requests.rb
 create mode 100644 spec/support/helpers/workhorse_helpers.rb
 delete mode 100644 spec/support/import_spec_helper.rb
 delete mode 100644 spec/support/input_helper.rb
 delete mode 100644 spec/support/inspect_requests.rb
 delete mode 100644 spec/support/issuable_shared_examples.rb
 delete mode 100644 spec/support/issuables_list_metadata_shared_examples.rb
 delete mode 100644 spec/support/issue_helpers.rb
 delete mode 100644 spec/support/issue_tracker_service_shared_example.rb
 delete mode 100644 spec/support/javascript_fixtures_helpers.rb
 delete mode 100644 spec/support/jira_service_helper.rb
 create mode 100644 spec/support/json_response.rb
 delete mode 100644 spec/support/json_response_helpers.rb
 delete mode 100644 spec/support/kubernetes_helpers.rb
 delete mode 100644 spec/support/ldap_helpers.rb
 delete mode 100644 spec/support/ldap_shared_examples.rb
 delete mode 100644 spec/support/legacy_path_redirect_shared_examples.rb
 delete mode 100644 spec/support/live_debugger.rb
 delete mode 100644 spec/support/login_helpers.rb
 delete mode 100644 spec/support/malicious_regexp_shared_examples.rb
 delete mode 100644 spec/support/markdown_feature.rb
 create mode 100644 spec/support/matchers/background_migrations_matchers.rb
 create mode 100644 spec/support/matchers/exceed_query_limit.rb
 delete mode 100644 spec/support/mentionable_shared_examples.rb
 delete mode 100644 spec/support/merge_request_helpers.rb
 delete mode 100644 spec/support/migrations_helpers.rb
 delete mode 100644 spec/support/milestone_tabs_examples.rb
 delete mode 100644 spec/support/mobile_helpers.rb
 delete mode 100644 spec/support/notify_shared_examples.rb
 delete mode 100644 spec/support/project_forks_helper.rb
 delete mode 100644 spec/support/prometheus_helpers.rb
 delete mode 100644 spec/support/query_recorder.rb
 delete mode 100644 spec/support/rake_helpers.rb
 delete mode 100644 spec/support/reactive_caching_helpers.rb
 delete mode 100644 spec/support/redis_without_keys.rb
 delete mode 100644 spec/support/reference_parser_helpers.rb
 delete mode 100644 spec/support/reference_parser_shared_examples.rb
 delete mode 100644 spec/support/repo_helpers.rb
 delete mode 100644 spec/support/routing_helpers.rb
 create mode 100644 spec/support/rspec.rb
 delete mode 100644 spec/support/search_helpers.rb
 create mode 100644 spec/support/seed.rb
 delete mode 100644 spec/support/seed_helper.rb
 delete mode 100644 spec/support/seed_repo.rb
 delete mode 100644 spec/support/select2_helper.rb
 delete mode 100644 spec/support/selection_helper.rb
 delete mode 100644 spec/support/services_shared_context.rb
 create mode 100644 spec/support/shared_contexts/json_response_shared_context.rb
 create mode 100644 spec/support/shared_contexts/services_shared_context.rb
 create mode 100644 spec/support/shared_examples/chat_slash_commands_shared_examples.rb
 create mode 100644 spec/support/shared_examples/email_format_shared_examples.rb
 create mode 100644 spec/support/shared_examples/gitlab_verify.rb
 create mode 100644 spec/support/shared_examples/group_members_shared_example.rb
 create mode 100644 spec/support/shared_examples/issuable_shared_examples.rb
 create mode 100644 spec/support/shared_examples/issuables_list_metadata_shared_examples.rb
 create mode 100644 spec/support/shared_examples/issue_tracker_service_shared_example.rb
 create mode 100644 spec/support/shared_examples/ldap_shared_examples.rb
 create mode 100644 spec/support/shared_examples/legacy_path_redirect_shared_examples.rb
 create mode 100644 spec/support/shared_examples/malicious_regexp_shared_examples.rb
 create mode 100644 spec/support/shared_examples/mentionable_shared_examples.rb
 create mode 100644 spec/support/shared_examples/milestone_tabs_examples.rb
 create mode 100644 spec/support/shared_examples/notify_shared_examples.rb
 create mode 100644 spec/support/shared_examples/reference_parser_shared_examples.rb
 create mode 100644 spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb
 create mode 100644 spec/support/shared_examples/snippet_visibility.rb
 create mode 100644 spec/support/shared_examples/snippets_shared_examples.rb
 create mode 100644 spec/support/shared_examples/taskable_shared_examples.rb
 create mode 100644 spec/support/shared_examples/time_tracking_shared_examples.rb
 create mode 100644 spec/support/shared_examples/unique_ip_check_shared_examples.rb
 create mode 100644 spec/support/shared_examples/update_invalid_issuable.rb
 create mode 100644 spec/support/shared_examples/updating_mentions_shared_examples.rb
 delete mode 100644 spec/support/slack_mattermost_notifications_shared_examples.rb
 delete mode 100644 spec/support/snippet_visibility.rb
 delete mode 100644 spec/support/snippets_shared_examples.rb
 delete mode 100644 spec/support/stub_configuration.rb
 delete mode 100644 spec/support/stub_env.rb
 delete mode 100644 spec/support/stub_feature_flags.rb
 delete mode 100644 spec/support/stub_gitlab_calls.rb
 delete mode 100644 spec/support/stub_gitlab_data.rb
 delete mode 100644 spec/support/stub_object_storage.rb
 delete mode 100644 spec/support/taskable_shared_examples.rb
 delete mode 100644 spec/support/test_env.rb
 delete mode 100644 spec/support/time_tracking_shared_examples.rb
 delete mode 100644 spec/support/unique_ip_check_shared_examples.rb
 delete mode 100644 spec/support/update_invalid_issuable.rb
 delete mode 100644 spec/support/updating_mentions_shared_examples.rb
 delete mode 100644 spec/support/upload_helpers.rb
 delete mode 100644 spec/support/user_activities_helpers.rb
 delete mode 100644 spec/support/wait_for_requests.rb
 delete mode 100644 spec/support/workhorse_helpers.rb

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d443238b9e1..16b0b5c95e2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -143,7 +143,7 @@ Lint/MissingCopEnableDirective:
 Lint/NestedPercentLiteral:
   Exclude:
     - 'lib/gitlab/git/repository.rb'
-    - 'spec/support/email_format_shared_examples.rb'
+    - 'spec/support/shared_examples/email_format_shared_examples.rb'
 
 # Offense count: 1
 Lint/ReturnInVoidContext:
@@ -195,8 +195,8 @@ Naming/HeredocDelimiterCase:
     - 'spec/lib/gitlab/diff/parser_spec.rb'
     - 'spec/lib/json_web_token/rsa_token_spec.rb'
     - 'spec/models/commit_spec.rb'
-    - 'spec/support/repo_helpers.rb'
-    - 'spec/support/seed_repo.rb'
+    - 'spec/support/helpers/repo_helpers.rb'
+    - 'spec/support/helpers/seed_repo.rb'
 
 # Offense count: 112
 # Configuration parameters: Blacklist.
@@ -496,7 +496,7 @@ Style/EmptyLiteral:
     - 'spec/lib/gitlab/request_context_spec.rb'
     - 'spec/lib/gitlab/workhorse_spec.rb'
     - 'spec/requests/api/jobs_spec.rb'
-    - 'spec/support/chat_slash_commands_shared_examples.rb'
+    - 'spec/support/shared_examples/chat_slash_commands_shared_examples.rb'
 
 # Offense count: 102
 # Cop supports --auto-correct.
diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb
index d7be6f5950f..7b9a4bad449 100644
--- a/db/fixtures/development/17_cycle_analytics.rb
+++ b/db/fixtures/development/17_cycle_analytics.rb
@@ -1,5 +1,5 @@
 require './spec/support/sidekiq'
-require './spec/support/test_env'
+require './spec/support/helpers/test_env'
 
 class Gitlab::Seeder::CycleAnalytics
   def initialize(project, perf: false)
diff --git a/doc/development/testing_guide/testing_rake_tasks.md b/doc/development/testing_guide/testing_rake_tasks.md
index 60163f1a230..db8ca87e9f8 100644
--- a/doc/development/testing_guide/testing_rake_tasks.md
+++ b/doc/development/testing_guide/testing_rake_tasks.md
@@ -9,7 +9,7 @@ At a minimum, requiring the Rake helper will redirect `stdout`, include the
 runtime task helpers, and include the `RakeHelpers` Spec support module.
 
 The `RakeHelpers` module exposes a `run_rake_task(<task>)` method to make
-executing tasks simple. See `spec/support/rake_helpers.rb` for all available
+executing tasks simple. See `spec/support/helpers/rake_helpers.rb` for all available
 methods.
 
 Example:
diff --git a/features/support/env.rb b/features/support/env.rb
index 15211995918..8fa2fcb6e3e 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -12,7 +12,11 @@ end
 
 WebMock.enable!
 
-%w(select2_helper test_env repo_helpers wait_for_requests sidekiq project_forks_helper webmock).each do |f|
+%w(select2_helper test_env repo_helpers wait_for_requests project_forks_helper).each do |f|
+  require Rails.root.join('spec', 'support', 'helpers', f)
+end
+
+%w(sidekiq webmock).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
 
diff --git a/spec/factories/commits.rb b/spec/factories/commits.rb
index d5d819d862a..818f7b046f6 100644
--- a/spec/factories/commits.rb
+++ b/spec/factories/commits.rb
@@ -1,4 +1,4 @@
-require_relative '../support/repo_helpers'
+require_relative '../support/helpers/repo_helpers'
 
 FactoryBot.define do
   factory :commit do
diff --git a/spec/factories/gpg_key_subkeys.rb b/spec/factories/gpg_key_subkeys.rb
index 57eaaee345f..6c7db5379a9 100644
--- a/spec/factories/gpg_key_subkeys.rb
+++ b/spec/factories/gpg_key_subkeys.rb
@@ -1,5 +1,3 @@
-require_relative '../support/gpg_helpers'
-
 FactoryBot.define do
   factory :gpg_key_subkey do
     gpg_key
diff --git a/spec/factories/gpg_keys.rb b/spec/factories/gpg_keys.rb
index b8aabf74221..51b8ddc9934 100644
--- a/spec/factories/gpg_keys.rb
+++ b/spec/factories/gpg_keys.rb
@@ -1,4 +1,4 @@
-require_relative '../support/gpg_helpers'
+require_relative '../support/helpers/gpg_helpers'
 
 FactoryBot.define do
   factory :gpg_key do
diff --git a/spec/factories/gpg_signature.rb b/spec/factories/gpg_signature.rb
index 4620caff823..b89e6ffc4b3 100644
--- a/spec/factories/gpg_signature.rb
+++ b/spec/factories/gpg_signature.rb
@@ -1,5 +1,3 @@
-require_relative '../support/gpg_helpers'
-
 FactoryBot.define do
   factory :gpg_signature do
     commit_sha { Digest::SHA1.hexdigest(SecureRandom.hex) }
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 857333f222d..40f3fa7d69b 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -1,4 +1,4 @@
-require_relative '../support/repo_helpers'
+require_relative '../support/helpers/repo_helpers'
 
 include ActionDispatch::TestProcess
 
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 1761b6e2a3b..1ae6152a1f0 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -1,4 +1,4 @@
-require_relative '../support/test_env'
+require_relative '../support/helpers/test_env'
 
 FactoryBot.define do
   # Project without repository
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 83664bae046..53045815a6a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -32,42 +32,19 @@ require 'rainbow/ext/string'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
+# Requires helpers, and shared contexts/examples first since they're used in other support files
+Dir[Rails.root.join("spec/support/helpers/*.rb")].each { |f| require f }
+Dir[Rails.root.join("spec/support/shared_contexts/*.rb")].each { |f| require f }
+Dir[Rails.root.join("spec/support/shared_examples/*.rb")].each { |f| require f }
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = false
   config.use_instantiated_fixtures  = false
-  config.mock_with :rspec
 
   config.verbose_retry = true
   config.display_try_failure_messages = true
 
-  config.include Devise::Test::ControllerHelpers, type: :controller
-  config.include Devise::Test::ControllerHelpers, type: :view
-  config.include Devise::Test::IntegrationHelpers, type: :feature
-  config.include Warden::Test::Helpers, type: :request
-  config.include LoginHelpers, type: :feature
-  config.include SearchHelpers, type: :feature
-  config.include CookieHelper, :js
-  config.include InputHelper, :js
-  config.include SelectionHelper, :js
-  config.include InspectRequests, :js
-  config.include WaitForRequests, :js
-  config.include LiveDebugger, :js
-  config.include StubConfiguration
-  config.include EmailHelpers, :mailer, type: :mailer
-  config.include TestEnv
-  config.include ActiveJob::TestHelper
-  config.include ActiveSupport::Testing::TimeHelpers
-  config.include StubGitlabCalls
-  config.include StubGitlabData
-  config.include ApiHelpers, :api
-  config.include Gitlab::Routing, type: :routing
-  config.include MigrationsHelpers, :migration
-  config.include StubFeatureFlags
-  config.include StubENV
-  config.include ExpectOffense
-
   config.infer_spec_type_from_file_location!
 
   config.define_derived_metadata(file_path: %r{/spec/}) do |metadata|
@@ -82,7 +59,33 @@ RSpec.configure do |config|
     metadata[:type] = match[1].singularize.to_sym if match
   end
 
-  config.raise_errors_for_deprecations!
+  config.include ActiveJob::TestHelper
+  config.include ActiveSupport::Testing::TimeHelpers
+  config.include CycleAnalyticsHelpers
+  config.include ExpectOffense
+  config.include FactoryBot::Syntax::Methods
+  config.include FixtureHelpers
+  config.include GitlabRoutingHelper
+  config.include StubFeatureFlags
+  config.include StubGitlabCalls
+  config.include StubGitlabData
+  config.include TestEnv
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Devise::Test::IntegrationHelpers, type: :feature
+  config.include LoginHelpers, type: :feature
+  config.include SearchHelpers, type: :feature
+  config.include EmailHelpers, :mailer, type: :mailer
+  config.include Warden::Test::Helpers, type: :request
+  config.include Gitlab::Routing, type: :routing
+  config.include Devise::Test::ControllerHelpers, type: :view
+  config.include ApiHelpers, :api
+  config.include CookieHelper, :js
+  config.include InputHelper, :js
+  config.include SelectionHelper, :js
+  config.include InspectRequests, :js
+  config.include WaitForRequests, :js
+  config.include LiveDebugger, :js
+  config.include MigrationsHelpers, :migration
 
   if ENV['CI']
     # This includes the first try, i.e. tests will be run 4 times before failing.
diff --git a/spec/support/api_helpers.rb b/spec/support/api_helpers.rb
deleted file mode 100644
index ac0c7a9b493..00000000000
--- a/spec/support/api_helpers.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-module ApiHelpers
-  # Public: Prepend a request path with the path to the API
-  #
-  # path - Path to append
-  # user - User object - If provided, automatically appends private_token query
-  #          string for authenticated requests
-  #
-  # Examples
-  #
-  #   >> api('/issues')
-  #   => "/api/v2/issues"
-  #
-  #   >> api('/issues', User.last)
-  #   => "/api/v2/issues?private_token=..."
-  #
-  #   >> api('/issues?foo=bar', User.last)
-  #   => "/api/v2/issues?foo=bar&private_token=..."
-  #
-  # Returns the relative path to the requested API resource
-  def api(path, user = nil, version: API::API.version, personal_access_token: nil, oauth_access_token: nil)
-    full_path = "/api/#{version}#{path}"
-
-    if oauth_access_token
-      query_string = "access_token=#{oauth_access_token.token}"
-    elsif personal_access_token
-      query_string = "private_token=#{personal_access_token.token}"
-    elsif user
-      personal_access_token = create(:personal_access_token, user: user)
-      query_string = "private_token=#{personal_access_token.token}"
-    end
-
-    if query_string
-      full_path << (path.index('?') ? '&' : '?')
-      full_path << query_string
-    end
-
-    full_path
-  end
-
-  # Temporary helper method for simplifying V3 exclusive API specs
-  def v3_api(path, user = nil, personal_access_token: nil, oauth_access_token: nil)
-    api(
-      path,
-      user,
-      version: 'v3',
-      personal_access_token: personal_access_token,
-      oauth_access_token: oauth_access_token
-    )
-  end
-end
diff --git a/spec/support/background_migrations_matchers.rb b/spec/support/background_migrations_matchers.rb
deleted file mode 100644
index f4127efc6ae..00000000000
--- a/spec/support/background_migrations_matchers.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-RSpec::Matchers.define :be_scheduled_delayed_migration do |delay, *expected|
-  match do |migration|
-    BackgroundMigrationWorker.jobs.any? do |job|
-      job['args'] == [migration, expected] &&
-        job['at'].to_i == (delay.to_i + Time.now.to_i)
-    end
-  end
-
-  failure_message do |migration|
-    "Migration `#{migration}` with args `#{expected.inspect}` " \
-      'not scheduled in expected time!'
-  end
-end
-
-RSpec::Matchers.define :be_scheduled_migration do |*expected|
-  match do |migration|
-    BackgroundMigrationWorker.jobs.any? do |job|
-      args = job['args'].size == 1 ? [BackgroundMigrationWorker.jobs[0]['args'][0], []] : job['args']
-      args == [migration, expected]
-    end
-  end
-
-  failure_message do |migration|
-    "Migration `#{migration}` with args `#{expected.inspect}` not scheduled!"
-  end
-end
diff --git a/spec/support/bare_repo_operations.rb b/spec/support/bare_repo_operations.rb
deleted file mode 100644
index 3f4a4243cb6..00000000000
--- a/spec/support/bare_repo_operations.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'zlib'
-
-class BareRepoOperations
-  include Gitlab::Popen
-
-  def initialize(path_to_repo)
-    @path_to_repo = path_to_repo
-  end
-
-  def commit_tree(tree_id, msg, parent: Gitlab::Git::EMPTY_TREE_ID)
-    commit_tree_args = ['commit-tree', tree_id, '-m', msg]
-    commit_tree_args += ['-p', parent] unless parent == Gitlab::Git::EMPTY_TREE_ID
-    commit_id = execute(commit_tree_args)
-
-    commit_id[0]
-  end
-
-  # Based on https://stackoverflow.com/a/25556917/1856239
-  def commit_file(file, dst_path, branch = 'master')
-    head_id = execute(['show', '--format=format:%H', '--no-patch', branch], allow_failure: true)[0] || Gitlab::Git::EMPTY_TREE_ID
-
-    execute(['read-tree', '--empty'])
-    execute(['read-tree', head_id])
-
-    blob_id = execute(['hash-object', '--stdin', '-w']) do |stdin|
-      stdin.write(file.read)
-    end
-
-    execute(['update-index', '--add', '--cacheinfo', '100644', blob_id[0], dst_path])
-
-    tree_id = execute(['write-tree'])
-
-    commit_id = commit_tree(tree_id[0], "Add #{dst_path}", parent: head_id)
-
-    execute(['update-ref', "refs/heads/#{branch}", commit_id])
-  end
-
-  private
-
-  def execute(args, allow_failure: false)
-    output, status = popen(base_args + args, nil) do |stdin|
-      yield stdin if block_given?
-    end
-
-    unless status.zero?
-      if allow_failure
-        return []
-      else
-        raise "Got a non-zero exit code while calling out `#{args.join(' ')}`: #{output}"
-      end
-    end
-
-    output.split("\n")
-  end
-
-  def base_args
-    [
-      Gitlab.config.git.bin_path,
-      "--git-dir=#{@path_to_repo}"
-    ]
-  end
-end
diff --git a/spec/support/board_helpers.rb b/spec/support/board_helpers.rb
deleted file mode 100644
index 507d0432d7f..00000000000
--- a/spec/support/board_helpers.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module BoardHelpers
-  def click_card(card)
-    within card do
-      first('.card-number').click
-    end
-
-    wait_for_sidebar
-  end
-
-  def wait_for_sidebar
-    # loop until the CSS transition is complete
-    Timeout.timeout(0.5) do
-      loop until evaluate_script('$(".right-sidebar").outerWidth()') == 290
-    end
-  end
-end
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 9ddcc5f2fbf..c0ceb0f6605 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -60,6 +60,8 @@ Capybara::Screenshot.register_driver(:chrome) do |driver, path|
 end
 
 RSpec.configure do |config|
+  config.include CapybaraHelpers, type: :feature
+
   config.before(:context, :js) do
     next if $capybara_server_already_started
 
diff --git a/spec/support/capybara_helpers.rb b/spec/support/capybara_helpers.rb
deleted file mode 100644
index 868233416bf..00000000000
--- a/spec/support/capybara_helpers.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-module CapybaraHelpers
-  # Execute a block a certain number of times before considering it a failure
-  #
-  # The given block is called, and if it raises a `Capybara::ExpectationNotMet`
-  # error, we wait `interval` seconds and then try again, until `retries` is
-  # met.
-  #
-  # This allows for better handling of timing-sensitive expectations in a
-  # sketchy CI environment, for example.
-  #
-  # interval - Delay between retries in seconds (default: 0.5)
-  # retries  - Number of times to execute before failing (default: 5)
-  def allowing_for_delay(interval: 0.5, retries: 5)
-    tries = 0
-
-    begin
-      sleep interval
-
-      yield
-    rescue Capybara::ExpectationNotMet => ex
-      if tries <= retries
-        tries += 1
-        sleep interval
-        retry
-      else
-        raise ex
-      end
-    end
-  end
-
-  # Refresh the page. Calling `visit current_url` doesn't seem to work consistently.
-  #
-  def refresh
-    url = current_url
-    visit 'about:blank'
-    visit url
-  end
-
-  # Simulate a browser restart by clearing the session cookie.
-  def clear_browser_session
-    page.driver.browser.manage.delete_cookie('_gitlab_session')
-  end
-end
-
-RSpec.configure do |config|
-  config.include CapybaraHelpers, type: :feature
-end
diff --git a/spec/support/chat_slash_commands_shared_examples.rb b/spec/support/chat_slash_commands_shared_examples.rb
deleted file mode 100644
index dc97a39f051..00000000000
--- a/spec/support/chat_slash_commands_shared_examples.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-RSpec.shared_examples 'chat slash commands service' do
-  describe "Associations" do
-    it { is_expected.to respond_to :token }
-    it { is_expected.to have_many :chat_names }
-  end
-
-  describe '#valid_token?' do
-    subject { described_class.new }
-
-    context 'when the token is empty' do
-      it 'is false' do
-        expect(subject.valid_token?('wer')).to be_falsey
-      end
-    end
-
-    context 'when there is a token' do
-      before do
-        subject.token = '123'
-      end
-
-      it 'accepts equal tokens' do
-        expect(subject.valid_token?('123')).to be_truthy
-      end
-    end
-  end
-
-  describe '#trigger' do
-    subject { described_class.new }
-
-    context 'no token is passed' do
-      let(:params) { Hash.new }
-
-      it 'returns nil' do
-        expect(subject.trigger(params)).to be_nil
-      end
-    end
-
-    context 'with a token passed' do
-      let(:project) { create(:project) }
-      let(:params) { { token: 'token' } }
-
-      before do
-        allow(subject).to receive(:token).and_return('token')
-      end
-
-      context 'no user can be found' do
-        context 'when no url can be generated' do
-          it 'responds with the authorize url' do
-            response = subject.trigger(params)
-
-            expect(response[:response_type]).to eq :ephemeral
-            expect(response[:text]).to start_with ":sweat_smile: Couldn't identify you"
-          end
-        end
-
-        context 'when an auth url can be generated' do
-          let(:params) do
-            {
-              team_domain: 'http://domain.tld',
-              team_id: 'T3423423',
-              user_id: 'U234234',
-              user_name: 'mepmep',
-              token: 'token'
-            }
-          end
-
-          let(:service) do
-            project.create_mattermost_slash_commands_service(
-              properties: { token: 'token' }
-            )
-          end
-
-          it 'generates the url' do
-            response = service.trigger(params)
-
-            expect(response[:text]).to start_with(':wave: Hi there!')
-          end
-        end
-      end
-
-      context 'when the user is authenticated' do
-        let!(:chat_name) { create(:chat_name, service: subject) }
-        let(:params) { { token: 'token', team_id: chat_name.team_id, user_id: chat_name.chat_id } }
-
-        subject do
-          described_class.create(project: project, properties: { token: 'token' })
-        end
-
-        it 'triggers the command' do
-          expect_any_instance_of(Gitlab::SlashCommands::Command).to receive(:execute)
-
-          subject.trigger(params)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/support/cookie_helper.rb b/spec/support/cookie_helper.rb
deleted file mode 100644
index 5ff7b0b68c9..00000000000
--- a/spec/support/cookie_helper.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Helper for setting cookies in Selenium/WebDriver
-#
-module CookieHelper
-  def set_cookie(name, value, options = {})
-    case page.driver
-    when Capybara::RackTest::Driver
-      rack_set_cookie(name, value)
-    else
-      selenium_set_cookie(name, value, options)
-    end
-  end
-
-  def selenium_set_cookie(name, value, options = {})
-    # Selenium driver will not set cookies for a given domain when the browser is at `about:blank`.
-    # It also doesn't appear to allow overriding the cookie path. loading `/` is the most inclusive.
-    visit options.fetch(:path, '/') unless on_a_page?
-    page.driver.browser.manage.add_cookie(name: name, value: value, **options)
-  end
-
-  def rack_set_cookie(name, value)
-    page.driver.browser.set_cookie("#{name}=#{value}")
-  end
-
-  def get_cookie(name)
-    page.driver.browser.manage.cookie_named(name)
-  end
-
-  private
-
-  def on_a_page?
-    current_url = Capybara.current_session.driver.browser.current_url
-    current_url && current_url != '' && current_url != 'about:blank' && current_url != 'data:,'
-  end
-end
diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb
deleted file mode 100644
index 73cc64c0b74..00000000000
--- a/spec/support/cycle_analytics_helpers.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-module CycleAnalyticsHelpers
-  def create_commit_referencing_issue(issue, branch_name: generate(:branch))
-    project.repository.add_branch(user, branch_name, 'master')
-    create_commit("Commit for ##{issue.iid}", issue.project, user, branch_name)
-  end
-
-  def create_commit(message, project, user, branch_name, count: 1)
-    repository = project.repository
-    oldrev = repository.commit(branch_name).sha
-
-    if Timecop.frozen? && Gitlab::GitalyClient.feature_enabled?(:operation_user_commit_files)
-      mock_gitaly_multi_action_dates(repository.raw)
-    end
-
-    commit_shas = Array.new(count) do |index|
-      commit_sha = repository.create_file(user, generate(:branch), "content", message: message, branch_name: branch_name)
-      repository.commit(commit_sha)
-
-      commit_sha
-    end
-
-    GitPushService.new(project,
-                       user,
-                       oldrev: oldrev,
-                       newrev: commit_shas.last,
-                       ref: 'refs/heads/master').execute
-  end
-
-  def create_cycle(user, project, issue, mr, milestone, pipeline)
-    issue.update(milestone: milestone)
-    pipeline.run
-
-    ci_build = create(:ci_build, pipeline: pipeline, status: :success, author: user)
-
-    merge_merge_requests_closing_issue(user, project, issue)
-    ProcessCommitWorker.new.perform(project.id, user.id, mr.commits.last.to_hash)
-
-    ci_build
-  end
-
-  def create_merge_request_closing_issue(user, project, issue, message: nil, source_branch: nil, commit_message: 'commit message')
-    if !source_branch || project.repository.commit(source_branch).blank?
-      source_branch = generate(:branch)
-      project.repository.add_branch(user, source_branch, 'master')
-    end
-
-    sha = project.repository.create_file(
-      user,
-      generate(:branch),
-      'content',
-      message: commit_message,
-      branch_name: source_branch)
-    project.repository.commit(sha)
-
-    opts = {
-      title: 'Awesome merge_request',
-      description: message || "Fixes #{issue.to_reference}",
-      source_branch: source_branch,
-      target_branch: 'master'
-    }
-
-    mr = MergeRequests::CreateService.new(project, user, opts).execute
-    NewMergeRequestWorker.new.perform(mr, user)
-    mr
-  end
-
-  def merge_merge_requests_closing_issue(user, project, issue)
-    merge_requests = issue.closed_by_merge_requests(user)
-
-    merge_requests.each { |merge_request| MergeRequests::MergeService.new(project, user).execute(merge_request) }
-  end
-
-  def deploy_master(user, project, environment: 'production')
-    dummy_job =
-      case environment
-      when 'production'
-        dummy_production_job(user, project)
-      when 'staging'
-        dummy_staging_job(user, project)
-      else
-        raise ArgumentError
-      end
-
-    CreateDeploymentService.new(dummy_job).execute
-  end
-
-  def dummy_production_job(user, project)
-    new_dummy_job(user, project, 'production')
-  end
-
-  def dummy_staging_job(user, project)
-    new_dummy_job(user, project, 'staging')
-  end
-
-  def dummy_pipeline(project)
-    Ci::Pipeline.new(
-      sha: project.repository.commit('master').sha,
-      ref: 'master',
-      source: :push,
-      project: project,
-      protected: false)
-  end
-
-  def new_dummy_job(user, project, environment)
-    project.environments.find_or_create_by(name: environment)
-
-    Ci::Build.new(
-      project: project,
-      user: user,
-      environment: environment,
-      ref: 'master',
-      tag: false,
-      name: 'dummy',
-      stage: 'dummy',
-      pipeline: dummy_pipeline(project),
-      protected: false)
-  end
-
-  def mock_gitaly_multi_action_dates(raw_repository)
-    allow(raw_repository).to receive(:multi_action).and_wrap_original do |m, *args|
-      new_date = Time.now
-      branch_update = m.call(*args)
-
-      if branch_update.newrev
-        _, opts = args
-        commit = raw_repository.commit(branch_update.newrev).rugged_commit
-        branch_update.newrev = commit.amend(
-          update_ref: "#{Gitlab::Git::BRANCH_REF_PREFIX}#{opts[:branch_name]}",
-          author: commit.author.merge(time: new_date),
-          committer: commit.committer.merge(time: new_date)
-        )
-      end
-
-      branch_update
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.include CycleAnalyticsHelpers
-end
diff --git a/spec/support/database_connection_helpers.rb b/spec/support/database_connection_helpers.rb
deleted file mode 100644
index 763329499f0..00000000000
--- a/spec/support/database_connection_helpers.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module DatabaseConnectionHelpers
-  def run_with_new_database_connection
-    pool = ActiveRecord::Base.connection_pool
-    conn = pool.checkout
-    yield conn
-  ensure
-    pool.checkin(conn)
-  end
-end
diff --git a/spec/support/devise_helpers.rb b/spec/support/devise_helpers.rb
deleted file mode 100644
index 66874e10f38..00000000000
--- a/spec/support/devise_helpers.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module DeviseHelpers
-  # explicitly tells Devise which mapping to use
-  # this is needed when we are testing a Devise controller bypassing the router
-  def set_devise_mapping(context:)
-    env = env_from_context(context)
-
-    env['devise.mapping'] = Devise.mappings[:user] if env
-  end
-
-  def env_from_context(context)
-    if context.respond_to?(:env_config)
-      context.env_config
-    elsif context.respond_to?(:env)
-      context.env
-    end
-  end
-end
diff --git a/spec/support/drag_to_helper.rb b/spec/support/drag_to_helper.rb
deleted file mode 100644
index ae149631ed9..00000000000
--- a/spec/support/drag_to_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module DragTo
-  def drag_to(list_from_index: 0, from_index: 0, to_index: 0, list_to_index: 0, selector: '', scrollable: 'body')
-    evaluate_script("simulateDrag({scrollable: $('#{scrollable}').get(0), from: {el: $('#{selector}').eq(#{list_from_index}).get(0), index: #{from_index}}, to: {el: $('#{selector}').eq(#{list_to_index}).get(0), index: #{to_index}}});")
-
-    Timeout.timeout(Capybara.default_max_wait_time) do
-      loop while drag_active?
-    end
-  end
-
-  def drag_active?
-    page.evaluate_script('window.SIMULATE_DRAG_ACTIVE').nonzero?
-  end
-end
diff --git a/spec/support/dropzone_helper.rb b/spec/support/dropzone_helper.rb
deleted file mode 100644
index fe72d320fcf..00000000000
--- a/spec/support/dropzone_helper.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-module DropzoneHelper
-  # Provides a way to perform `attach_file` for a Dropzone-based file input
-  #
-  # This is accomplished by creating a standard HTML file input on the page,
-  # performing `attach_file` on that field, and then triggering the appropriate
-  # Dropzone events to perform the actual upload.
-  #
-  # This method waits for the upload to complete before returning.
-  # max_file_size is an optional parameter.
-  # If it's not 0, then it used in dropzone.maxFilesize parameter.
-  # wait_for_queuecomplete is an optional parameter.
-  # If it's 'false', then the helper will NOT wait for backend response
-  # It lets to test behaviors while AJAX is processing.
-  def dropzone_file(files, max_file_size = 0, wait_for_queuecomplete = true)
-    # Generate a fake file input that Capybara can attach to
-    page.execute_script <<-JS.strip_heredoc
-      $('#fakeFileInput').remove();
-      var fakeFileInput = window.$('<input/>').attr(
-        {id: 'fakeFileInput', type: 'file', multiple: true}
-      ).appendTo('body');
-
-      window._dropzoneComplete = false;
-    JS
-
-    # Attach files to the fake input selector with Capybara
-    attach_file('fakeFileInput', files)
-
-    # Manually trigger a Dropzone "drop" event with the fake input's file list
-    page.execute_script <<-JS.strip_heredoc
-      var dropzone = $('.div-dropzone')[0].dropzone;
-      dropzone.options.autoProcessQueue = false;
-
-      if (#{max_file_size} > 0) {
-        dropzone.options.maxFilesize = #{max_file_size};
-      }
-
-      dropzone.on('queuecomplete', function() {
-        window._dropzoneComplete = true;
-      });
-
-      var fileList = [$('#fakeFileInput')[0].files];
-
-      $.map(fileList, function(file){
-        var e = jQuery.Event('drop', { dataTransfer : { files : file } });
-
-        dropzone.listeners[0].events.drop(e);
-      });
-
-      dropzone.processQueue();
-    JS
-
-    if wait_for_queuecomplete
-      # Wait until Dropzone's fired `queuecomplete`
-      loop until page.evaluate_script('window._dropzoneComplete === true')
-    end
-  end
-
-  def drop_in_dropzone(file_path)
-    # Generate a fake input selector
-    page.execute_script <<-JS
-      var fakeFileInput = window.$('<input/>').attr(
-        {id: 'fakeFileInput', type: 'file'}
-      ).appendTo('body');
-    JS
-
-    # Attach the file to the fake input selector with Capybara
-    attach_file('fakeFileInput', file_path)
-
-    # Add the file to a fileList array and trigger the fake drop event
-    page.execute_script <<-JS
-      var fileList = [$('#fakeFileInput')[0].files[0]];
-      var e = jQuery.Event('drop', { dataTransfer : { files : fileList } });
-      $('.dropzone')[0].dropzone.listeners[0].events.drop(e);
-    JS
-  end
-end
diff --git a/spec/support/email_format_shared_examples.rb b/spec/support/email_format_shared_examples.rb
deleted file mode 100644
index b924a208e71..00000000000
--- a/spec/support/email_format_shared_examples.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Specifications for behavior common to all objects with an email attribute.
-# Takes a list of email-format attributes and requires:
-# - subject { "the object with a attribute= setter"  }
-#   Note: You have access to `email_value` which is the email address value
-#         being currently tested).
-
-shared_examples 'an object with email-formated attributes' do |*attributes|
-  attributes.each do |attribute|
-    describe "specifically its :#{attribute} attribute" do
-      %w[
-        info@example.com
-        info+test@example.com
-        o'reilly@example.com
-        mailto:test@example.com
-        lol!'+=?><#$%^&*()@gmail.com
-      ].each do |valid_email|
-        context "with a value of '#{valid_email}'" do
-          let(:email_value) { valid_email }
-
-          it 'is valid' do
-            subject.send("#{attribute}=", valid_email)
-
-            expect(subject).to be_valid
-          end
-        end
-      end
-
-      %w[
-        foobar
-        test@test@example.com
-      ].each do |invalid_email|
-        context "with a value of '#{invalid_email}'" do
-          let(:email_value) { invalid_email }
-
-          it 'is invalid' do
-            subject.send("#{attribute}=", invalid_email)
-
-            expect(subject).to be_invalid
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/support/email_helpers.rb b/spec/support/email_helpers.rb
deleted file mode 100644
index 1fb8252459f..00000000000
--- a/spec/support/email_helpers.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-module EmailHelpers
-  def sent_to_user(user, recipients: email_recipients)
-    recipients.count { |to| to == user.notification_email }
-  end
-
-  def reset_delivered_emails!
-    ActionMailer::Base.deliveries.clear
-  end
-
-  def should_only_email(*users, kind: :to)
-    recipients = email_recipients(kind: kind)
-
-    users.each { |user| should_email(user, recipients: recipients) }
-
-    expect(recipients.count).to eq(users.count)
-  end
-
-  def should_email(user, times: 1, recipients: email_recipients)
-    expect(sent_to_user(user, recipients: recipients)).to eq(times)
-  end
-
-  def should_not_email(user, recipients: email_recipients)
-    should_email(user, times: 0, recipients: recipients)
-  end
-
-  def should_not_email_anyone
-    expect(ActionMailer::Base.deliveries).to be_empty
-  end
-
-  def email_recipients(kind: :to)
-    ActionMailer::Base.deliveries.flat_map(&kind)
-  end
-
-  def find_email_for(user)
-    ActionMailer::Base.deliveries.find { |d| d.to.include?(user.notification_email) }
-  end
-end
diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb
deleted file mode 100644
index c7890e49c66..00000000000
--- a/spec/support/factory_bot.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.include FactoryBot::Syntax::Methods
-end
diff --git a/spec/support/fake_migration_classes.rb b/spec/support/fake_migration_classes.rb
deleted file mode 100644
index b0fc8422857..00000000000
--- a/spec/support/fake_migration_classes.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class FakeRenameReservedPathMigrationV1 < ActiveRecord::Migration
-  include Gitlab::Database::RenameReservedPathsMigration::V1
-
-  def version
-    '20170316163845'
-  end
-
-  def name
-    "FakeRenameReservedPathMigrationV1"
-  end
-end
diff --git a/spec/support/fake_u2f_device.rb b/spec/support/fake_u2f_device.rb
deleted file mode 100644
index a7605cd483a..00000000000
--- a/spec/support/fake_u2f_device.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-class FakeU2fDevice
-  attr_reader :name
-
-  def initialize(page, name)
-    @page = page
-    @name = name
-  end
-
-  def respond_to_u2f_registration
-    app_id = @page.evaluate_script('gon.u2f.app_id')
-    challenges = @page.evaluate_script('gon.u2f.challenges')
-
-    json_response = u2f_device(app_id).register_response(challenges[0])
-
-    @page.execute_script("
-    u2f.register = function(appId, registerRequests, signRequests, callback) {
-      callback(#{json_response});
-    };
-    ")
-  end
-
-  def respond_to_u2f_authentication
-    app_id = @page.evaluate_script('gon.u2f.app_id')
-    challenge = @page.evaluate_script('gon.u2f.challenge')
-    json_response = u2f_device(app_id).sign_response(challenge)
-
-    @page.execute_script("
-    u2f.sign = function(appId, challenges, signRequests, callback) {
-      callback(#{json_response});
-    };
-    window.gl.u2fAuthenticate.start();
-    ")
-  end
-
-  private
-
-  def u2f_device(app_id)
-    @u2f_device ||= U2F::FakeU2F.new(app_id)
-  end
-end
diff --git a/spec/support/filter_item_select_helper.rb b/spec/support/filter_item_select_helper.rb
deleted file mode 100644
index 519e84d359e..00000000000
--- a/spec/support/filter_item_select_helper.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Helper allows you to select value from filter-items
-#
-# Params
-#   value - value for select
-#   selector - css selector of item
-#
-# Usage:
-#
-#   filter_item_select('Any Author', '.js-author-search')
-#
-module FilterItemSelectHelper
-  def filter_item_select(value, selector)
-    find(selector).click
-    wait_for_requests
-    page.within('.dropdown-content') do
-      click_link value
-    end
-  end
-end
diff --git a/spec/support/filter_spec_helper.rb b/spec/support/filter_spec_helper.rb
deleted file mode 100644
index 721d359c2ee..00000000000
--- a/spec/support/filter_spec_helper.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# Helper methods for Banzai filter specs
-#
-# Must be included into specs manually
-module FilterSpecHelper
-  extend ActiveSupport::Concern
-
-  # Perform `call` on the described class
-  #
-  # Automatically passes the current `project` value, if defined, to the context
-  # if none is provided.
-  #
-  # html     - HTML String to pass to the filter's `call` method.
-  # context - Hash context for the filter. (default: {project: project})
-  #
-  # Returns a Nokogiri::XML::DocumentFragment
-  def filter(html, context = {})
-    if defined?(project)
-      context.reverse_merge!(project: project)
-    end
-
-    render_context = Banzai::RenderContext
-      .new(context[:project], context[:current_user])
-
-    context = context.merge(render_context: render_context)
-
-    described_class.call(html, context)
-  end
-
-  # Run text through HTML::Pipeline with the current filter and return the
-  # result Hash
-  #
-  # body     - String text to run through the pipeline
-  # context - Hash context for the filter. (default: {project: project})
-  #
-  # Returns the Hash
-  def pipeline_result(body, context = {})
-    context.reverse_merge!(project: project) if defined?(project)
-
-    pipeline = HTML::Pipeline.new([described_class], context)
-    pipeline.call(body)
-  end
-
-  def reference_pipeline(context = {})
-    context.reverse_merge!(project: project) if defined?(project)
-
-    filters = [
-      Banzai::Filter::AutolinkFilter,
-      described_class
-    ]
-
-    HTML::Pipeline.new(filters, context)
-  end
-
-  def reference_pipeline_result(body, context = {})
-    reference_pipeline(context).call(body)
-  end
-
-  def reference_filter(html, context = {})
-    reference_pipeline(context).to_document(html)
-  end
-
-  # Modify a String reference to make it invalid
-  #
-  # Commit SHAs get reversed, IDs get incremented by 1, all other Strings get
-  # their word characters reversed.
-  #
-  # reference - String reference to modify
-  #
-  # Returns a String
-  def invalidate_reference(reference)
-    if reference =~ /\A(.+)?[^\d]\d+\z/
-      # Integer-based reference with optional project prefix
-      reference.gsub(/\d+\z/) { |i| i.to_i + 10_000 }
-    elsif reference =~ /\A(.+@)?(\h{7,40}\z)/
-      # SHA-based reference with optional prefix
-      reference.gsub(/\h{7,40}\z/) { |v| v.reverse }
-    else
-      reference.gsub(/\w+\z/) { |v| v.reverse }
-    end
-  end
-
-  # Shortcut to Rails' auto-generated routes helpers, to avoid including the
-  # module
-  def urls
-    Gitlab::Routing.url_helpers
-  end
-end
diff --git a/spec/support/filtered_search_helpers.rb b/spec/support/filtered_search_helpers.rb
deleted file mode 100644
index 5f42ff77fb2..00000000000
--- a/spec/support/filtered_search_helpers.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-module FilteredSearchHelpers
-  def filtered_search
-    page.find('.filtered-search')
-  end
-
-  # Enables input to be set (similar to copy and paste)
-  def input_filtered_search(search_term, submit: true, extra_space: true)
-    search = search_term
-    if extra_space
-      # Add an extra space to engage visual tokens
-      search = "#{search_term} "
-    end
-
-    filtered_search.set(search)
-
-    if submit
-      # Wait for the lazy author/assignee tokens that
-      # swap out the username with an avatar and name
-      wait_for_requests
-      filtered_search.send_keys(:enter)
-    end
-  end
-
-  # Select a label clicking in the search dropdown instead
-  # of entering label names on the input.
-  def select_label_on_dropdown(label_title)
-    input_filtered_search("label:", submit: false)
-
-    within('#js-dropdown-label') do
-      wait_for_requests
-
-      find('li', text: label_title).click
-    end
-
-    filtered_search.send_keys(:enter)
-  end
-
-  def expect_issues_list_count(open_count, closed_count = 0)
-    all_count = open_count + closed_count
-
-    expect(page).to have_issuable_counts(open: open_count, closed: closed_count, all: all_count)
-    page.within '.issues-list' do
-      expect(page).to have_selector('.issue', count: open_count)
-    end
-  end
-
-  # Enables input to be added character by character
-  def input_filtered_search_keys(search_term)
-    # Add an extra space to engage visual tokens
-    filtered_search.send_keys("#{search_term} ")
-    filtered_search.send_keys(:enter)
-  end
-
-  def expect_filtered_search_input(input)
-    expect(find('.filtered-search').value).to eq(input)
-  end
-
-  def clear_search_field
-    find('.filtered-search-box .clear-search').click
-  end
-
-  def reset_filters
-    clear_search_field
-    filtered_search.send_keys(:enter)
-  end
-
-  def init_label_search
-    filtered_search.set('label:')
-    # This ensures the dropdown is shown
-    expect(find('#js-dropdown-label')).not_to have_css('.filter-dropdown-loading')
-  end
-
-  def expect_filtered_search_input_empty
-    expect(find('.filtered-search').value).to eq('')
-  end
-
-  # Iterates through each visual token inside
-  # .tokens-container to make sure the correct names and values are rendered
-  def expect_tokens(tokens)
-    page.within '.filtered-search-box .tokens-container' do
-      page.all(:css, '.tokens-container li .selectable').each_with_index do |el, index|
-        token_name = tokens[index][:name]
-        token_value = tokens[index][:value]
-        token_emoji = tokens[index][:emoji_name]
-
-        expect(el.find('.name')).to have_content(token_name)
-
-        if token_value
-          expect(el.find('.value')).to have_content(token_value)
-        end
-
-        # gl-emoji content is blank when the emoji unicode is not supported
-        if token_emoji
-          selector = %(gl-emoji[data-name="#{token_emoji}"])
-          expect(el.find('.value')).to have_css(selector)
-        end
-      end
-    end
-  end
-
-  def create_token(token_name, token_value = nil, symbol = nil)
-    { name: token_name, value: "#{symbol}#{token_value}" }
-  end
-
-  def author_token(author_name = nil)
-    create_token('Author', author_name)
-  end
-
-  def assignee_token(assignee_name = nil)
-    create_token('Assignee', assignee_name)
-  end
-
-  def milestone_token(milestone_name = nil, has_symbol = true)
-    symbol = has_symbol ? '%' : nil
-    create_token('Milestone', milestone_name, symbol)
-  end
-
-  def label_token(label_name = nil, has_symbol = true)
-    symbol = has_symbol ? '~' : nil
-    create_token('Label', label_name, symbol)
-  end
-
-  def emoji_token(emoji_name = nil)
-    { name: 'My-Reaction', emoji_name: emoji_name }
-  end
-
-  def default_placeholder
-    'Search or filter results...'
-  end
-
-  def get_filtered_search_placeholder
-    find('.filtered-search')['placeholder']
-  end
-
-  def remove_recent_searches
-    execute_script('window.localStorage.clear();')
-  end
-
-  def set_recent_searches(key, input)
-    execute_script("window.localStorage.setItem('#{key}', '#{input}');")
-  end
-
-  def wait_for_filtered_search(text)
-    Timeout.timeout(Capybara.default_max_wait_time) do
-      loop until find('.filtered-search').value.strip == text
-    end
-  end
-end
diff --git a/spec/support/fixture_helpers.rb b/spec/support/fixture_helpers.rb
deleted file mode 100644
index 8854382dc6b..00000000000
--- a/spec/support/fixture_helpers.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module FixtureHelpers
-  def fixture_file(filename, dir: '')
-    return '' if filename.blank?
-
-    File.read(expand_fixture_path(filename, dir: dir))
-  end
-
-  def expand_fixture_path(filename, dir: '')
-    File.expand_path(Rails.root.join(dir, 'spec', 'fixtures', filename))
-  end
-end
-
-RSpec.configure do |config|
-  config.include FixtureHelpers
-end
diff --git a/spec/support/generate-seed-repo-rb b/spec/support/generate-seed-repo-rb
index 876b3b8242d..44b3de23b99 100755
--- a/spec/support/generate-seed-repo-rb
+++ b/spec/support/generate-seed-repo-rb
@@ -8,7 +8,7 @@
 #
 # Usage:
 #
-#   ./spec/support/generate-seed-repo-rb > spec/support/seed_repo.rb
+#   ./spec/support/generate-seed-repo-rb > spec/support/helpers/seed_repo.rb
 #
 #
 
diff --git a/spec/support/git_http_helpers.rb b/spec/support/git_http_helpers.rb
deleted file mode 100644
index b8289e6c5f1..00000000000
--- a/spec/support/git_http_helpers.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-module GitHttpHelpers
-  def clone_get(project, options = {})
-    get "/#{project}/info/refs", { service: 'git-upload-pack' }, auth_env(*options.values_at(:user, :password, :spnego_request_token))
-  end
-
-  def clone_post(project, options = {})
-    post "/#{project}/git-upload-pack", {}, auth_env(*options.values_at(:user, :password, :spnego_request_token))
-  end
-
-  def push_get(project, options = {})
-    get "/#{project}/info/refs", { service: 'git-receive-pack' }, auth_env(*options.values_at(:user, :password, :spnego_request_token))
-  end
-
-  def push_post(project, options = {})
-    post "/#{project}/git-receive-pack", {}, auth_env(*options.values_at(:user, :password, :spnego_request_token))
-  end
-
-  def download(project, user: nil, password: nil, spnego_request_token: nil)
-    args = [project, { user: user, password: password, spnego_request_token: spnego_request_token }]
-
-    clone_get(*args)
-    yield response
-
-    clone_post(*args)
-    yield response
-  end
-
-  def upload(project, user: nil, password: nil, spnego_request_token: nil)
-    args = [project, { user: user, password: password, spnego_request_token: spnego_request_token }]
-
-    push_get(*args)
-    yield response
-
-    push_post(*args)
-    yield response
-  end
-
-  def download_or_upload(*args, &block)
-    download(*args, &block)
-    upload(*args, &block)
-  end
-
-  def auth_env(user, password, spnego_request_token)
-    env = workhorse_internal_api_request_header
-    if user
-      env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(user, password)
-    elsif spnego_request_token
-      env['HTTP_AUTHORIZATION'] = "Negotiate #{::Base64.strict_encode64('opaque_request_token')}"
-    end
-
-    env
-  end
-
-  def git_access_error(error_key)
-    message = Gitlab::GitAccess::ERROR_MESSAGES[error_key]
-    message || raise("GitAccess error message key '#{error_key}' not found")
-  end
-
-  def git_access_wiki_error(error_key)
-    message = Gitlab::GitAccessWiki::ERROR_MESSAGES[error_key]
-    message || raise("GitAccessWiki error message key '#{error_key}' not found")
-  end
-
-  def change_access_error(error_key)
-    message = Gitlab::Checks::ChangeAccess::ERROR_MESSAGES[error_key]
-    message || raise("ChangeAccess error message key '#{error_key}' not found")
-  end
-end
diff --git a/spec/support/gitlab-git-test.git/README.md b/spec/support/gitlab-git-test.git/README.md
index f072cd421be..f757e613ee6 100644
--- a/spec/support/gitlab-git-test.git/README.md
+++ b/spec/support/gitlab-git-test.git/README.md
@@ -12,5 +12,5 @@ inflate the size of the gitlab-ce repository.
 - make changes in your local clone of gitlab-git-test
 - run `git push` which will push to your local source `gitlab-ce/spec/support/gitlab-git-test.git`
 - in gitlab-ce: run `spec/support/prepare-gitlab-git-test-for-commit`
-- in gitlab-ce: `git add spec/support/seed_repo.rb spec/support/gitlab-git-test.git`
+- in gitlab-ce: `git add spec/support/helpers/seed_repo.rb spec/support/gitlab-git-test.git`
 - commit your changes in gitlab-ce
diff --git a/spec/support/gitlab_verify.rb b/spec/support/gitlab_verify.rb
deleted file mode 100644
index 13e2e37624d..00000000000
--- a/spec/support/gitlab_verify.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-RSpec.shared_examples 'Gitlab::Verify::BatchVerifier subclass' do
-  describe 'batching' do
-    let(:first_batch) { objects[0].id..objects[0].id }
-    let(:second_batch) { objects[1].id..objects[1].id }
-    let(:third_batch) { objects[2].id..objects[2].id }
-
-    it 'iterates through objects in batches' do
-      expect(collect_ranges).to eq([first_batch, second_batch, third_batch])
-    end
-
-    it 'allows the starting ID to be specified' do
-      expect(collect_ranges(start: second_batch.first)).to eq([second_batch, third_batch])
-    end
-
-    it 'allows the finishing ID to be specified' do
-      expect(collect_ranges(finish: second_batch.last)).to eq([first_batch, second_batch])
-    end
-  end
-end
-
-module GitlabVerifyHelpers
-  def collect_ranges(args = {})
-    verifier = described_class.new(args.merge(batch_size: 1))
-
-    collect_results(verifier).map { |range, _| range }
-  end
-
-  def collect_failures
-    verifier = described_class.new(batch_size: 1)
-
-    out = {}
-
-    collect_results(verifier).map { |_, failures| out.merge!(failures) }
-
-    out
-  end
-
-  def collect_results(verifier)
-    out = []
-
-    verifier.run_batches { |*args| out << args }
-
-    out
-  end
-end
diff --git a/spec/support/gpg_helpers.rb b/spec/support/gpg_helpers.rb
deleted file mode 100644
index 3f7279a50e0..00000000000
--- a/spec/support/gpg_helpers.rb
+++ /dev/null
@@ -1,517 +0,0 @@
-module GpgHelpers
-  SIGNED_COMMIT_SHA = '8a852d50dda17cc8fd1408d2fd0c5b0f24c76ca4'.freeze
-
-  module User1
-    extend self
-
-    def signed_commit_signature
-      <<~SIGNATURE
-        -----BEGIN PGP SIGNATURE-----
-        Version: GnuPG v1
-
-        iJwEAAECAAYFAliu264ACgkQzPvhnwCsix1VXgP9F6zwAMb3OXKZzqGxJ4MQIBoL
-        OdiUSJpL/4sIA9uhFeIv3GIA+uhsG1BHHsG627+sDy7b8W9VWEd7tbcoz4Mvhf3P
-        8g0AIt9/KJuStQZDrXwP1uP6Rrl759nDcNpoOKdSQ5EZ1zlRzeDROlZeDp7Ckfvw
-        GLmN/74Gl3pk0wfgHFY=
-        =wSgS
-        -----END PGP SIGNATURE-----
-      SIGNATURE
-    end
-
-    def signed_commit_base_data
-      <<~SIGNEDDATA
-        tree ed60cfd202644fda1abaf684e7d965052db18c13
-        parent caf6a0334a855e12f30205fff3d7333df1f65127
-        author Nannie Bernhard <nannie.bernhard@example.com> 1487854510 +0100
-        committer Nannie Bernhard <nannie.bernhard@example.com> 1487854510 +0100
-
-        signed commit, verified key/email
-      SIGNEDDATA
-    end
-
-    def secret_key
-      <<~KEY.strip
-        -----BEGIN PGP PRIVATE KEY BLOCK-----
-        Version: GnuPG v1
-
-        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
-        =b6UD
-        -----END PGP PRIVATE KEY BLOCK-----
-      KEY
-    end
-
-    def public_key
-      <<~KEY.strip
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-        Version: GnuPG v1
-
-        mI0EWK7VJwEEANSFayuVYenl7sBKUjmIxwDRc3jd+K+FWUZgknLgiLcevaLh/mxV
-        98dLxDKGDHHNKc/B7Y4qdlZYv1wfNQVuIbd8dqUQFOOkH7ukbgcGBTxH+2IM67y+
-        QBH618luS5Gz1d4bd0YoFf/xZGEh9G5xicz7TiXYzLKjnMjHu2EmbFePABEBAAG0
-        LU5hbm5pZSBCZXJuaGFyZCA8bmFubmllLmJlcm5oYXJkQGV4YW1wbGUuY29tPoi4
-        BBMBAgAiBQJYrtUnAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDM++Gf
-        AKyLHaeSA/99oUWpb02PlfkALcx5RncboMHkgczYEU9wOFIgvXIReswThCMOvPZa
-        piui+ItyJfV3ijJfO8IvbbFcvU7jjGA073Bb7tbzAEOQLA16mWgBLQlGaRWbHDW4
-        uwFxvkJKA0GzEsadEXeniESaZPc4rOXKPO3+/MSQWS2bmvvGsBTEuriNBFiu1ScB
-        BADIXkITf+kKCkD+n8tMsdTLInefu8KrJ8p7YRYCCabEXnWRsDb5zxUAG2VXCVUh
-        Yl6QXQybkNiBaduS+uxilz7gtYZUMFJvQ09+fV7D2N9B7u/1bGdIYz+cDFJnEJit
-        LY4w/nju2Sno5CL5Ead8sZuslKetSXPYHR/kbW462EOw5wARAQABiJ8EGAECAAkF
-        Aliu1ScCGwwACgkQzPvhnwCsix2WRQQAtOXpBS60myrBUXhlcqabDQgSTw+Spbgb
-        61hEMckyzpk7SfMNLz0EbYMvj9SU6znBG8RGeUljPTVMxPGr9yIpoFMSPKAUi/0K
-        AgRmH3tVpxlMipwXjST1Jukk2eHckt/3jGw3E1ElMSFtULe6u5p4gu578hHukEwT
-        IKzj0ZyC7DI=
-        =Ug0r
-        -----END PGP PUBLIC KEY BLOCK-----
-      KEY
-    end
-
-    def public_key_with_extra_signing_key
-      <<~KEY.strip
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-        Version: GnuPG v1
-
-        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
-        DMVGWrg4m1NF8N6yMPMP
-        =RB1y
-        -----END PGP PUBLIC KEY BLOCK-----
-      KEY
-    end
-
-    def primary_keyid
-      fingerprint[-16..-1]
-    end
-
-    def fingerprint
-      '5F7EA3981A5845B141ABD522CCFBE19F00AC8B1D'
-    end
-
-    def names
-      ['Nannie Bernhard']
-    end
-
-    def emails
-      ['nannie.bernhard@example.com']
-    end
-  end
-
-  module User2
-    extend self
-
-    def private_key
-      <<~KEY.strip
-        -----BEGIN PGP PRIVATE KEY BLOCK-----
-        Version: GnuPG v1
-
-        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
-        =yEqv
-        -----END PGP PRIVATE KEY BLOCK-----
-      KEY
-    end
-
-    def public_key
-      <<~KEY.strip
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-        Version: GnuPG v1
-
-        mI0EWK6qKgEEAODjqOSIBNYzL23WenEVYnvvGJs9d1SjfosBmBnq4a6eBLNwUvjn
-        Rt0TIwwablEmnoMJiRmXBAOUz/9gSrB/QKar8CJsLmb1sevuF/mwzGXjSywnh+N3
-        NPqh2KE7S/EPYBFKu2LCQRLMXGMnnWaM590+8AZ/S5zHOB5F9SUKszeTABEBAAG0
-        L0JldHRlIENhcnR3cmlnaHQgPGJldHRlLmNhcnR3cmlnaHRAZXhhbXBsZS5jb20+
-        iLgEEwECACIFAliuqioCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEL+d
-        kl+RHv1lQhsD/0LDi008hCeoZdGMuwy2N5FMUusYg/X1tRQ6E0JcYYjvvE5oIZoX
-        bVN0yLLD99P0rt6TSlt05CC7RPVPCNpKxKbF+TZMjMJiOi13XmY5Yti77ZMdBZtD
-        7HeBzjkWCVuR6k8eIwy83niHGI6p6G87Q6XxvDjQ7wdBCNBpwkzmTYIBtC9CZXR0
-        ZSBDYXJ0d3JpZ2h0IDxiZXR0ZS5jYXJ0d3JpZ2h0QGV4YW1wbGUubmV0Poi4BBMB
-        AgAiBQJYrwLFAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRC/nZJfkR79
-        ZVzsBADYe3Hv71I7+lTJDvKOTmV7M4ShOfjEpmDvL/5JB3FzXHAucCOlReCv/6+N
-        afAspPTc1uys47dvtePwQalroAsd8Y1grn/PCh+Tx27kpn1WG8yZjUsuq3z5rrGR
-        uXj6g8aeZdqkMTHUVF9Gd+g/5KDODdJbOjwH+l63b/bOiATDFbiNBFiuqioBBADe
-        5nUdVOcbZlnxOjl0KBAT+A5bmyBLUT0BmLPsmA4PuXDSth7WvibPC8wcCdCYVk0I
-        RMYneZUiWq/o5c4rthfLR4jg8kruvomQ4E4d4hyI6R0MLxXYZ3XMu67VuScFgbLU
-        Rw1eRZ16ANd3Nc1VuFW7ms0vCG0idB8iSZBoULaK8QARAQABiJ8EGAECAAkFAliu
-        qioCGwwACgkQv52SX5Ee/WVCCAQA1bBDCuVPYEUtZXwXH7CWDfX6ZyOROrQtpa7e
-        i54CW6hKX3fYHpOiu4yHromjGlINTjjHclsJpn/qmiJizkB9/xl7IRWV+RVpDshZ
-        3mymOldpLiKgI5+Rl6mZtO4TtM9BYziIEC24h+IkaLBylZYz4ogfbzXKF8JxtHPM
-        UuwJVDE=
-        =0vYo
-        -----END PGP PUBLIC KEY BLOCK-----
-      KEY
-    end
-
-    def primary_keyid
-      fingerprint[-16..-1]
-    end
-
-    def fingerprint
-      '6D494CA6FC90C0CAE0910E42BF9D925F911EFD65'
-    end
-
-    def names
-      ['Bette Cartwright', 'Bette Cartwright']
-    end
-
-    def emails
-      ['bette.cartwright@example.com', 'bette.cartwright@example.net']
-    end
-  end
-
-  # GPG Key with extra signing key
-  module User3
-    extend self
-
-    def signed_commit_signature
-      <<~SIGNATURE
-        -----BEGIN PGP SIGNATURE-----
-
-        iQEzBAABCAAdFiEEBSLdKbmPFnzYQhdS44/8r3Wr2SoFAlnNlT8ACgkQ44/8r3Wr
-        2SqP1wf9FC4J2S8LIHs/fpxgkYzsyCp5lCbS7JuoD4pqmI2KWyBx+vi9/3mZPCsm
-        Fj9f0vFEtNOb39GNGZbaA8DdGw30/WAS6kI6yco0WSK53KHrLw9Kqd+3e/NAVSsl
-        991Gq4n8X1U5izSH+gZOMtEEUBGqIlZKgRrEh7lhNcz0G7JTF2VCE4NNtZdq7GDA
-        N6jOQxDGUwi9wQBYORQzIBc3NihfhGloII1hXf0XzrgUY3zNYHTT7QipCxKAmH54
-        skwW+wi8RpBedar4saf7fs5xZbP/0yyVz98MJMdHBL68++Xt1AIHoqrb7eWszqnd
-        PCo/fnz1iHKCig602KLj0/zhADcNkg==
-        =LsTi
-        -----END PGP SIGNATURE-----
-      SIGNATURE
-    end
-
-    def signed_commit_base_data
-      <<~SIGNEDDATA
-        tree 86ec18bfe87ad42a782fdabd8310f9b7ac750f51
-        parent 2d1096e3a0ecf1d2baf6dee036cc80775d4940ba
-        author John Doe <john.doe@example.com> 1506645311 -0500
-        committer John Doe <john.doe@example.com> 1506645311 -0500
-
-        Commit signed with subkey by John Doe
-      SIGNEDDATA
-    end
-
-    def public_key
-      <<~KEY.strip
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-
-        mQENBFnNgbIBCAC9/WblcR4s/pFTwh9cm2iS59YRhtGfbrnfNE6QMIFIRFaK0u6J
-        LDy+scipXLoGg7X0XNFLW6Y457UUpkaPDVLPuVMONhMXdVqndGVvk9jq3D4oDtRa
-        ukucuXr9F84lHnjL3EosmAUiK3xBmHOGHm8+bvKbgPOdvre48YxoJ1POTen+chfo
-        YtLUfnC9EEGY/bn00aaXm3NV+zZK2zio5bFX9YLWSNh/JaXxuJsLoHR/lVrU7CLt
-        FCaGcPQ9SU46LHPshEYWO7ZsjEYJsYYOIOEzfcfR47T2EDTa6mVc++gC5TCoY3Ql
-        jccgm+EM0LvyEHwupEpxzCg2VsT0yoedhUhtABEBAAG0H0pvaG4gRG9lIDxqb2hu
-        LmRvZUBleGFtcGxlLmNvbT6JAVQEEwEIAD4WIQTqP4uIlyqP1HSHLy8RWzrxqtPt
-        ugUCWc2BsgIbAwUJA8JnAAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRARWzrx
-        qtPturMDCACc1Pi1sLJFcCnJEc9sCInCO4LH8fntNjRLN3MTPU5YCYmFM3fAl5ly
-        vXPZ4jNWZxKbQVeFnkDOg5Ti8bzmFEMc8KbZuguktVFizxnLdFCTTRO89i3HDVSN
-        bIosrs5HJwRKOzul6i2whn3dsr8/P8WJczYjZGiw29hGwH3md4Thn/aAGbzjoCEF
-        IfIb1kccyHMJkaj79S8B2agsbEJLuTSfsXC3kGZIJyKG1DNmDUHW/ZE6ro/Kkhik
-        3w6Jw14cMsKUIOBkOgsD/gXgX9xxWjYHmKrbCXucTKUevNlaCy5tzwrC0Am3prl9
-        OJj3macOA8hNaTVDflEHNCwHOwqnVQYyuQENBFnNgbIBCAC59MmKc0cqPRPTpCZ5
-        arKRoj23SNKWMDWaxSELdU91Wd/NJk4wF25urk9BtBuwjzaBMqb/xPD88yJC3ucs
-        2LwCyAb5C/dHcPOpys8Pd+KrdHDR3zAMjcASsizlW/qFI9MtjhcU9Yd6iTUejAZG
-        NEC76WALJ3SLYzCaDkHFjWpH3Xq6ck3/9jpL3csn/5GLCsZQUDYGrZSXvHAIigwW
-        Xo6tMs5LCCO9CZg2qGDpvqlzcmy6CRkf0h/UFYJzGqfbJtxeCIxa93WIPE8eGwao
-        aneDlNtIoYiP6krC3OLsaPWT58QltNKaQuZSpjwtQBHa4JIt55vx+FcvRb7Kflgf
-        fT8bABEBAAGJATwEGAEIACYWIQTqP4uIlyqP1HSHLy8RWzrxqtPtugUCWc2BsgIb
-        DAUJA8JnAAAKCRARWzrxqtPtuqJjCACj+Z4qtgMpJXx3u58wCzkVLl5IylD/tEPA
-        cNIrj8QS8ec+woTJaMGVCh96VC2FPl8KR4Hjhy0yaupyPbTI6VWib63S/NcDfG7r
-        tviRFG2Gf8yduERebyC0cpgnmjVgFfJs7N3K3ncz6myOr9idNI05OC9poL73sDUv
-        jRXhm7uy938bT/R4MQdpYuxucgU3MiwvfG5ht+oJ4Yp+/IrR2PTqRGqMCsodnroa
-        TBKq2kW565TtCvrFkNub/ytorDbIVN9VrIMcuTiOv8sLoQRDJO9HvWUhYAqMY6Uh
-        dy12jR9FrquZnGsDKKs9V0Y6J4Wi8vnmdgWVZUc40pfXq3APAB6suQENBFnNgeAB
-        CADFqQRxLHxLIQ7B72diTMI2tPk9d5c67k+Gzkrg1QYoxBLdRCmhM4ydYqZzvIz4
-        1npkK20w4somOCwvyAOjO46IGb3f/Wk8mY8o5HMpI1miAfze0YTZKzRo2DmrvwbV
-        /h8jvZNCISwtrOgaaszWSVSuEQQCA1jf4qixfCb3ReETvZc3MTZXhw8IUbszXh5d
-        a6CYqq/fr5Zw4Dc19ZSoHSTh0Wn03mEm/kaYtia/wt1I+xVvTSaC2Pf/kUtr7UEf
-        3NMc0YF0s4KgeW8KwjHa7Sz9wzydLPRH5kJ26SDUGUhrFf1jNLIegtDsoISV/86G
-        ztXcVq5GY6lXMwmsggRe++7xABEBAAGJAmwEGAEIACAWIQTqP4uIlyqP1HSHLy8R
-        WzrxqtPtugUCWc2B4AIbAgFACRARWzrxqtPtusB0IAQZAQgAHRYhBAUi3Sm5jxZ8
-        2EIXUuOP/K91q9kqBQJZzYHgAAoJEOOP/K91q9kqlHcH+wbvD14ITYDMfgIfy67O
-        4Qcmgf1qzGXhpsABz/i/EPgRD990eNBI0YGuvoKRJfetEGn7LerrrCB8Z+ICFPHF
-        rzXoe10zm+QTREck0OB8nPFRycJ+Fbl6JX+cnkEx27Mmg1aVb7+H5LMDaWO1KjLs
-        g2wIDo/jrDfW7NoZzy4XTd7jFCOt4fftL/dhiujQmhLzugZXCxRISOVdmgilDJQo
-        Tz1sEm34ida98JFjdzSgkUvJ/pFTZ21ThCNxlUf01Hr2Pdcg1e2/97sZocMFTY2J
-        KwmiW2LG3B05/VrRtdvsCVj8G49coxgPPKty+m71ovAXdS/CvVqE7TefCplsYJ1d
-        V3abwwf/Xl2SxzbAKbrYMgZfdGzpPg2u6982WvfGIVfjFJh9veHZAbfkPcjdAD2X
-        e67Y4BeKG2OQQqeOY2y+81A7PaehgHzbFHJG/4RjqB66efrZAg4DgIdbr4oyMoUJ
-        VVsl0wfYSIvnd4kvWXYICVwk53HLA3wIowZAsJ1LT2byAKbUzayLzTekrTzGcwQk
-        g2XT798ev2QuR5Ki5x8MULBFX4Lhd03+uGOxjhNPQD6DAAHCQLaXQhaGuyMgt5hD
-        t0nF3yuw3Eg4Ygcbtm24rZXOHJc9bDKeRiWZz1dIyYYVJmHSQwOVXkAwJlF1sIgy
-        /jQYeOgFDKq20x86WulkvsUtBoaZJg==
-        =Q5Z7
-        -----END PGP PUBLIC KEY BLOCK-----
-      KEY
-    end
-
-    def secret_key
-      <<~SECRET
-        -----BEGIN PGP PRIVATE KEY BLOCK-----
-
-        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
-        Jg==
-        =TKlF
-        -----END PGP PRIVATE KEY BLOCK-----
-      SECRET
-    end
-
-    def fingerprint
-      'EA3F8B88972A8FD474872F2F115B3AF1AAD3EDBA'
-    end
-
-    def subkey_fingerprints
-      %w(159AD5DDF199591D67D2B87AA3CEC5C0A7C270EC 0522DD29B98F167CD8421752E38FFCAF75ABD92A)
-    end
-
-    def names
-      ['John Doe']
-    end
-
-    def emails
-      ['john.doe@example.com']
-    end
-  end
-
-  # GPG Key containing just the main key
-  module User4
-    extend self
-
-    def public_key
-      <<~KEY.strip
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-
-        mQENBFnWcesBCAC6Y8FXl9ZJ9HPa6dIYcgQrvjIQcwoQCUEsaXNRpc+206RPCIXK
-        aIYr0nTD8GeovMuUONXTj+DdueQU2GAAqHHOqvDDVXqRrW3xfWnSwix7sTuhG1Ew
-        PLHYmjLENqaTsdyliEo3N8VWy2k0QRbC3R6xvop4Ooa87D5vcATIl0gYFtSiHIL+
-        TervYvTG9Eq1qSLZHbe2x4IzeqX2luikPKokL7j8FTZaCmC5MezIUur1ulfyYY/j
-        SkST/1aUFc5QXJJSZA0MYJWZX6x7Y3l7yl0dkHqmK8OTuo8RPWd3ybEiuvRsOL8K
-        GAv/PmVJRGDAf7GGbwXXsE9MiZ5GzVPxHnexABEBAAG0G0pvaG4gRG9lIDxqb2hu
-        QGV4YW1wbGUuY29tPokBTgQTAQgAOBYhBAh0izYM0lwuzJnVlAcBbPnhOj+bBQJZ
-        1nHrAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEAcBbPnhOj+bkywH/i4w
-        OwpDxoTjUQlPlqGAGuzvWaPzSJndawgmMTr68oRsD+wlQmQQTR5eqxCpUIyV4aYb
-        D697RYzoqbT4mlU49ymzfKSAxFe88r1XQWdm81DcofHVPmw2GBrIqaX3Du4Z7xkI
-        Q9/S43orwknh5FoVwU8Nau7qBuv9vbw2apSkuA1oBj3spQ8hqwLavACyQ+fQloAT
-        hSDNqPiCZj6L0dwM1HYiqVoN3Q7qjgzzeBzlXzljJoWblhxllvMK20bVoa7H+uR2
-        lczFHfsX8VTIMjyTGP7R3oHN91DEahlQybVVNLmNSDKZM2P/0d28BRUmWxQJ4Ws3
-        J4hOWDKnLMed3VOIWzM=
-        =xVuW
-        -----END PGP PUBLIC KEY BLOCK-----
-      KEY
-    end
-
-    def secret_key
-      <<~KEY.strip
-        -----BEGIN PGP PRIVATE KEY BLOCK-----
-
-        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
-        =/37z
-        -----END PGP PRIVATE KEY BLOCK-----
-      KEY
-    end
-
-    def primary_keyid
-      fingerprint[-16..-1]
-    end
-
-    def fingerprint
-      '08748B360CD25C2ECC99D59407016CF9E13A3F9B'
-    end
-  end
-end
diff --git a/spec/support/group_members_shared_example.rb b/spec/support/group_members_shared_example.rb
deleted file mode 100644
index 547c83c7955..00000000000
--- a/spec/support/group_members_shared_example.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-RSpec.shared_examples 'members and requesters associations' do
-  describe '#members_and_requesters' do
-    it 'includes members and requesters' do
-      member_and_requester_user_ids = namespace.members_and_requesters.pluck(:user_id)
-
-      expect(member_and_requester_user_ids).to include(requester.id, developer.id)
-    end
-  end
-
-  describe '#members' do
-    it 'includes members and exclude requesters' do
-      member_user_ids = namespace.members.pluck(:user_id)
-
-      expect(member_user_ids).to include(developer.id)
-      expect(member_user_ids).not_to include(requester.id)
-    end
-  end
-
-  describe '#requesters' do
-    it 'does not include requesters' do
-      requester_user_ids = namespace.requesters.pluck(:user_id)
-
-      expect(requester_user_ids).to include(requester.id)
-      expect(requester_user_ids).not_to include(developer.id)
-    end
-  end
-end
diff --git a/spec/support/helpers/api_helpers.rb b/spec/support/helpers/api_helpers.rb
new file mode 100644
index 00000000000..ac0c7a9b493
--- /dev/null
+++ b/spec/support/helpers/api_helpers.rb
@@ -0,0 +1,50 @@
+module ApiHelpers
+  # Public: Prepend a request path with the path to the API
+  #
+  # path - Path to append
+  # user - User object - If provided, automatically appends private_token query
+  #          string for authenticated requests
+  #
+  # Examples
+  #
+  #   >> api('/issues')
+  #   => "/api/v2/issues"
+  #
+  #   >> api('/issues', User.last)
+  #   => "/api/v2/issues?private_token=..."
+  #
+  #   >> api('/issues?foo=bar', User.last)
+  #   => "/api/v2/issues?foo=bar&private_token=..."
+  #
+  # Returns the relative path to the requested API resource
+  def api(path, user = nil, version: API::API.version, personal_access_token: nil, oauth_access_token: nil)
+    full_path = "/api/#{version}#{path}"
+
+    if oauth_access_token
+      query_string = "access_token=#{oauth_access_token.token}"
+    elsif personal_access_token
+      query_string = "private_token=#{personal_access_token.token}"
+    elsif user
+      personal_access_token = create(:personal_access_token, user: user)
+      query_string = "private_token=#{personal_access_token.token}"
+    end
+
+    if query_string
+      full_path << (path.index('?') ? '&' : '?')
+      full_path << query_string
+    end
+
+    full_path
+  end
+
+  # Temporary helper method for simplifying V3 exclusive API specs
+  def v3_api(path, user = nil, personal_access_token: nil, oauth_access_token: nil)
+    api(
+      path,
+      user,
+      version: 'v3',
+      personal_access_token: personal_access_token,
+      oauth_access_token: oauth_access_token
+    )
+  end
+end
diff --git a/spec/support/helpers/bare_repo_operations.rb b/spec/support/helpers/bare_repo_operations.rb
new file mode 100644
index 00000000000..3f4a4243cb6
--- /dev/null
+++ b/spec/support/helpers/bare_repo_operations.rb
@@ -0,0 +1,62 @@
+require 'zlib'
+
+class BareRepoOperations
+  include Gitlab::Popen
+
+  def initialize(path_to_repo)
+    @path_to_repo = path_to_repo
+  end
+
+  def commit_tree(tree_id, msg, parent: Gitlab::Git::EMPTY_TREE_ID)
+    commit_tree_args = ['commit-tree', tree_id, '-m', msg]
+    commit_tree_args += ['-p', parent] unless parent == Gitlab::Git::EMPTY_TREE_ID
+    commit_id = execute(commit_tree_args)
+
+    commit_id[0]
+  end
+
+  # Based on https://stackoverflow.com/a/25556917/1856239
+  def commit_file(file, dst_path, branch = 'master')
+    head_id = execute(['show', '--format=format:%H', '--no-patch', branch], allow_failure: true)[0] || Gitlab::Git::EMPTY_TREE_ID
+
+    execute(['read-tree', '--empty'])
+    execute(['read-tree', head_id])
+
+    blob_id = execute(['hash-object', '--stdin', '-w']) do |stdin|
+      stdin.write(file.read)
+    end
+
+    execute(['update-index', '--add', '--cacheinfo', '100644', blob_id[0], dst_path])
+
+    tree_id = execute(['write-tree'])
+
+    commit_id = commit_tree(tree_id[0], "Add #{dst_path}", parent: head_id)
+
+    execute(['update-ref', "refs/heads/#{branch}", commit_id])
+  end
+
+  private
+
+  def execute(args, allow_failure: false)
+    output, status = popen(base_args + args, nil) do |stdin|
+      yield stdin if block_given?
+    end
+
+    unless status.zero?
+      if allow_failure
+        return []
+      else
+        raise "Got a non-zero exit code while calling out `#{args.join(' ')}`: #{output}"
+      end
+    end
+
+    output.split("\n")
+  end
+
+  def base_args
+    [
+      Gitlab.config.git.bin_path,
+      "--git-dir=#{@path_to_repo}"
+    ]
+  end
+end
diff --git a/spec/support/helpers/board_helpers.rb b/spec/support/helpers/board_helpers.rb
new file mode 100644
index 00000000000..507d0432d7f
--- /dev/null
+++ b/spec/support/helpers/board_helpers.rb
@@ -0,0 +1,16 @@
+module BoardHelpers
+  def click_card(card)
+    within card do
+      first('.card-number').click
+    end
+
+    wait_for_sidebar
+  end
+
+  def wait_for_sidebar
+    # loop until the CSS transition is complete
+    Timeout.timeout(0.5) do
+      loop until evaluate_script('$(".right-sidebar").outerWidth()') == 290
+    end
+  end
+end
diff --git a/spec/support/helpers/capybara_helpers.rb b/spec/support/helpers/capybara_helpers.rb
new file mode 100644
index 00000000000..bcc2df44708
--- /dev/null
+++ b/spec/support/helpers/capybara_helpers.rb
@@ -0,0 +1,43 @@
+module CapybaraHelpers
+  # Execute a block a certain number of times before considering it a failure
+  #
+  # The given block is called, and if it raises a `Capybara::ExpectationNotMet`
+  # error, we wait `interval` seconds and then try again, until `retries` is
+  # met.
+  #
+  # This allows for better handling of timing-sensitive expectations in a
+  # sketchy CI environment, for example.
+  #
+  # interval - Delay between retries in seconds (default: 0.5)
+  # retries  - Number of times to execute before failing (default: 5)
+  def allowing_for_delay(interval: 0.5, retries: 5)
+    tries = 0
+
+    begin
+      sleep interval
+
+      yield
+    rescue Capybara::ExpectationNotMet => ex
+      if tries <= retries
+        tries += 1
+        sleep interval
+        retry
+      else
+        raise ex
+      end
+    end
+  end
+
+  # Refresh the page. Calling `visit current_url` doesn't seem to work consistently.
+  #
+  def refresh
+    url = current_url
+    visit 'about:blank'
+    visit url
+  end
+
+  # Simulate a browser restart by clearing the session cookie.
+  def clear_browser_session
+    page.driver.browser.manage.delete_cookie('_gitlab_session')
+  end
+end
diff --git a/spec/support/helpers/cookie_helper.rb b/spec/support/helpers/cookie_helper.rb
new file mode 100644
index 00000000000..5ff7b0b68c9
--- /dev/null
+++ b/spec/support/helpers/cookie_helper.rb
@@ -0,0 +1,34 @@
+# Helper for setting cookies in Selenium/WebDriver
+#
+module CookieHelper
+  def set_cookie(name, value, options = {})
+    case page.driver
+    when Capybara::RackTest::Driver
+      rack_set_cookie(name, value)
+    else
+      selenium_set_cookie(name, value, options)
+    end
+  end
+
+  def selenium_set_cookie(name, value, options = {})
+    # Selenium driver will not set cookies for a given domain when the browser is at `about:blank`.
+    # It also doesn't appear to allow overriding the cookie path. loading `/` is the most inclusive.
+    visit options.fetch(:path, '/') unless on_a_page?
+    page.driver.browser.manage.add_cookie(name: name, value: value, **options)
+  end
+
+  def rack_set_cookie(name, value)
+    page.driver.browser.set_cookie("#{name}=#{value}")
+  end
+
+  def get_cookie(name)
+    page.driver.browser.manage.cookie_named(name)
+  end
+
+  private
+
+  def on_a_page?
+    current_url = Capybara.current_session.driver.browser.current_url
+    current_url && current_url != '' && current_url != 'about:blank' && current_url != 'data:,'
+  end
+end
diff --git a/spec/support/helpers/cycle_analytics_helpers.rb b/spec/support/helpers/cycle_analytics_helpers.rb
new file mode 100644
index 00000000000..55359d36597
--- /dev/null
+++ b/spec/support/helpers/cycle_analytics_helpers.rb
@@ -0,0 +1,137 @@
+module CycleAnalyticsHelpers
+  def create_commit_referencing_issue(issue, branch_name: generate(:branch))
+    project.repository.add_branch(user, branch_name, 'master')
+    create_commit("Commit for ##{issue.iid}", issue.project, user, branch_name)
+  end
+
+  def create_commit(message, project, user, branch_name, count: 1)
+    repository = project.repository
+    oldrev = repository.commit(branch_name).sha
+
+    if Timecop.frozen? && Gitlab::GitalyClient.feature_enabled?(:operation_user_commit_files)
+      mock_gitaly_multi_action_dates(repository.raw)
+    end
+
+    commit_shas = Array.new(count) do |index|
+      commit_sha = repository.create_file(user, generate(:branch), "content", message: message, branch_name: branch_name)
+      repository.commit(commit_sha)
+
+      commit_sha
+    end
+
+    GitPushService.new(project,
+                       user,
+                       oldrev: oldrev,
+                       newrev: commit_shas.last,
+                       ref: 'refs/heads/master').execute
+  end
+
+  def create_cycle(user, project, issue, mr, milestone, pipeline)
+    issue.update(milestone: milestone)
+    pipeline.run
+
+    ci_build = create(:ci_build, pipeline: pipeline, status: :success, author: user)
+
+    merge_merge_requests_closing_issue(user, project, issue)
+    ProcessCommitWorker.new.perform(project.id, user.id, mr.commits.last.to_hash)
+
+    ci_build
+  end
+
+  def create_merge_request_closing_issue(user, project, issue, message: nil, source_branch: nil, commit_message: 'commit message')
+    if !source_branch || project.repository.commit(source_branch).blank?
+      source_branch = generate(:branch)
+      project.repository.add_branch(user, source_branch, 'master')
+    end
+
+    sha = project.repository.create_file(
+      user,
+      generate(:branch),
+      'content',
+      message: commit_message,
+      branch_name: source_branch)
+    project.repository.commit(sha)
+
+    opts = {
+      title: 'Awesome merge_request',
+      description: message || "Fixes #{issue.to_reference}",
+      source_branch: source_branch,
+      target_branch: 'master'
+    }
+
+    mr = MergeRequests::CreateService.new(project, user, opts).execute
+    NewMergeRequestWorker.new.perform(mr, user)
+    mr
+  end
+
+  def merge_merge_requests_closing_issue(user, project, issue)
+    merge_requests = issue.closed_by_merge_requests(user)
+
+    merge_requests.each { |merge_request| MergeRequests::MergeService.new(project, user).execute(merge_request) }
+  end
+
+  def deploy_master(user, project, environment: 'production')
+    dummy_job =
+      case environment
+      when 'production'
+        dummy_production_job(user, project)
+      when 'staging'
+        dummy_staging_job(user, project)
+      else
+        raise ArgumentError
+      end
+
+    CreateDeploymentService.new(dummy_job).execute
+  end
+
+  def dummy_production_job(user, project)
+    new_dummy_job(user, project, 'production')
+  end
+
+  def dummy_staging_job(user, project)
+    new_dummy_job(user, project, 'staging')
+  end
+
+  def dummy_pipeline(project)
+    Ci::Pipeline.new(
+      sha: project.repository.commit('master').sha,
+      ref: 'master',
+      source: :push,
+      project: project,
+      protected: false)
+  end
+
+  def new_dummy_job(user, project, environment)
+    project.environments.find_or_create_by(name: environment)
+
+    Ci::Build.new(
+      project: project,
+      user: user,
+      environment: environment,
+      ref: 'master',
+      tag: false,
+      name: 'dummy',
+      stage: 'dummy',
+      pipeline: dummy_pipeline(project),
+      protected: false)
+  end
+
+  def mock_gitaly_multi_action_dates(raw_repository)
+    allow(raw_repository).to receive(:multi_action).and_wrap_original do |m, *args|
+      new_date = Time.now
+      branch_update = m.call(*args)
+
+      if branch_update.newrev
+        _, opts = args
+        commit = raw_repository.commit(branch_update.newrev).rugged_commit
+        branch_update.newrev = commit.amend(
+          update_ref: "#{Gitlab::Git::BRANCH_REF_PREFIX}#{opts[:branch_name]}",
+          author: commit.author.merge(time: new_date),
+          committer: commit.committer.merge(time: new_date)
+        )
+      end
+
+      branch_update
+    end
+  end
+end
diff --git a/spec/support/helpers/database_connection_helpers.rb b/spec/support/helpers/database_connection_helpers.rb
new file mode 100644
index 00000000000..763329499f0
--- /dev/null
+++ b/spec/support/helpers/database_connection_helpers.rb
@@ -0,0 +1,9 @@
+module DatabaseConnectionHelpers
+  def run_with_new_database_connection
+    pool = ActiveRecord::Base.connection_pool
+    conn = pool.checkout
+    yield conn
+  ensure
+    pool.checkin(conn)
+  end
+end
diff --git a/spec/support/helpers/devise_helpers.rb b/spec/support/helpers/devise_helpers.rb
new file mode 100644
index 00000000000..66874e10f38
--- /dev/null
+++ b/spec/support/helpers/devise_helpers.rb
@@ -0,0 +1,17 @@
+module DeviseHelpers
+  # explicitly tells Devise which mapping to use
+  # this is needed when we are testing a Devise controller bypassing the router
+  def set_devise_mapping(context:)
+    env = env_from_context(context)
+
+    env['devise.mapping'] = Devise.mappings[:user] if env
+  end
+
+  def env_from_context(context)
+    if context.respond_to?(:env_config)
+      context.env_config
+    elsif context.respond_to?(:env)
+      context.env
+    end
+  end
+end
diff --git a/spec/support/helpers/drag_to_helper.rb b/spec/support/helpers/drag_to_helper.rb
new file mode 100644
index 00000000000..ae149631ed9
--- /dev/null
+++ b/spec/support/helpers/drag_to_helper.rb
@@ -0,0 +1,13 @@
+module DragTo
+  def drag_to(list_from_index: 0, from_index: 0, to_index: 0, list_to_index: 0, selector: '', scrollable: 'body')
+    evaluate_script("simulateDrag({scrollable: $('#{scrollable}').get(0), from: {el: $('#{selector}').eq(#{list_from_index}).get(0), index: #{from_index}}, to: {el: $('#{selector}').eq(#{list_to_index}).get(0), index: #{to_index}}});")
+
+    Timeout.timeout(Capybara.default_max_wait_time) do
+      loop while drag_active?
+    end
+  end
+
+  def drag_active?
+    page.evaluate_script('window.SIMULATE_DRAG_ACTIVE').nonzero?
+  end
+end
diff --git a/spec/support/helpers/dropzone_helper.rb b/spec/support/helpers/dropzone_helper.rb
new file mode 100644
index 00000000000..fe72d320fcf
--- /dev/null
+++ b/spec/support/helpers/dropzone_helper.rb
@@ -0,0 +1,76 @@
+module DropzoneHelper
+  # Provides a way to perform `attach_file` for a Dropzone-based file input
+  #
+  # This is accomplished by creating a standard HTML file input on the page,
+  # performing `attach_file` on that field, and then triggering the appropriate
+  # Dropzone events to perform the actual upload.
+  #
+  # This method waits for the upload to complete before returning.
+  # max_file_size is an optional parameter.
+  # If it's not 0, then it used in dropzone.maxFilesize parameter.
+  # wait_for_queuecomplete is an optional parameter.
+  # If it's 'false', then the helper will NOT wait for backend response
+  # It lets to test behaviors while AJAX is processing.
+  def dropzone_file(files, max_file_size = 0, wait_for_queuecomplete = true)
+    # Generate a fake file input that Capybara can attach to
+    page.execute_script <<-JS.strip_heredoc
+      $('#fakeFileInput').remove();
+      var fakeFileInput = window.$('<input/>').attr(
+        {id: 'fakeFileInput', type: 'file', multiple: true}
+      ).appendTo('body');
+
+      window._dropzoneComplete = false;
+    JS
+
+    # Attach files to the fake input selector with Capybara
+    attach_file('fakeFileInput', files)
+
+    # Manually trigger a Dropzone "drop" event with the fake input's file list
+    page.execute_script <<-JS.strip_heredoc
+      var dropzone = $('.div-dropzone')[0].dropzone;
+      dropzone.options.autoProcessQueue = false;
+
+      if (#{max_file_size} > 0) {
+        dropzone.options.maxFilesize = #{max_file_size};
+      }
+
+      dropzone.on('queuecomplete', function() {
+        window._dropzoneComplete = true;
+      });
+
+      var fileList = [$('#fakeFileInput')[0].files];
+
+      $.map(fileList, function(file){
+        var e = jQuery.Event('drop', { dataTransfer : { files : file } });
+
+        dropzone.listeners[0].events.drop(e);
+      });
+
+      dropzone.processQueue();
+    JS
+
+    if wait_for_queuecomplete
+      # Wait until Dropzone's fired `queuecomplete`
+      loop until page.evaluate_script('window._dropzoneComplete === true')
+    end
+  end
+
+  def drop_in_dropzone(file_path)
+    # Generate a fake input selector
+    page.execute_script <<-JS
+      var fakeFileInput = window.$('<input/>').attr(
+        {id: 'fakeFileInput', type: 'file'}
+      ).appendTo('body');
+    JS
+
+    # Attach the file to the fake input selector with Capybara
+    attach_file('fakeFileInput', file_path)
+
+    # Add the file to a fileList array and trigger the fake drop event
+    page.execute_script <<-JS
+      var fileList = [$('#fakeFileInput')[0].files[0]];
+      var e = jQuery.Event('drop', { dataTransfer : { files : fileList } });
+      $('.dropzone')[0].dropzone.listeners[0].events.drop(e);
+    JS
+  end
+end
diff --git a/spec/support/helpers/email_helpers.rb b/spec/support/helpers/email_helpers.rb
new file mode 100644
index 00000000000..1fb8252459f
--- /dev/null
+++ b/spec/support/helpers/email_helpers.rb
@@ -0,0 +1,37 @@
+module EmailHelpers
+  def sent_to_user(user, recipients: email_recipients)
+    recipients.count { |to| to == user.notification_email }
+  end
+
+  def reset_delivered_emails!
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def should_only_email(*users, kind: :to)
+    recipients = email_recipients(kind: kind)
+
+    users.each { |user| should_email(user, recipients: recipients) }
+
+    expect(recipients.count).to eq(users.count)
+  end
+
+  def should_email(user, times: 1, recipients: email_recipients)
+    expect(sent_to_user(user, recipients: recipients)).to eq(times)
+  end
+
+  def should_not_email(user, recipients: email_recipients)
+    should_email(user, times: 0, recipients: recipients)
+  end
+
+  def should_not_email_anyone
+    expect(ActionMailer::Base.deliveries).to be_empty
+  end
+
+  def email_recipients(kind: :to)
+    ActionMailer::Base.deliveries.flat_map(&kind)
+  end
+
+  def find_email_for(user)
+    ActionMailer::Base.deliveries.find { |d| d.to.include?(user.notification_email) }
+  end
+end
diff --git a/spec/support/helpers/fake_migration_classes.rb b/spec/support/helpers/fake_migration_classes.rb
new file mode 100644
index 00000000000..b0fc8422857
--- /dev/null
+++ b/spec/support/helpers/fake_migration_classes.rb
@@ -0,0 +1,11 @@
+class FakeRenameReservedPathMigrationV1 < ActiveRecord::Migration
+  include Gitlab::Database::RenameReservedPathsMigration::V1
+
+  def version
+    '20170316163845'
+  end
+
+  def name
+    "FakeRenameReservedPathMigrationV1"
+  end
+end
diff --git a/spec/support/helpers/fake_u2f_device.rb b/spec/support/helpers/fake_u2f_device.rb
new file mode 100644
index 00000000000..a7605cd483a
--- /dev/null
+++ b/spec/support/helpers/fake_u2f_device.rb
@@ -0,0 +1,40 @@
+class FakeU2fDevice
+  attr_reader :name
+
+  def initialize(page, name)
+    @page = page
+    @name = name
+  end
+
+  def respond_to_u2f_registration
+    app_id = @page.evaluate_script('gon.u2f.app_id')
+    challenges = @page.evaluate_script('gon.u2f.challenges')
+
+    json_response = u2f_device(app_id).register_response(challenges[0])
+
+    @page.execute_script("
+    u2f.register = function(appId, registerRequests, signRequests, callback) {
+      callback(#{json_response});
+    };
+    ")
+  end
+
+  def respond_to_u2f_authentication
+    app_id = @page.evaluate_script('gon.u2f.app_id')
+    challenge = @page.evaluate_script('gon.u2f.challenge')
+    json_response = u2f_device(app_id).sign_response(challenge)
+
+    @page.execute_script("
+    u2f.sign = function(appId, challenges, signRequests, callback) {
+      callback(#{json_response});
+    };
+    window.gl.u2fAuthenticate.start();
+    ")
+  end
+
+  private
+
+  def u2f_device(app_id)
+    @u2f_device ||= U2F::FakeU2F.new(app_id)
+  end
+end
diff --git a/spec/support/helpers/filter_item_select_helper.rb b/spec/support/helpers/filter_item_select_helper.rb
new file mode 100644
index 00000000000..519e84d359e
--- /dev/null
+++ b/spec/support/helpers/filter_item_select_helper.rb
@@ -0,0 +1,19 @@
+# Helper allows you to select value from filter-items
+#
+# Params
+#   value - value for select
+#   selector - css selector of item
+#
+# Usage:
+#
+#   filter_item_select('Any Author', '.js-author-search')
+#
+module FilterItemSelectHelper
+  def filter_item_select(value, selector)
+    find(selector).click
+    wait_for_requests
+    page.within('.dropdown-content') do
+      click_link value
+    end
+  end
+end
diff --git a/spec/support/helpers/filter_spec_helper.rb b/spec/support/helpers/filter_spec_helper.rb
new file mode 100644
index 00000000000..721d359c2ee
--- /dev/null
+++ b/spec/support/helpers/filter_spec_helper.rb
@@ -0,0 +1,87 @@
+# Helper methods for Banzai filter specs
+#
+# Must be included into specs manually
+module FilterSpecHelper
+  extend ActiveSupport::Concern
+
+  # Perform `call` on the described class
+  #
+  # Automatically passes the current `project` value, if defined, to the context
+  # if none is provided.
+  #
+  # html     - HTML String to pass to the filter's `call` method.
+  # context - Hash context for the filter. (default: {project: project})
+  #
+  # Returns a Nokogiri::XML::DocumentFragment
+  def filter(html, context = {})
+    if defined?(project)
+      context.reverse_merge!(project: project)
+    end
+
+    render_context = Banzai::RenderContext
+      .new(context[:project], context[:current_user])
+
+    context = context.merge(render_context: render_context)
+
+    described_class.call(html, context)
+  end
+
+  # Run text through HTML::Pipeline with the current filter and return the
+  # result Hash
+  #
+  # body     - String text to run through the pipeline
+  # context - Hash context for the filter. (default: {project: project})
+  #
+  # Returns the Hash
+  def pipeline_result(body, context = {})
+    context.reverse_merge!(project: project) if defined?(project)
+
+    pipeline = HTML::Pipeline.new([described_class], context)
+    pipeline.call(body)
+  end
+
+  def reference_pipeline(context = {})
+    context.reverse_merge!(project: project) if defined?(project)
+
+    filters = [
+      Banzai::Filter::AutolinkFilter,
+      described_class
+    ]
+
+    HTML::Pipeline.new(filters, context)
+  end
+
+  def reference_pipeline_result(body, context = {})
+    reference_pipeline(context).call(body)
+  end
+
+  def reference_filter(html, context = {})
+    reference_pipeline(context).to_document(html)
+  end
+
+  # Modify a String reference to make it invalid
+  #
+  # Commit SHAs get reversed, IDs get incremented by 1, all other Strings get
+  # their word characters reversed.
+  #
+  # reference - String reference to modify
+  #
+  # Returns a String
+  def invalidate_reference(reference)
+    if reference =~ /\A(.+)?[^\d]\d+\z/
+      # Integer-based reference with optional project prefix
+      reference.gsub(/\d+\z/) { |i| i.to_i + 10_000 }
+    elsif reference =~ /\A(.+@)?(\h{7,40}\z)/
+      # SHA-based reference with optional prefix
+      reference.gsub(/\h{7,40}\z/) { |v| v.reverse }
+    else
+      reference.gsub(/\w+\z/) { |v| v.reverse }
+    end
+  end
+
+  # Shortcut to Rails' auto-generated routes helpers, to avoid including the
+  # module
+  def urls
+    Gitlab::Routing.url_helpers
+  end
+end
diff --git a/spec/support/helpers/filtered_search_helpers.rb b/spec/support/helpers/filtered_search_helpers.rb
new file mode 100644
index 00000000000..5f42ff77fb2
--- /dev/null
+++ b/spec/support/helpers/filtered_search_helpers.rb
@@ -0,0 +1,148 @@
+module FilteredSearchHelpers
+  def filtered_search
+    page.find('.filtered-search')
+  end
+
+  # Enables input to be set (similar to copy and paste)
+  def input_filtered_search(search_term, submit: true, extra_space: true)
+    search = search_term
+    if extra_space
+      # Add an extra space to engage visual tokens
+      search = "#{search_term} "
+    end
+
+    filtered_search.set(search)
+
+    if submit
+      # Wait for the lazy author/assignee tokens that
+      # swap out the username with an avatar and name
+      wait_for_requests
+      filtered_search.send_keys(:enter)
+    end
+  end
+
+  # Select a label clicking in the search dropdown instead
+  # of entering label names on the input.
+  def select_label_on_dropdown(label_title)
+    input_filtered_search("label:", submit: false)
+
+    within('#js-dropdown-label') do
+      wait_for_requests
+
+      find('li', text: label_title).click
+    end
+
+    filtered_search.send_keys(:enter)
+  end
+
+  def expect_issues_list_count(open_count, closed_count = 0)
+    all_count = open_count + closed_count
+
+    expect(page).to have_issuable_counts(open: open_count, closed: closed_count, all: all_count)
+    page.within '.issues-list' do
+      expect(page).to have_selector('.issue', count: open_count)
+    end
+  end
+
+  # Enables input to be added character by character
+  def input_filtered_search_keys(search_term)
+    # Add an extra space to engage visual tokens
+    filtered_search.send_keys("#{search_term} ")
+    filtered_search.send_keys(:enter)
+  end
+
+  def expect_filtered_search_input(input)
+    expect(find('.filtered-search').value).to eq(input)
+  end
+
+  def clear_search_field
+    find('.filtered-search-box .clear-search').click
+  end
+
+  def reset_filters
+    clear_search_field
+    filtered_search.send_keys(:enter)
+  end
+
+  def init_label_search
+    filtered_search.set('label:')
+    # This ensures the dropdown is shown
+    expect(find('#js-dropdown-label')).not_to have_css('.filter-dropdown-loading')
+  end
+
+  def expect_filtered_search_input_empty
+    expect(find('.filtered-search').value).to eq('')
+  end
+
+  # Iterates through each visual token inside
+  # .tokens-container to make sure the correct names and values are rendered
+  def expect_tokens(tokens)
+    page.within '.filtered-search-box .tokens-container' do
+      page.all(:css, '.tokens-container li .selectable').each_with_index do |el, index|
+        token_name = tokens[index][:name]
+        token_value = tokens[index][:value]
+        token_emoji = tokens[index][:emoji_name]
+
+        expect(el.find('.name')).to have_content(token_name)
+
+        if token_value
+          expect(el.find('.value')).to have_content(token_value)
+        end
+
+        # gl-emoji content is blank when the emoji unicode is not supported
+        if token_emoji
+          selector = %(gl-emoji[data-name="#{token_emoji}"])
+          expect(el.find('.value')).to have_css(selector)
+        end
+      end
+    end
+  end
+
+  def create_token(token_name, token_value = nil, symbol = nil)
+    { name: token_name, value: "#{symbol}#{token_value}" }
+  end
+
+  def author_token(author_name = nil)
+    create_token('Author', author_name)
+  end
+
+  def assignee_token(assignee_name = nil)
+    create_token('Assignee', assignee_name)
+  end
+
+  def milestone_token(milestone_name = nil, has_symbol = true)
+    symbol = has_symbol ? '%' : nil
+    create_token('Milestone', milestone_name, symbol)
+  end
+
+  def label_token(label_name = nil, has_symbol = true)
+    symbol = has_symbol ? '~' : nil
+    create_token('Label', label_name, symbol)
+  end
+
+  def emoji_token(emoji_name = nil)
+    { name: 'My-Reaction', emoji_name: emoji_name }
+  end
+
+  def default_placeholder
+    'Search or filter results...'
+  end
+
+  def get_filtered_search_placeholder
+    find('.filtered-search')['placeholder']
+  end
+
+  def remove_recent_searches
+    execute_script('window.localStorage.clear();')
+  end
+
+  def set_recent_searches(key, input)
+    execute_script("window.localStorage.setItem('#{key}', '#{input}');")
+  end
+
+  def wait_for_filtered_search(text)
+    Timeout.timeout(Capybara.default_max_wait_time) do
+      loop until find('.filtered-search').value.strip == text
+    end
+  end
+end
diff --git a/spec/support/helpers/fixture_helpers.rb b/spec/support/helpers/fixture_helpers.rb
new file mode 100644
index 00000000000..611d19f36a0
--- /dev/null
+++ b/spec/support/helpers/fixture_helpers.rb
@@ -0,0 +1,11 @@
+module FixtureHelpers
+  def fixture_file(filename, dir: '')
+    return '' if filename.blank?
+
+    File.read(expand_fixture_path(filename, dir: dir))
+  end
+
+  def expand_fixture_path(filename, dir: '')
+    File.expand_path(Rails.root.join(dir, 'spec', 'fixtures', filename))
+  end
+end
diff --git a/spec/support/helpers/git_http_helpers.rb b/spec/support/helpers/git_http_helpers.rb
new file mode 100644
index 00000000000..b8289e6c5f1
--- /dev/null
+++ b/spec/support/helpers/git_http_helpers.rb
@@ -0,0 +1,68 @@
+module GitHttpHelpers
+  def clone_get(project, options = {})
+    get "/#{project}/info/refs", { service: 'git-upload-pack' }, auth_env(*options.values_at(:user, :password, :spnego_request_token))
+  end
+
+  def clone_post(project, options = {})
+    post "/#{project}/git-upload-pack", {}, auth_env(*options.values_at(:user, :password, :spnego_request_token))
+  end
+
+  def push_get(project, options = {})
+    get "/#{project}/info/refs", { service: 'git-receive-pack' }, auth_env(*options.values_at(:user, :password, :spnego_request_token))
+  end
+
+  def push_post(project, options = {})
+    post "/#{project}/git-receive-pack", {}, auth_env(*options.values_at(:user, :password, :spnego_request_token))
+  end
+
+  def download(project, user: nil, password: nil, spnego_request_token: nil)
+    args = [project, { user: user, password: password, spnego_request_token: spnego_request_token }]
+
+    clone_get(*args)
+    yield response
+
+    clone_post(*args)
+    yield response
+  end
+
+  def upload(project, user: nil, password: nil, spnego_request_token: nil)
+    args = [project, { user: user, password: password, spnego_request_token: spnego_request_token }]
+
+    push_get(*args)
+    yield response
+
+    push_post(*args)
+    yield response
+  end
+
+  def download_or_upload(*args, &block)
+    download(*args, &block)
+    upload(*args, &block)
+  end
+
+  def auth_env(user, password, spnego_request_token)
+    env = workhorse_internal_api_request_header
+    if user
+      env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(user, password)
+    elsif spnego_request_token
+      env['HTTP_AUTHORIZATION'] = "Negotiate #{::Base64.strict_encode64('opaque_request_token')}"
+    end
+
+    env
+  end
+
+  def git_access_error(error_key)
+    message = Gitlab::GitAccess::ERROR_MESSAGES[error_key]
+    message || raise("GitAccess error message key '#{error_key}' not found")
+  end
+
+  def git_access_wiki_error(error_key)
+    message = Gitlab::GitAccessWiki::ERROR_MESSAGES[error_key]
+    message || raise("GitAccessWiki error message key '#{error_key}' not found")
+  end
+
+  def change_access_error(error_key)
+    message = Gitlab::Checks::ChangeAccess::ERROR_MESSAGES[error_key]
+    message || raise("ChangeAccess error message key '#{error_key}' not found")
+  end
+end
diff --git a/spec/support/helpers/gitlab_verify_helpers.rb b/spec/support/helpers/gitlab_verify_helpers.rb
new file mode 100644
index 00000000000..5df4bf24ec2
--- /dev/null
+++ b/spec/support/helpers/gitlab_verify_helpers.rb
@@ -0,0 +1,25 @@
+module GitlabVerifyHelpers
+  def collect_ranges(args = {})
+    verifier = described_class.new(args.merge(batch_size: 1))
+
+    collect_results(verifier).map { |range, _| range }
+  end
+
+  def collect_failures
+    verifier = described_class.new(batch_size: 1)
+
+    out = {}
+
+    collect_results(verifier).map { |_, failures| out.merge!(failures) }
+
+    out
+  end
+
+  def collect_results(verifier)
+    out = []
+
+    verifier.run_batches { |*args| out << args }
+
+    out
+  end
+end
diff --git a/spec/support/helpers/gpg_helpers.rb b/spec/support/helpers/gpg_helpers.rb
new file mode 100644
index 00000000000..3f7279a50e0
--- /dev/null
+++ b/spec/support/helpers/gpg_helpers.rb
@@ -0,0 +1,517 @@
+module GpgHelpers
+  SIGNED_COMMIT_SHA = '8a852d50dda17cc8fd1408d2fd0c5b0f24c76ca4'.freeze
+
+  module User1
+    extend self
+
+    def signed_commit_signature
+      <<~SIGNATURE
+        -----BEGIN PGP SIGNATURE-----
+        Version: GnuPG v1
+
+        iJwEAAECAAYFAliu264ACgkQzPvhnwCsix1VXgP9F6zwAMb3OXKZzqGxJ4MQIBoL
+        OdiUSJpL/4sIA9uhFeIv3GIA+uhsG1BHHsG627+sDy7b8W9VWEd7tbcoz4Mvhf3P
+        8g0AIt9/KJuStQZDrXwP1uP6Rrl759nDcNpoOKdSQ5EZ1zlRzeDROlZeDp7Ckfvw
+        GLmN/74Gl3pk0wfgHFY=
+        =wSgS
+        -----END PGP SIGNATURE-----
+      SIGNATURE
+    end
+
+    def signed_commit_base_data
+      <<~SIGNEDDATA
+        tree ed60cfd202644fda1abaf684e7d965052db18c13
+        parent caf6a0334a855e12f30205fff3d7333df1f65127
+        author Nannie Bernhard <nannie.bernhard@example.com> 1487854510 +0100
+        committer Nannie Bernhard <nannie.bernhard@example.com> 1487854510 +0100
+
+        signed commit, verified key/email
+      SIGNEDDATA
+    end
+
+    def secret_key
+      <<~KEY.strip
+        -----BEGIN PGP PRIVATE KEY BLOCK-----
+        Version: GnuPG v1
+
+        lQHYBFiu1ScBBADUhWsrlWHp5e7ASlI5iMcA0XN43fivhVlGYJJy4Ii3Hr2i4f5s
+        VffHS8QyhgxxzSnPwe2OKnZWWL9cHzUFbiG3fHalEBTjpB+7pG4HBgU8R/tiDOu8
+        vkAR+tfJbkuRs9XeG3dGKBX/8WRhIfRucYnM+04l2Myyo5zIx7thJmxXjwARAQAB
+        AAP/XUtcqrtfSnDYCK4Xvo4e3msUSAEZxOPDNzP51lhfbBQgp7qSGDj9Fw5ZyNwz
+        5llse3nksT5OyMUY7HX+rq2UOs12a/piLqvhtX1okp/oTAETmKXNYkZLenv6t94P
+        NqLi0o2AnXAvL9ueXa7WUY3l4DkvuLcjT4+9Ut2Y71zIjeECAN7q9ohNL7E8tNkf
+        Elsbx+8KfyHRQXiSUYaQLlvDRq2lYCKIS7sogTqjZMEgbZx2mRX1fakRlvcmqOwB
+        QoX34zcCAPQPd+yTteNUV12uvDaj8V9DICktPPhbHdYYaUoHjF8RrIHCTRUPzk9E
+        KzCL9dUP8eXPPBV/ty+zjUwl69IgCmkB/3pnNZ0D4EJsNgu24UgI0N+c8H/PE1D6
+        K+bGQ/jK83uYPMXJUsiojssCHLGNp7eBGHFn1PpEqZphgVI50ZMrZQWhJbQtTmFu
+        bmllIEJlcm5oYXJkIDxuYW5uaWUuYmVybmhhcmRAZXhhbXBsZS5jb20+iLgEEwEC
+        ACIFAliu1ScCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEMz74Z8ArIsd
+        p5ID/32hRalvTY+V+QAtzHlGdxugweSBzNgRT3A4UiC9chF6zBOEIw689lqmK6L4
+        i3Il9XeKMl87wi9tsVy9TuOMYDTvcFvu1vMAQ5AsDXqZaAEtCUZpFZscNbi7AXG+
+        QkoDQbMSxp0Rd6eIRJpk9zis5co87f78xJBZLZua+8awFMS6nQHYBFiu1ScBBADI
+        XkITf+kKCkD+n8tMsdTLInefu8KrJ8p7YRYCCabEXnWRsDb5zxUAG2VXCVUhYl6Q
+        XQybkNiBaduS+uxilz7gtYZUMFJvQ09+fV7D2N9B7u/1bGdIYz+cDFJnEJitLY4w
+        /nju2Sno5CL5Ead8sZuslKetSXPYHR/kbW462EOw5wARAQABAAP+IoZfU1XUdVbr
+        +RPWp3ny5SekviDPu8co9BZ4ANTh5+8wyfA3oNbGUxTlYthoU07MZYqq+/k63R28
+        6HgVGC3gdvCiRMGmryIQ6roLLRXkfzjXrI7Lgnhx4OtVjo62pAKDqdl45wEa1Q+M
+        v08CQF6XNpb5R9Xszz4aBC4eV0KjtjkCANlGSQHZ1B81g+iltj1FAhRHkyUFlrc1
+        cqLVhNgxtHZ96+R57Uk2A7dIJBsE00eIYaHOfk5X5GD/95s1QvPcQskCAOwUk5xj
+        NeQ6VV/1+cI91TrWU6VnT2Yj8632fM/JlKKfaS15pp8t5Ha6pNFr3xD4KgQutchq
+        fPsEOjaU7nwQ/i8B/1rDPTYfNXFpRNt33WAB1XtpgOIHlpmOfaYYqf6lneTlZWBc
+        TgyO+j+ZsHAvP18ugIRkU8D192NflzgAGwXLryijyYifBBgBAgAJBQJYrtUnAhsM
+        AAoJEMz74Z8ArIsdlkUEALTl6QUutJsqwVF4ZXKmmw0IEk8PkqW4G+tYRDHJMs6Z
+        O0nzDS89BG2DL4/UlOs5wRvERnlJYz01TMTxq/ciKaBTEjygFIv9CgIEZh97VacZ
+        TIqcF40k9SbpJNnh3JLf94xsNxNRJTEhbVC3uruaeILue/IR7pBMEyCs49Gcguwy
+        =b6UD
+        -----END PGP PRIVATE KEY BLOCK-----
+      KEY
+    end
+
+    def public_key
+      <<~KEY.strip
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+        Version: GnuPG v1
+
+        mI0EWK7VJwEEANSFayuVYenl7sBKUjmIxwDRc3jd+K+FWUZgknLgiLcevaLh/mxV
+        98dLxDKGDHHNKc/B7Y4qdlZYv1wfNQVuIbd8dqUQFOOkH7ukbgcGBTxH+2IM67y+
+        QBH618luS5Gz1d4bd0YoFf/xZGEh9G5xicz7TiXYzLKjnMjHu2EmbFePABEBAAG0
+        LU5hbm5pZSBCZXJuaGFyZCA8bmFubmllLmJlcm5oYXJkQGV4YW1wbGUuY29tPoi4
+        BBMBAgAiBQJYrtUnAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDM++Gf
+        AKyLHaeSA/99oUWpb02PlfkALcx5RncboMHkgczYEU9wOFIgvXIReswThCMOvPZa
+        piui+ItyJfV3ijJfO8IvbbFcvU7jjGA073Bb7tbzAEOQLA16mWgBLQlGaRWbHDW4
+        uwFxvkJKA0GzEsadEXeniESaZPc4rOXKPO3+/MSQWS2bmvvGsBTEuriNBFiu1ScB
+        BADIXkITf+kKCkD+n8tMsdTLInefu8KrJ8p7YRYCCabEXnWRsDb5zxUAG2VXCVUh
+        Yl6QXQybkNiBaduS+uxilz7gtYZUMFJvQ09+fV7D2N9B7u/1bGdIYz+cDFJnEJit
+        LY4w/nju2Sno5CL5Ead8sZuslKetSXPYHR/kbW462EOw5wARAQABiJ8EGAECAAkF
+        Aliu1ScCGwwACgkQzPvhnwCsix2WRQQAtOXpBS60myrBUXhlcqabDQgSTw+Spbgb
+        61hEMckyzpk7SfMNLz0EbYMvj9SU6znBG8RGeUljPTVMxPGr9yIpoFMSPKAUi/0K
+        AgRmH3tVpxlMipwXjST1Jukk2eHckt/3jGw3E1ElMSFtULe6u5p4gu578hHukEwT
+        IKzj0ZyC7DI=
+        =Ug0r
+        -----END PGP PUBLIC KEY BLOCK-----
+      KEY
+    end
+
+    def public_key_with_extra_signing_key
+      <<~KEY.strip
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+        Version: GnuPG v1
+
+        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
+        DMVGWrg4m1NF8N6yMPMP
+        =RB1y
+        -----END PGP PUBLIC KEY BLOCK-----
+      KEY
+    end
+
+    def primary_keyid
+      fingerprint[-16..-1]
+    end
+
+    def fingerprint
+      '5F7EA3981A5845B141ABD522CCFBE19F00AC8B1D'
+    end
+
+    def names
+      ['Nannie Bernhard']
+    end
+
+    def emails
+      ['nannie.bernhard@example.com']
+    end
+  end
+
+  module User2
+    extend self
+
+    def private_key
+      <<~KEY.strip
+        -----BEGIN PGP PRIVATE KEY BLOCK-----
+        Version: GnuPG v1
+
+        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
+        =yEqv
+        -----END PGP PRIVATE KEY BLOCK-----
+      KEY
+    end
+
+    def public_key
+      <<~KEY.strip
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+        Version: GnuPG v1
+
+        mI0EWK6qKgEEAODjqOSIBNYzL23WenEVYnvvGJs9d1SjfosBmBnq4a6eBLNwUvjn
+        Rt0TIwwablEmnoMJiRmXBAOUz/9gSrB/QKar8CJsLmb1sevuF/mwzGXjSywnh+N3
+        NPqh2KE7S/EPYBFKu2LCQRLMXGMnnWaM590+8AZ/S5zHOB5F9SUKszeTABEBAAG0
+        L0JldHRlIENhcnR3cmlnaHQgPGJldHRlLmNhcnR3cmlnaHRAZXhhbXBsZS5jb20+
+        iLgEEwECACIFAliuqioCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEL+d
+        kl+RHv1lQhsD/0LDi008hCeoZdGMuwy2N5FMUusYg/X1tRQ6E0JcYYjvvE5oIZoX
+        bVN0yLLD99P0rt6TSlt05CC7RPVPCNpKxKbF+TZMjMJiOi13XmY5Yti77ZMdBZtD
+        7HeBzjkWCVuR6k8eIwy83niHGI6p6G87Q6XxvDjQ7wdBCNBpwkzmTYIBtC9CZXR0
+        ZSBDYXJ0d3JpZ2h0IDxiZXR0ZS5jYXJ0d3JpZ2h0QGV4YW1wbGUubmV0Poi4BBMB
+        AgAiBQJYrwLFAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRC/nZJfkR79
+        ZVzsBADYe3Hv71I7+lTJDvKOTmV7M4ShOfjEpmDvL/5JB3FzXHAucCOlReCv/6+N
+        afAspPTc1uys47dvtePwQalroAsd8Y1grn/PCh+Tx27kpn1WG8yZjUsuq3z5rrGR
+        uXj6g8aeZdqkMTHUVF9Gd+g/5KDODdJbOjwH+l63b/bOiATDFbiNBFiuqioBBADe
+        5nUdVOcbZlnxOjl0KBAT+A5bmyBLUT0BmLPsmA4PuXDSth7WvibPC8wcCdCYVk0I
+        RMYneZUiWq/o5c4rthfLR4jg8kruvomQ4E4d4hyI6R0MLxXYZ3XMu67VuScFgbLU
+        Rw1eRZ16ANd3Nc1VuFW7ms0vCG0idB8iSZBoULaK8QARAQABiJ8EGAECAAkFAliu
+        qioCGwwACgkQv52SX5Ee/WVCCAQA1bBDCuVPYEUtZXwXH7CWDfX6ZyOROrQtpa7e
+        i54CW6hKX3fYHpOiu4yHromjGlINTjjHclsJpn/qmiJizkB9/xl7IRWV+RVpDshZ
+        3mymOldpLiKgI5+Rl6mZtO4TtM9BYziIEC24h+IkaLBylZYz4ogfbzXKF8JxtHPM
+        UuwJVDE=
+        =0vYo
+        -----END PGP PUBLIC KEY BLOCK-----
+      KEY
+    end
+
+    def primary_keyid
+      fingerprint[-16..-1]
+    end
+
+    def fingerprint
+      '6D494CA6FC90C0CAE0910E42BF9D925F911EFD65'
+    end
+
+    def names
+      ['Bette Cartwright', 'Bette Cartwright']
+    end
+
+    def emails
+      ['bette.cartwright@example.com', 'bette.cartwright@example.net']
+    end
+  end
+
+  # GPG Key with extra signing key
+  module User3
+    extend self
+
+    def signed_commit_signature
+      <<~SIGNATURE
+        -----BEGIN PGP SIGNATURE-----
+
+        iQEzBAABCAAdFiEEBSLdKbmPFnzYQhdS44/8r3Wr2SoFAlnNlT8ACgkQ44/8r3Wr
+        2SqP1wf9FC4J2S8LIHs/fpxgkYzsyCp5lCbS7JuoD4pqmI2KWyBx+vi9/3mZPCsm
+        Fj9f0vFEtNOb39GNGZbaA8DdGw30/WAS6kI6yco0WSK53KHrLw9Kqd+3e/NAVSsl
+        991Gq4n8X1U5izSH+gZOMtEEUBGqIlZKgRrEh7lhNcz0G7JTF2VCE4NNtZdq7GDA
+        N6jOQxDGUwi9wQBYORQzIBc3NihfhGloII1hXf0XzrgUY3zNYHTT7QipCxKAmH54
+        skwW+wi8RpBedar4saf7fs5xZbP/0yyVz98MJMdHBL68++Xt1AIHoqrb7eWszqnd
+        PCo/fnz1iHKCig602KLj0/zhADcNkg==
+        =LsTi
+        -----END PGP SIGNATURE-----
+      SIGNATURE
+    end
+
+    def signed_commit_base_data
+      <<~SIGNEDDATA
+        tree 86ec18bfe87ad42a782fdabd8310f9b7ac750f51
+        parent 2d1096e3a0ecf1d2baf6dee036cc80775d4940ba
+        author John Doe <john.doe@example.com> 1506645311 -0500
+        committer John Doe <john.doe@example.com> 1506645311 -0500
+
+        Commit signed with subkey by John Doe
+      SIGNEDDATA
+    end
+
+    def public_key
+      <<~KEY.strip
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+        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
+        /jQYeOgFDKq20x86WulkvsUtBoaZJg==
+        =Q5Z7
+        -----END PGP PUBLIC KEY BLOCK-----
+      KEY
+    end
+
+    def secret_key
+      <<~SECRET
+        -----BEGIN PGP PRIVATE KEY BLOCK-----
+
+        lQPGBFnNgbIBCAC9/WblcR4s/pFTwh9cm2iS59YRhtGfbrnfNE6QMIFIRFaK0u6J
+        LDy+scipXLoGg7X0XNFLW6Y457UUpkaPDVLPuVMONhMXdVqndGVvk9jq3D4oDtRa
+        ukucuXr9F84lHnjL3EosmAUiK3xBmHOGHm8+bvKbgPOdvre48YxoJ1POTen+chfo
+        YtLUfnC9EEGY/bn00aaXm3NV+zZK2zio5bFX9YLWSNh/JaXxuJsLoHR/lVrU7CLt
+        FCaGcPQ9SU46LHPshEYWO7ZsjEYJsYYOIOEzfcfR47T2EDTa6mVc++gC5TCoY3Ql
+        jccgm+EM0LvyEHwupEpxzCg2VsT0yoedhUhtABEBAAH+BwMCOqjIWtWBMo3mjIP1
+        OnIbZ+YJxSUZ/B8wU2loMv4XiKmeXLbjD6h3jojxYlnreSHA9QvoY8uNaWElL/n2
+        jv6bxluivk8tA9FWJVv4HaSlMDd2J2YmUW17r8z9Kvm7b7pFVSrEoYV93Wdj5FJ7
+        ciKrFhYNSD7tH1sHwkrFAbiv6aHyk9h48YmR3kx2wBvz+pWk7M2srCJx2b6DXkj/
+        fsj1c/vnzUUGooOJgOvYAWrpg/rJUNxSsFypAHf8Xtk+xt8S1aZ9jaCmYk6I1B2L
+        m00HP43cXUpKcmETW1zXvfMLKjjoUEAJhSJhbCwiEzGL4ojQTarl8qbb+MisakEJ
+        DkPYtrhiiuVzUIFfqE86yO0UKidtzBmJAW3c6zeiUATvACzU09aGyUY1cJi93oXD
+        w4PCyVZ+nMvGD1wx+gyYdDINwpX4y6od9RDr06DGCzwu+S2vxsu1T8LdSv52fhBr
+        U0FY3Z3VN1ytay4SHi/8Y9VBYQFBh7R7Ch0gEMxLVKXVNqOXHUdGrKWV/WmyLKuZ
+        W9DEnWU4Mpz/di5jU8EDW7EB9DZZhVk3mQw3nuAZrBGD4azmmD5mgSgLeBGmKZ1e
+        q/9IWO44mRBBUtNv+rAkmmYF3MCNHuc7EMj+c/IgBUC7d5qBzGWA3UJ0vKX4xcIQ
+        X/PnU+nGxNvBrdqQaMLczeg28SerojxuX79prOsoySctLAbajd9HshW5SfOZ0rvb
+        BNHPqolQDijYEHGxANh4BbamRMGi60Rop7vJsZOLAemz17x/mvCtAHISOJT77/IM
+        oWC+IksJ5XsA/klJGe/tkx11aRQDDmKvIJXmMuRdvnIR23UBbzRQlWWq0l6CdoF6
+        6SQ9BJBFq0WY32No9WZAPnDO3buUzWc1Y3uwn/+h7TVYVyTlEqzpYJ9FoJwBHbor
+        0663eoyz6+AUtB9Kb2huIERvZSA8am9obi5kb2VAZXhhbXBsZS5jb20+iQFUBBMB
+        CAA+FiEE6j+LiJcqj9R0hy8vEVs68arT7boFAlnNgbICGwMFCQPCZwAFCwkIBwIG
+        FQgJCgsCBBYCAwECHgECF4AACgkQEVs68arT7bqzAwgAnNT4tbCyRXApyRHPbAiJ
+        wjuCx/H57TY0SzdzEz1OWAmJhTN3wJeZcr1z2eIzVmcSm0FXhZ5AzoOU4vG85hRD
+        HPCm2boLpLVRYs8Zy3RQk00TvPYtxw1UjWyKLK7ORycESjs7peotsIZ93bK/Pz/F
+        iXM2I2RosNvYRsB95neE4Z/2gBm846AhBSHyG9ZHHMhzCZGo+/UvAdmoLGxCS7k0
+        n7Fwt5BmSCcihtQzZg1B1v2ROq6PypIYpN8OicNeHDLClCDgZDoLA/4F4F/ccVo2
+        B5iq2wl7nEylHrzZWgsubc8KwtAJt6a5fTiY95mnDgPITWk1Q35RBzQsBzsKp1UG
+        Mp0DxgRZzYGyAQgAufTJinNHKj0T06QmeWqykaI9t0jSljA1msUhC3VPdVnfzSZO
+        MBdubq5PQbQbsI82gTKm/8Tw/PMiQt7nLNi8AsgG+Qv3R3DzqcrPD3fiq3Rw0d8w
+        DI3AErIs5Vv6hSPTLY4XFPWHeok1HowGRjRAu+lgCyd0i2Mwmg5BxY1qR916unJN
+        //Y6S93LJ/+RiwrGUFA2Bq2Ul7xwCIoMFl6OrTLOSwgjvQmYNqhg6b6pc3JsugkZ
+        H9If1BWCcxqn2ybcXgiMWvd1iDxPHhsGqGp3g5TbSKGIj+pKwtzi7Gj1k+fEJbTS
+        mkLmUqY8LUAR2uCSLeeb8fhXL0W+yn5YH30/GwARAQAB/gcDAuYn/gmAA3OC5p5Q
+        Pat5kE7MtmSvSPmdjVA2o+6RtqZf81JqtAgtDVDwj7SPFsH6ue5P+iAn9938YYek
+        WQU2+0GXeUbSJt+u4VAchgwA5mYsEnEr1/E5KEfWPWO3jJol1rJG99adrjkMxvug
+        QJmwieqhu0368w1FU0tKstxYbr3Tz3nPCPDJoigMEUkXiFklDCUgeNk0g+zd5ytE
+        lXuuLYcGZX7njxL5jD+cMIKqua5zv8WbvNf/BhM1nCarxp4qzKWim8J8jY+iR+/E
+        qOar4aliGRez0j+qh/r8ywgPwfOO89zrKrMfaclL7dN9yuecmBHKWZvfrP5JKMHj
+        yTU3nRMhUGbfVUaaZI2Ccz2rNOU4oF9wuzpzQi8qOysZixRmH61Nw3ULIKoQgiWp
+        0p5A3L94OaEfZEq3plVaIXI2YWYFSEAlIAc2dq4GxynousLdhNACi9bHhXrfFUhK
+        ckw1QlbhguO/j63/x8ygsmLZVwHG0fJZtMhT3+EGam9cuMBibIYyu3ufJRy7kMKt
+        kmyuk02X+hYJ7w8Pu6b8zYHBXbsEKamipMgd4oKtc8WnXILZo4lwDSArgs7ZVCBa
+        vGBbpTOsr54WjsyuCdX/wv0F2l31J87UxVtTKXx/+nfMfCE02zd+NsTgqvgqmkaA
+        Sy3qvv326kJNx7p+5hRwDzlAZ7vGJjj5TwCbGYDvctIf6MFrGDRNYwrGwNkPc3TG
+        rturfeL/ioua0Smj8LIbOv9Ir93gUIseNpxv8tXV/lffdIplcw802b3aXIKyv4fq
+        b9y3Oq/pDHFukKuBe9WTXJvjT0+ME+a0C8KIb/sts95pmjZsgN1kPmvuT0ReQwUR
+        eGrqz387bnVUzo4RgM3IERs/0EYzPzE8A2vc1e4/87b5J+1Xnov8Phd29vW8Td5l
+        ApiFrFO2r+/Np4kBPAQYAQgAJhYhBOo/i4iXKo/UdIcvLxFbOvGq0+26BQJZzYGy
+        AhsMBQkDwmcAAAoJEBFbOvGq0+26omMIAKP5niq2AyklfHe7nzALORUuXkjKUP+0
+        Q8Bw0iuPxBLx5z7ChMlowZUKH3pULYU+XwpHgeOHLTJq6nI9tMjpVaJvrdL81wN8
+        buu2+JEUbYZ/zJ24RF5vILRymCeaNWAV8mzs3credzPqbI6v2J00jTk4L2mgvvew
+        NS+NFeGbu7L3fxtP9HgxB2li7G5yBTcyLC98bmG36gnhin78itHY9OpEaowKyh2e
+        uhpMEqraRbnrlO0K+sWQ25v/K2isNshU31Wsgxy5OI6/ywuhBEMk70e9ZSFgCoxj
+        pSF3LXaNH0Wuq5mcawMoqz1XRjonhaLy+eZ2BZVlRzjSl9ercA8AHqydA8YEWc2B
+        4AEIAMWpBHEsfEshDsHvZ2JMwja0+T13lzruT4bOSuDVBijEEt1EKaEzjJ1ipnO8
+        jPjWemQrbTDiyiY4LC/IA6M7jogZvd/9aTyZjyjkcykjWaIB/N7RhNkrNGjYOau/
+        BtX+HyO9k0IhLC2s6BpqzNZJVK4RBAIDWN/iqLF8JvdF4RO9lzcxNleHDwhRuzNe
+        Hl1roJiqr9+vlnDgNzX1lKgdJOHRafTeYSb+Rpi2Jr/C3Uj7FW9NJoLY9/+RS2vt
+        QR/c0xzRgXSzgqB5bwrCMdrtLP3DPJ0s9EfmQnbpINQZSGsV/WM0sh6C0OyghJX/
+        zobO1dxWrkZjqVczCayCBF777vEAEQEAAf4HAwKESvCIDq5QNeadnSvpkZemItPO
+        lDf+7Wiue2gt776D5xkVyT7WkgTQv+IGWGtqz7pCCO2rMp/F9u1BghdjY46jtrK6
+        MMFKta4YENUhRliH6M2YmRjq5p7xZgH6UOnDlqsafbfyUx30t59tbQj+07aMnH5J
+        LMm37nVkDvo3wpPQPuo7L6qizYsrHrQKeJZ8636u41UjC99lVH7vXzqXw68FJImi
+        XdMZbEVBIprYfCDem+fD6gJBA4JBqWJMxuFMfhWp+1WtYoeNojDm4KxBzc2fvYV/
+        HOIUfLFBvACD/UwU5ovllHN39/O8SMgyLm9ymx2/qXcdIkUz4l7fhOCY1OW12DMu
+        5OFrrTteGK/Sj4Z8pYRdMdaKyjIlxuVzEQGWsU5+J2ALao5atEHguqwlD3cKh3G8
+        1sA/l5eTFDt84erYv1MVStV0BhZaCE4mNL4WpnQGDdW05yoGq9jIyLcurb/k/atU
+        TUkAF1csgNlJlR3IP+7U9xfHkjMO5+SV82xoNf9nBjz06TRdnvOSKsMNKp0RxC/L
+        Hbiee9o7Rxqdiyv0ly6bCCymwfvlsEIqo3YKssBfe3XI5yQI2hF9QZaH1ywzmgaH
+        o+rbME/XxddRJueS79eipT7K05Z3ulSHTXzpDw+jZcdUV0Ac72Q9FTDPMl3xc6NW
+        DrYwWw/3+kyZ4SkP56l7KlGczTyNPvU9iou4Cj/cAZk/pHx68Chq8ZZNznFm/bIF
+        gWt3fqE/n+y78B6MI8qTjGJOR0jycxrLH82Z2F+FpMShI2C5NnOa/Ilkv3e2Q5U6
+        MOAwaCIz6RHhcI99O/yta2vLelWZqn2g86rLzTG0HlIABTCPYotwetHh0hsrkSv9
+        Kh6rOzGB4i8lRqcBVY+alMSiRBlzkwpL4YUcO6f3vEDncQ9evE1AQCpD4jUJjB1H
+        JSSJAmwEGAEIACAWIQTqP4uIlyqP1HSHLy8RWzrxqtPtugUCWc2B4AIbAgFACRAR
+        WzrxqtPtusB0IAQZAQgAHRYhBAUi3Sm5jxZ82EIXUuOP/K91q9kqBQJZzYHgAAoJ
+        EOOP/K91q9kqlHcH+wbvD14ITYDMfgIfy67O4Qcmgf1qzGXhpsABz/i/EPgRD990
+        eNBI0YGuvoKRJfetEGn7LerrrCB8Z+ICFPHFrzXoe10zm+QTREck0OB8nPFRycJ+
+        Fbl6JX+cnkEx27Mmg1aVb7+H5LMDaWO1KjLsg2wIDo/jrDfW7NoZzy4XTd7jFCOt
+        4fftL/dhiujQmhLzugZXCxRISOVdmgilDJQoTz1sEm34ida98JFjdzSgkUvJ/pFT
+        Z21ThCNxlUf01Hr2Pdcg1e2/97sZocMFTY2JKwmiW2LG3B05/VrRtdvsCVj8G49c
+        oxgPPKty+m71ovAXdS/CvVqE7TefCplsYJ1dV3abwwf/Xl2SxzbAKbrYMgZfdGzp
+        Pg2u6982WvfGIVfjFJh9veHZAbfkPcjdAD2Xe67Y4BeKG2OQQqeOY2y+81A7Paeh
+        gHzbFHJG/4RjqB66efrZAg4DgIdbr4oyMoUJVVsl0wfYSIvnd4kvWXYICVwk53HL
+        A3wIowZAsJ1LT2byAKbUzayLzTekrTzGcwQkg2XT798ev2QuR5Ki5x8MULBFX4Lh
+        d03+uGOxjhNPQD6DAAHCQLaXQhaGuyMgt5hDt0nF3yuw3Eg4Ygcbtm24rZXOHJc9
+        bDKeRiWZz1dIyYYVJmHSQwOVXkAwJlF1sIgy/jQYeOgFDKq20x86WulkvsUtBoaZ
+        Jg==
+        =TKlF
+        -----END PGP PRIVATE KEY BLOCK-----
+      SECRET
+    end
+
+    def fingerprint
+      'EA3F8B88972A8FD474872F2F115B3AF1AAD3EDBA'
+    end
+
+    def subkey_fingerprints
+      %w(159AD5DDF199591D67D2B87AA3CEC5C0A7C270EC 0522DD29B98F167CD8421752E38FFCAF75ABD92A)
+    end
+
+    def names
+      ['John Doe']
+    end
+
+    def emails
+      ['john.doe@example.com']
+    end
+  end
+
+  # GPG Key containing just the main key
+  module User4
+    extend self
+
+    def public_key
+      <<~KEY.strip
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+        mQENBFnWcesBCAC6Y8FXl9ZJ9HPa6dIYcgQrvjIQcwoQCUEsaXNRpc+206RPCIXK
+        aIYr0nTD8GeovMuUONXTj+DdueQU2GAAqHHOqvDDVXqRrW3xfWnSwix7sTuhG1Ew
+        PLHYmjLENqaTsdyliEo3N8VWy2k0QRbC3R6xvop4Ooa87D5vcATIl0gYFtSiHIL+
+        TervYvTG9Eq1qSLZHbe2x4IzeqX2luikPKokL7j8FTZaCmC5MezIUur1ulfyYY/j
+        SkST/1aUFc5QXJJSZA0MYJWZX6x7Y3l7yl0dkHqmK8OTuo8RPWd3ybEiuvRsOL8K
+        GAv/PmVJRGDAf7GGbwXXsE9MiZ5GzVPxHnexABEBAAG0G0pvaG4gRG9lIDxqb2hu
+        QGV4YW1wbGUuY29tPokBTgQTAQgAOBYhBAh0izYM0lwuzJnVlAcBbPnhOj+bBQJZ
+        1nHrAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEAcBbPnhOj+bkywH/i4w
+        OwpDxoTjUQlPlqGAGuzvWaPzSJndawgmMTr68oRsD+wlQmQQTR5eqxCpUIyV4aYb
+        D697RYzoqbT4mlU49ymzfKSAxFe88r1XQWdm81DcofHVPmw2GBrIqaX3Du4Z7xkI
+        Q9/S43orwknh5FoVwU8Nau7qBuv9vbw2apSkuA1oBj3spQ8hqwLavACyQ+fQloAT
+        hSDNqPiCZj6L0dwM1HYiqVoN3Q7qjgzzeBzlXzljJoWblhxllvMK20bVoa7H+uR2
+        lczFHfsX8VTIMjyTGP7R3oHN91DEahlQybVVNLmNSDKZM2P/0d28BRUmWxQJ4Ws3
+        J4hOWDKnLMed3VOIWzM=
+        =xVuW
+        -----END PGP PUBLIC KEY BLOCK-----
+      KEY
+    end
+
+    def secret_key
+      <<~KEY.strip
+        -----BEGIN PGP PRIVATE KEY BLOCK-----
+
+        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
+        =/37z
+        -----END PGP PRIVATE KEY BLOCK-----
+      KEY
+    end
+
+    def primary_keyid
+      fingerprint[-16..-1]
+    end
+
+    def fingerprint
+      '08748B360CD25C2ECC99D59407016CF9E13A3F9B'
+    end
+  end
+end
diff --git a/spec/support/helpers/import_spec_helper.rb b/spec/support/helpers/import_spec_helper.rb
new file mode 100644
index 00000000000..d4eced724fa
--- /dev/null
+++ b/spec/support/helpers/import_spec_helper.rb
@@ -0,0 +1,33 @@
+require 'ostruct'
+
+# Helper methods for controller specs in the Import namespace
+#
+# Must be included manually.
+module ImportSpecHelper
+  # Stub `controller` to return a null object double with the provided messages
+  # when `client` is called
+  #
+  # Examples:
+  #
+  #   stub_client(foo: %w(foo))
+  #
+  #   controller.client.foo         # => ["foo"]
+  #   controller.client.bar.baz.foo # => ["foo"]
+  #
+  # Returns the client double
+  def stub_client(messages = {})
+    client = double('client', messages).as_null_object
+    allow(controller).to receive(:client).and_return(client)
+
+    client
+  end
+
+  def stub_omniauth_provider(name)
+    provider = OpenStruct.new(
+      name: name,
+      app_id: 'asd123',
+      app_secret: 'asd123'
+    )
+    stub_omniauth_setting(providers: [provider])
+  end
+end
diff --git a/spec/support/helpers/input_helper.rb b/spec/support/helpers/input_helper.rb
new file mode 100644
index 00000000000..acbb42274ec
--- /dev/null
+++ b/spec/support/helpers/input_helper.rb
@@ -0,0 +1,7 @@
+# see app/assets/javascripts/test_utils/simulate_input.js
+
+module InputHelper
+  def simulate_input(selector, input = '')
+    evaluate_script("window.simulateInput(#{selector.to_json}, #{input.to_json});")
+  end
+end
diff --git a/spec/support/helpers/inspect_requests.rb b/spec/support/helpers/inspect_requests.rb
new file mode 100644
index 00000000000..88ddc5c7f6c
--- /dev/null
+++ b/spec/support/helpers/inspect_requests.rb
@@ -0,0 +1,17 @@
+require_relative './wait_for_requests'
+
+module InspectRequests
+  extend self
+  include WaitForRequests
+
+  def inspect_requests(inject_headers: {})
+    Gitlab::Testing::RequestInspectorMiddleware.log_requests!(inject_headers)
+
+    yield
+
+    wait_for_all_requests
+    Gitlab::Testing::RequestInspectorMiddleware.requests
+  ensure
+    Gitlab::Testing::RequestInspectorMiddleware.stop_logging!
+  end
+end
diff --git a/spec/support/helpers/issue_helpers.rb b/spec/support/helpers/issue_helpers.rb
new file mode 100644
index 00000000000..ffd72515f37
--- /dev/null
+++ b/spec/support/helpers/issue_helpers.rb
@@ -0,0 +1,13 @@
+module IssueHelpers
+  def visit_issues(project, opts = {})
+    visit project_issues_path project, opts
+  end
+
+  def first_issue
+    page.all('ul.issues-list > li').first.text
+  end
+
+  def last_issue
+    page.all('ul.issues-list > li').last.text
+  end
+end
diff --git a/spec/support/helpers/javascript_fixtures_helpers.rb b/spec/support/helpers/javascript_fixtures_helpers.rb
new file mode 100644
index 00000000000..2197bc9d853
--- /dev/null
+++ b/spec/support/helpers/javascript_fixtures_helpers.rb
@@ -0,0 +1,66 @@
+require 'action_dispatch/testing/test_request'
+require 'fileutils'
+
+module JavaScriptFixturesHelpers
+  include Gitlab::Popen
+
+  FIXTURE_PATH = 'spec/javascripts/fixtures'.freeze
+
+  # Public: Removes all fixture files from given directory
+  #
+  # directory_name - directory of the fixtures (relative to FIXTURE_PATH)
+  #
+  def clean_frontend_fixtures(directory_name)
+    directory_name = File.expand_path(directory_name, FIXTURE_PATH)
+    Dir[File.expand_path('*.html.raw', directory_name)].each do |file_name|
+      FileUtils.rm(file_name)
+    end
+  end
+
+  # Public: Store a response object as fixture file
+  #
+  # response - string or response object to store
+  # fixture_file_name - file name to store the fixture in (relative to FIXTURE_PATH)
+  #
+  def store_frontend_fixture(response, fixture_file_name)
+    fixture_file_name = File.expand_path(fixture_file_name, FIXTURE_PATH)
+    fixture = response.respond_to?(:body) ? parse_response(response) : response
+
+    FileUtils.mkdir_p(File.dirname(fixture_file_name))
+    File.write(fixture_file_name, fixture)
+  end
+
+  def remove_repository(project)
+    Gitlab::Shell.new.remove_repository(project.repository_storage_path, project.disk_path)
+  end
+
+  private
+
+  # Private: Prepare a response object for use as a frontend fixture
+  #
+  # response - response object to prepare
+  #
+  def parse_response(response)
+    fixture = response.body
+    fixture.force_encoding("utf-8")
+
+    response_mime_type = Mime::Type.lookup(response.content_type)
+    if response_mime_type.html?
+      doc = Nokogiri::HTML::DocumentFragment.parse(fixture)
+
+      link_tags = doc.css('link')
+      link_tags.remove
+
+      scripts = doc.css("script:not([type='text/template']):not([type='text/x-template'])")
+      scripts.remove
+
+      fixture = doc.to_html
+
+      # replace relative links
+      test_host = ActionDispatch::TestRequest::DEFAULT_ENV['HTTP_HOST']
+      fixture.gsub!(%r{="/}, "=\"http://#{test_host}/")
+    end
+
+    fixture
+  end
+end
diff --git a/spec/support/helpers/jira_service_helper.rb b/spec/support/helpers/jira_service_helper.rb
new file mode 100644
index 00000000000..88a7aeba461
--- /dev/null
+++ b/spec/support/helpers/jira_service_helper.rb
@@ -0,0 +1,88 @@
+module JiraServiceHelper
+  JIRA_URL = "http://jira.example.net".freeze
+  JIRA_API = JIRA_URL + "/rest/api/2"
+
+  def jira_service_settings
+    properties = {
+      title: "JIRA tracker",
+      url: JIRA_URL,
+      username: 'jira-user',
+      password: 'my-secret-password',
+      project_key: "JIRA",
+      jira_issue_transition_id: '1'
+    }
+
+    jira_tracker.update_attributes(properties: properties, active: true)
+  end
+
+  def jira_issue_comments
+    "{\"startAt\":0,\"maxResults\":11,\"total\":11,
+      \"comments\":[{\"self\":\"http://0.0.0.0:4567/rest/api/2/issue/10002/comment/10609\",
+      \"id\":\"10609\",\"author\":{\"self\":\"http://0.0.0.0:4567/rest/api/2/user?username=gitlab\",
+      \"name\":\"gitlab\",\"emailAddress\":\"gitlab@example.com\",
+      \"avatarUrls\":{\"16x16\":\"http://0.0.0.0:4567/secure/useravatar?size=xsmall&avatarId=10122\",
+      \"24x24\":\"http://0.0.0.0:4567/secure/useravatar?size=small&avatarId=10122\",
+      \"32x32\":\"http://0.0.0.0:4567/secure/useravatar?size=medium&avatarId=10122\",
+      \"48x48\":\"http://0.0.0.0:4567/secure/useravatar?avatarId=10122\"},
+      \"displayName\":\"GitLab\",\"active\":true},
+      \"body\":\"[Administrator|http://localhost:3000/u/root] mentioned JIRA-1 in Merge request of [gitlab-org/gitlab-test|http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2].\",
+      \"updateAuthor\":{\"self\":\"http://0.0.0.0:4567/rest/api/2/user?username=gitlab\",\"name\":\"gitlab\",\"emailAddress\":\"gitlab@example.com\",
+      \"avatarUrls\":{\"16x16\":\"http://0.0.0.0:4567/secure/useravatar?size=xsmall&avatarId=10122\",
+      \"24x24\":\"http://0.0.0.0:4567/secure/useravatar?size=small&avatarId=10122\",
+      \"32x32\":\"http://0.0.0.0:4567/secure/useravatar?size=medium&avatarId=10122\",
+      \"48x48\":\"http://0.0.0.0:4567/secure/useravatar?avatarId=10122\"},\"displayName\":\"GitLab\",\"active\":true},
+      \"created\":\"2015-02-12T22:47:07.826+0100\",
+      \"updated\":\"2015-02-12T22:47:07.826+0100\"},
+     {\"self\":\"http://0.0.0.0:4567/rest/api/2/issue/10002/comment/10700\",
+        \"id\":\"10700\",\"author\":{\"self\":\"http://0.0.0.0:4567/rest/api/2/user?username=gitlab\",
+        \"name\":\"gitlab\",\"emailAddress\":\"gitlab@example.com\",
+        \"avatarUrls\":{\"16x16\":\"http://0.0.0.0:4567/secure/useravatar?size=xsmall&avatarId=10122\",
+        \"24x24\":\"http://0.0.0.0:4567/secure/useravatar?size=small&avatarId=10122\",
+        \"32x32\":\"http://0.0.0.0:4567/secure/useravatar?size=medium&avatarId=10122\",
+        \"48x48\":\"http://0.0.0.0:4567/secure/useravatar?avatarId=10122\"},\"displayName\":\"GitLab\",\"active\":true},
+        \"body\":\"[Administrator|http://localhost:3000/u/root] mentioned this issue in [a commit of h5bp/html5-boilerplate|http://localhost:3000/h5bp/html5-boilerplate/commit/2439f77897122fbeee3bfd9bb692d3608848433e].\",
+        \"updateAuthor\":{\"self\":\"http://0.0.0.0:4567/rest/api/2/user?username=gitlab\",\"name\":\"gitlab\",\"emailAddress\":\"gitlab@example.com\",
+        \"avatarUrls\":{\"16x16\":\"http://0.0.0.0:4567/secure/useravatar?size=xsmall&avatarId=10122\",
+        \"24x24\":\"http://0.0.0.0:4567/secure/useravatar?size=small&avatarId=10122\",
+        \"32x32\":\"http://0.0.0.0:4567/secure/useravatar?size=medium&avatarId=10122\",
+        \"48x48\":\"http://0.0.0.0:4567/secure/useravatar?avatarId=10122\"},\"displayName\":\"GitLab\",\"active\":true},
+        \"created\":\"2015-04-01T03:45:55.667+0200\",
+        \"updated\":\"2015-04-01T03:45:55.667+0200\"
+      }
+      ]}"
+  end
+
+  def jira_project_url
+    JIRA_API + "/project"
+  end
+
+  def jira_api_comment_url(issue_id)
+    JIRA_API + "/issue/#{issue_id}/comment"
+  end
+
+  def jira_api_remote_link_url(issue_id)
+    JIRA_API + "/issue/#{issue_id}/remotelink"
+  end
+
+  def jira_api_transition_url(issue_id)
+    JIRA_API + "/issue/#{issue_id}/transitions"
+  end
+
+  def jira_api_test_url
+    JIRA_API + "/myself"
+  end
+
+  def jira_issue_url(issue_id)
+    JIRA_API + "/issue/#{issue_id}"
+  end
+
+  def stub_jira_urls(issue_id)
+    WebMock.stub_request(:get, jira_project_url)
+    WebMock.stub_request(:get, jira_api_comment_url(issue_id)).to_return(body: jira_issue_comments)
+    WebMock.stub_request(:get, jira_issue_url(issue_id))
+    WebMock.stub_request(:get, jira_api_test_url)
+    WebMock.stub_request(:post, jira_api_comment_url(issue_id))
+    WebMock.stub_request(:post, jira_api_remote_link_url(issue_id))
+    WebMock.stub_request(:post, jira_api_transition_url(issue_id))
+  end
+end
diff --git a/spec/support/helpers/kubernetes_helpers.rb b/spec/support/helpers/kubernetes_helpers.rb
new file mode 100644
index 00000000000..e46b61b6461
--- /dev/null
+++ b/spec/support/helpers/kubernetes_helpers.rb
@@ -0,0 +1,104 @@
+module KubernetesHelpers
+  include Gitlab::Kubernetes
+
+  def kube_response(body)
+    { body: body.to_json }
+  end
+
+  def kube_pods_response
+    kube_response(kube_pods_body)
+  end
+
+  def stub_kubeclient_discover(api_url)
+    WebMock.stub_request(:get, api_url + '/api/v1').to_return(kube_response(kube_v1_discovery_body))
+  end
+
+  def stub_kubeclient_pods(response = nil)
+    stub_kubeclient_discover(service.api_url)
+    pods_url = service.api_url + "/api/v1/namespaces/#{service.actual_namespace}/pods"
+
+    WebMock.stub_request(:get, pods_url).to_return(response || kube_pods_response)
+  end
+
+  def stub_kubeclient_get_secrets(api_url, **options)
+    WebMock.stub_request(:get, api_url + '/api/v1/secrets')
+      .to_return(kube_response(kube_v1_secrets_body(options)))
+  end
+
+  def stub_kubeclient_get_secrets_error(api_url)
+    WebMock.stub_request(:get, api_url + '/api/v1/secrets')
+      .to_return(status: [404, "Internal Server Error"])
+  end
+
+  def kube_v1_secrets_body(**options)
+    {
+      "kind" => "SecretList",
+      "apiVersion": "v1",
+      "items" => [
+        {
+          "metadata": {
+            "name": options[:metadata_name] || "default-token-1",
+            "namespace": "kube-system"
+          },
+          "data": {
+            "token": options[:token] || Base64.encode64('token-sample-123')
+          }
+        }
+      ]
+    }
+  end
+
+  def kube_v1_discovery_body
+    {
+      "kind" => "APIResourceList",
+      "resources" => [
+        { "name" => "pods", "namespaced" => true, "kind" => "Pod" },
+        { "name" => "secrets", "namespaced" => true, "kind" => "Secret" }
+      ]
+    }
+  end
+
+  def kube_pods_body
+    {
+      "kind" => "PodList",
+      "items" => [kube_pod]
+    }
+  end
+
+  # This is a partial response, it will have many more elements in reality but
+  # these are the ones we care about at the moment
+  def kube_pod(name: "kube-pod", app: "valid-pod-label")
+    {
+      "metadata" => {
+        "name" => name,
+        "creationTimestamp" => "2016-11-25T19:55:19Z",
+        "labels" => { "app" => app }
+      },
+      "spec" => {
+        "containers" => [
+          { "name" => "container-0" },
+          { "name" => "container-1" }
+        ]
+      },
+      "status" => { "phase" => "Running" }
+    }
+  end
+
+  def kube_terminals(service, pod)
+    pod_name = pod['metadata']['name']
+    containers = pod['spec']['containers']
+
+    containers.map do |container|
+      terminal = {
+        selectors: { pod: pod_name, container: container['name'] },
+        url:  container_exec_url(service.api_url, service.actual_namespace, pod_name, container['name']),
+        subprotocols: ['channel.k8s.io'],
+        headers: { 'Authorization' => ["Bearer #{service.token}"] },
+        created_at: DateTime.parse(pod['metadata']['creationTimestamp']),
+        max_session_time: 0
+      }
+      terminal[:ca_pem] = service.ca_pem if service.ca_pem.present?
+      terminal
+    end
+  end
+end
diff --git a/spec/support/helpers/ldap_helpers.rb b/spec/support/helpers/ldap_helpers.rb
new file mode 100644
index 00000000000..0e87b3d359d
--- /dev/null
+++ b/spec/support/helpers/ldap_helpers.rb
@@ -0,0 +1,49 @@
+module LdapHelpers
+  def ldap_adapter(provider = 'ldapmain', ldap = double(:ldap))
+    ::Gitlab::Auth::LDAP::Adapter.new(provider, ldap)
+  end
+
+  def user_dn(uid)
+    "uid=#{uid},ou=users,dc=example,dc=com"
+  end
+
+  # Accepts a hash of Gitlab::Auth::LDAP::Config keys and values.
+  #
+  # Example:
+  #   stub_ldap_config(
+  #     group_base: 'ou=groups,dc=example,dc=com',
+  #     admin_group: 'my-admin-group'
+  #   )
+  def stub_ldap_config(messages)
+    allow_any_instance_of(::Gitlab::Auth::LDAP::Config).to receive_messages(messages)
+  end
+
+  # Stub an LDAP person search and provide the return entry. Specify `nil` for
+  # `entry` to simulate when an LDAP person is not found
+  #
+  # Example:
+  #  adapter = ::Gitlab::Auth::LDAP::Adapter.new('ldapmain', double(:ldap))
+  #  ldap_user_entry = ldap_user_entry('john_doe')
+  #
+  #  stub_ldap_person_find_by_uid('john_doe', ldap_user_entry, adapter)
+  def stub_ldap_person_find_by_uid(uid, entry, provider = 'ldapmain')
+    return_value = ::Gitlab::Auth::LDAP::Person.new(entry, provider) if entry.present?
+
+    allow(::Gitlab::Auth::LDAP::Person)
+      .to receive(:find_by_uid).with(uid, any_args).and_return(return_value)
+  end
+
+  # Create a simple LDAP user entry.
+  def ldap_user_entry(uid)
+    entry = Net::LDAP::Entry.new
+    entry['dn'] = user_dn(uid)
+    entry['uid'] = uid
+
+    entry
+  end
+
+  def raise_ldap_connection_error
+    allow_any_instance_of(Gitlab::Auth::LDAP::Adapter)
+      .to receive(:ldap_search).and_raise(Gitlab::Auth::LDAP::LDAPConnectionError)
+  end
+end
diff --git a/spec/support/helpers/live_debugger.rb b/spec/support/helpers/live_debugger.rb
new file mode 100644
index 00000000000..911eb48a8ca
--- /dev/null
+++ b/spec/support/helpers/live_debugger.rb
@@ -0,0 +1,17 @@
+require 'io/console'
+
+module LiveDebugger
+  def live_debug
+    puts
+    puts "Current example is paused for live debugging."
+    puts "Opening #{current_url} in your default browser..."
+    puts "The current user credentials are: #{@current_user.username} / #{@current_user.password}" if @current_user
+    puts "Press any key to resume the execution of the example!!"
+
+    `open #{current_url}`
+
+    loop until $stdin.getch
+
+    puts "Back to the example!"
+  end
+end
diff --git a/spec/support/helpers/login_helpers.rb b/spec/support/helpers/login_helpers.rb
new file mode 100644
index 00000000000..db34090e971
--- /dev/null
+++ b/spec/support/helpers/login_helpers.rb
@@ -0,0 +1,162 @@
+require_relative 'devise_helpers'
+
+module LoginHelpers
+  include DeviseHelpers
+
+  # Overriding Devise::Test::IntegrationHelpers#sign_in to store @current_user
+  # since we may need it in LiveDebugger#live_debug.
+  def sign_in(resource, scope: nil)
+    super
+
+    @current_user = resource
+  end
+
+  # Overriding Devise::Test::IntegrationHelpers#sign_out to clear @current_user.
+  def sign_out(resource_or_scope)
+    super
+
+    @current_user = nil
+  end
+
+  # Internal: Log in as a specific user or a new user of a specific role
+  #
+  # user_or_role - User object, or a role to create (e.g., :admin, :user)
+  #
+  # Examples:
+  #
+  #   # Create a user automatically
+  #   gitlab_sign_in(:user)
+  #
+  #   # Create an admin automatically
+  #   gitlab_sign_in(:admin)
+  #
+  #   # Provide an existing User record
+  #   user = create(:user)
+  #   gitlab_sign_in(user)
+  def gitlab_sign_in(user_or_role, **kwargs)
+    user =
+      if user_or_role.is_a?(User)
+        user_or_role
+      else
+        create(user_or_role)
+      end
+
+    gitlab_sign_in_with(user, **kwargs)
+
+    @current_user = user
+  end
+
+  def gitlab_sign_in_via(provider, user, uid)
+    mock_auth_hash(provider, uid, user.email)
+    visit new_user_session_path
+    click_link provider
+  end
+
+  # Requires Javascript driver.
+  def gitlab_sign_out
+    find(".header-user-dropdown-toggle").click
+    click_link "Sign out"
+    @current_user = nil
+
+    expect(page).to have_button('Sign in')
+  end
+
+  private
+
+  # Private: Login as the specified user
+  #
+  # user     - User instance to login with
+  # remember - Whether or not to check "Remember me" (default: false)
+  def gitlab_sign_in_with(user, remember: false)
+    visit new_user_session_path
+
+    fill_in "user_login", with: user.email
+    fill_in "user_password", with: "12345678"
+    check 'user_remember_me' if remember
+
+    click_button "Sign in"
+  end
+
+  def login_via(provider, user, uid, remember_me: false)
+    mock_auth_hash(provider, uid, user.email)
+    visit new_user_session_path
+    expect(page).to have_content('Sign in with')
+
+    check 'remember_me' if remember_me
+
+    click_link "oauth-login-#{provider}"
+  end
+
+  def mock_auth_hash(provider, uid, email)
+    # The mock_auth configuration allows you to set per-provider (or default)
+    # authentication hashes to return during integration testing.
+    OmniAuth.config.mock_auth[provider.to_sym] = OmniAuth::AuthHash.new({
+      provider: provider,
+      uid: uid,
+      info: {
+        name: 'mockuser',
+        email: email,
+        image: 'mock_user_thumbnail_url'
+      },
+      credentials: {
+        token: 'mock_token',
+        secret: 'mock_secret'
+      },
+      extra: {
+        raw_info: {
+          info: {
+            name: 'mockuser',
+            email: email,
+            image: 'mock_user_thumbnail_url'
+          }
+        }
+      }
+    })
+    Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[:saml]
+  end
+
+  def mock_saml_config
+    OpenStruct.new(name: 'saml', label: 'saml', args: {
+      assertion_consumer_service_url: 'https://localhost:3443/users/auth/saml/callback',
+      idp_cert_fingerprint: '26:43:2C:47:AF:F0:6B:D0:07:9C:AD:A3:74:FE:5D:94:5F:4E:9E:52',
+      idp_sso_target_url: 'https://idp.example.com/sso/saml',
+      issuer: 'https://localhost:3443/',
+      name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
+    })
+  end
+
+  def stub_omniauth_provider(provider, context: Rails.application)
+    env = env_from_context(context)
+
+    set_devise_mapping(context: context)
+    env['omniauth.auth'] = OmniAuth.config.mock_auth[provider]
+  end
+
+  def stub_omniauth_saml_config(messages)
+    set_devise_mapping(context: Rails.application)
+    Rails.application.routes.disable_clear_and_finalize = true
+    Rails.application.routes.draw do
+      post '/users/auth/saml' => 'omniauth_callbacks#saml'
+    end
+    allow(Gitlab::Auth::OAuth::Provider).to receive_messages(providers: [:saml], config_for: mock_saml_config)
+    stub_omniauth_setting(messages)
+    stub_saml_authorize_path_helpers
+  end
+
+  def stub_saml_authorize_path_helpers
+    allow_any_instance_of(Object).to receive(:user_saml_omniauth_authorize_path).and_return('/users/auth/saml')
+    allow_any_instance_of(Object).to receive(:omniauth_authorize_path).with(:user, "saml").and_return('/users/auth/saml')
+  end
+
+  def stub_omniauth_config(messages)
+    allow(Gitlab.config.omniauth).to receive_messages(messages)
+  end
+
+  def stub_basic_saml_config
+    allow(Gitlab::Auth::Saml::Config).to receive_messages({ options: { name: 'saml', args: {} } })
+  end
+
+  def stub_saml_group_config(groups)
+    allow(Gitlab::Auth::Saml::Config).to receive_messages({ options: { name: 'saml', groups_attribute: 'groups', external_groups: groups, args: {} } })
+  end
+end
diff --git a/spec/support/helpers/markdown_feature.rb b/spec/support/helpers/markdown_feature.rb
new file mode 100644
index 00000000000..39e94ad53de
--- /dev/null
+++ b/spec/support/helpers/markdown_feature.rb
@@ -0,0 +1,128 @@
+# This is a helper class used by the GitLab Markdown feature spec
+#
+# Because the feature spec only cares about the output of the Markdown, and the
+# test setup and teardown and parsing is fairly expensive, we only want to do it
+# once. Unfortunately RSpec will not let you access `let`s in a `before(:all)`
+# block, so we fake it by encapsulating all the shared setup in this class.
+#
+# The class renders `spec/fixtures/markdown.md.erb` using ERB, allowing for
+# reference to the factory-created objects.
+class MarkdownFeature
+  include FactoryBot::Syntax::Methods
+
+  def user
+    @user ||= create(:user)
+  end
+
+  def group
+    @group ||= create(:group).tap do |group|
+      group.add_developer(user)
+    end
+  end
+
+  # Direct references ----------------------------------------------------------
+
+  def project
+    @project ||= create(:project, :repository, group: group).tap do |project|
+      project.add_master(user)
+    end
+  end
+
+  def project_wiki
+    @project_wiki ||= ProjectWiki.new(project, user)
+  end
+
+  def project_wiki_page
+    @project_wiki_page ||= build(:wiki_page, wiki: project_wiki)
+  end
+
+  def issue
+    @issue ||= create(:issue, project: project)
+  end
+
+  def merge_request
+    @merge_request ||= create(:merge_request, :simple, source_project: project)
+  end
+
+  def snippet
+    @snippet ||= create(:project_snippet, project: project)
+  end
+
+  def commit
+    @commit ||= project.commit
+  end
+
+  def commit_range
+    @commit_range ||= begin
+      commit2 = project.commit('HEAD~3')
+      CommitRange.new("#{commit.id}...#{commit2.id}", project)
+    end
+  end
+
+  def simple_label
+    @simple_label ||= create(:label, name: 'gfm', project: project)
+  end
+
+  def label
+    @label ||= create(:label, name: 'awaiting feedback', project: project)
+  end
+
+  def simple_milestone
+    @simple_milestone ||= create(:milestone, name: 'gfm-milestone', project: project)
+  end
+
+  def milestone
+    @milestone ||= create(:milestone, name: 'next goal', project: project)
+  end
+
+  def group_milestone
+    @group_milestone ||= create(:milestone, name: 'group-milestone', group: group)
+  end
+
+  # Cross-references -----------------------------------------------------------
+
+  def xproject
+    @xproject ||= begin
+      group = create(:group, :nested)
+      create(:project, :repository, namespace: group) do |project|
+        project.add_developer(user)
+      end
+    end
+  end
+
+  def xissue
+    @xissue ||= create(:issue, project: xproject)
+  end
+
+  def xmerge_request
+    @xmerge_request ||= create(:merge_request, :simple, source_project: xproject)
+  end
+
+  def xsnippet
+    @xsnippet ||= create(:project_snippet, project: xproject)
+  end
+
+  def xcommit
+    @xcommit ||= xproject.commit
+  end
+
+  def xcommit_range
+    @xcommit_range ||= begin
+      xcommit2 = xproject.commit('HEAD~2')
+      CommitRange.new("#{xcommit.id}...#{xcommit2.id}", xproject)
+    end
+  end
+
+  def xmilestone
+    @xmilestone ||= create(:milestone, project: xproject)
+  end
+
+  def urls
+    Gitlab::Routing.url_helpers
+  end
+
+  def raw_markdown
+    markdown = File.read(Rails.root.join('spec/fixtures/markdown.md.erb'))
+    ERB.new(markdown).result(binding)
+  end
+end
diff --git a/spec/support/helpers/merge_request_helpers.rb b/spec/support/helpers/merge_request_helpers.rb
new file mode 100644
index 00000000000..772adff4626
--- /dev/null
+++ b/spec/support/helpers/merge_request_helpers.rb
@@ -0,0 +1,22 @@
+module MergeRequestHelpers
+  def visit_merge_requests(project, opts = {})
+    visit project_merge_requests_path project, opts
+  end
+
+  def first_merge_request
+    page.all('ul.mr-list > li').first.text
+  end
+
+  def last_merge_request
+    page.all('ul.mr-list > li').last.text
+  end
+
+  def expect_mr_list_count(open_count, closed_count = 0)
+    all_count = open_count + closed_count
+
+    expect(page).to have_issuable_counts(open: open_count, closed: closed_count, all: all_count)
+    page.within '.mr-list' do
+      expect(page).to have_selector('.merge-request', count: open_count)
+    end
+  end
+end
diff --git a/spec/support/helpers/migrations_helpers.rb b/spec/support/helpers/migrations_helpers.rb
new file mode 100644
index 00000000000..5d6f662e8fe
--- /dev/null
+++ b/spec/support/helpers/migrations_helpers.rb
@@ -0,0 +1,92 @@
+module MigrationsHelpers
+  def table(name)
+    Class.new(ActiveRecord::Base) do
+      self.table_name = name
+      self.inheritance_column = :_type_disabled
+    end
+  end
+
+  def migrations_paths
+    ActiveRecord::Migrator.migrations_paths
+  end
+
+  def table_exists?(name)
+    ActiveRecord::Base.connection.table_exists?(name)
+  end
+
+  def migrations
+    ActiveRecord::Migrator.migrations(migrations_paths)
+  end
+
+  def clear_schema_cache!
+    ActiveRecord::Base.connection_pool.connections.each do |conn|
+      conn.schema_cache.clear!
+    end
+  end
+
+  def reset_column_in_all_models
+    clear_schema_cache!
+
+    # Reset column information for the most offending classes **after** we
+    # migrated the schema up, otherwise, column information could be
+    # outdated. We have a separate method for this so we can override it in EE.
+    ActiveRecord::Base.descendants.each(&method(:reset_column_information))
+
+    # Without that, we get errors because of missing attributes, e.g.
+    # super: no superclass method `elasticsearch_indexing' for #<ApplicationSetting:0x00007f85628508d8>
+    ApplicationSetting.define_attribute_methods
+  end
+
+  def reset_column_information(klass)
+    klass.reset_column_information
+  end
+
+  def previous_migration
+    migrations.each_cons(2) do |previous, migration|
+      break previous if migration.name == described_class.name
+    end
+  end
+
+  def migration_schema_version
+    metadata_schema = self.class.metadata[:schema]
+
+    if metadata_schema == :latest
+      migrations.last.version
+    else
+      metadata_schema || previous_migration.version
+    end
+  end
+
+  def schema_migrate_down!
+    disable_migrations_output do
+      ActiveRecord::Migrator.migrate(migrations_paths,
+                                     migration_schema_version)
+    end
+
+    reset_column_in_all_models
+  end
+
+  def schema_migrate_up!
+    reset_column_in_all_models
+
+    disable_migrations_output do
+      ActiveRecord::Migrator.migrate(migrations_paths)
+    end
+
+    reset_column_in_all_models
+  end
+
+  def disable_migrations_output
+    ActiveRecord::Migration.verbose = false
+
+    yield
+  ensure
+    ActiveRecord::Migration.verbose = true
+  end
+
+  def migrate!
+    ActiveRecord::Migrator.up(migrations_paths) do |migration|
+      migration.name == described_class.name
+    end
+  end
+end
diff --git a/spec/support/helpers/mobile_helpers.rb b/spec/support/helpers/mobile_helpers.rb
new file mode 100644
index 00000000000..3b9eb84e824
--- /dev/null
+++ b/spec/support/helpers/mobile_helpers.rb
@@ -0,0 +1,17 @@
+module MobileHelpers
+  def resize_screen_xs
+    resize_window(767, 768)
+  end
+
+  def resize_screen_sm
+    resize_window(900, 768)
+  end
+
+  def restore_window_size
+    resize_window(1366, 768)
+  end
+
+  def resize_window(width, height)
+    Capybara.current_session.current_window.resize_to(width, height)
+  end
+end
diff --git a/spec/support/helpers/project_forks_helper.rb b/spec/support/helpers/project_forks_helper.rb
new file mode 100644
index 00000000000..2c501a2a27c
--- /dev/null
+++ b/spec/support/helpers/project_forks_helper.rb
@@ -0,0 +1,54 @@
+module ProjectForksHelper
+  def fork_project(project, user = nil, params = {})
+    # Load the `fork_network` for the project to fork as there might be one that
+    # wasn't loaded yet.
+    project.reload unless project.fork_network
+
+    unless user
+      user = create(:user)
+      project.add_developer(user)
+    end
+
+    unless params[:namespace] || params[:namespace_id]
+      params[:namespace] = create(:group)
+      params[:namespace].add_owner(user)
+    end
+
+    service = Projects::ForkService.new(project, user, params)
+
+    create_repository = params.delete(:repository)
+    # Avoid creating a repository
+    unless create_repository
+      allow(RepositoryForkWorker).to receive(:perform_async).and_return(true)
+      shell = double('gitlab_shell', fork_repository: true)
+      allow(service).to receive(:gitlab_shell).and_return(shell)
+    end
+
+    forked_project = service.execute
+
+    # Reload the both projects so they know about their newly created fork_network
+    if forked_project.persisted?
+      project.reload
+      forked_project.reload
+    end
+
+    if create_repository
+      # The call to project.repository.after_import in RepositoryForkWorker does
+      # not reset the @exists variable of this forked_project.repository
+      # so we have to explicitely call this method to clear the @exists variable.
+      # of the instance we're returning here.
+      forked_project.repository.after_import
+    end
+
+    forked_project
+  end
+
+  def fork_project_with_submodules(project, user = nil, params = {})
+    forked_project = fork_project(project, user, params)
+    TestEnv.copy_repo(forked_project,
+                      bare_repo: TestEnv.forked_repo_path_bare,
+                      refs: TestEnv::FORKED_BRANCH_SHA)
+    forked_project.repository.after_import
+    forked_project
+  end
+end
diff --git a/spec/support/helpers/prometheus_helpers.rb b/spec/support/helpers/prometheus_helpers.rb
new file mode 100644
index 00000000000..4212be2cc88
--- /dev/null
+++ b/spec/support/helpers/prometheus_helpers.rb
@@ -0,0 +1,202 @@
+module PrometheusHelpers
+  def prometheus_memory_query(environment_slug)
+    %{avg(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}) / 2^20}
+  end
+
+  def prometheus_cpu_query(environment_slug)
+    %{avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}[2m])) * 100}
+  end
+
+  def prometheus_ping_url(prometheus_query)
+    query = { query: prometheus_query }.to_query
+
+    "https://prometheus.example.com/api/v1/query?#{query}"
+  end
+
+  def prometheus_query_url(prometheus_query)
+    query = { query: prometheus_query }.to_query
+
+    "https://prometheus.example.com/api/v1/query?#{query}"
+  end
+
+  def prometheus_query_with_time_url(prometheus_query, time)
+    query = { query: prometheus_query, time: time.to_f }.to_query
+
+    "https://prometheus.example.com/api/v1/query?#{query}"
+  end
+
+  def prometheus_query_range_url(prometheus_query, start: 8.hours.ago, stop: Time.now.to_f)
+    query = {
+      query: prometheus_query,
+      start: start.to_f,
+      end: stop,
+      step: 1.minute.to_i
+    }.to_query
+
+    "https://prometheus.example.com/api/v1/query_range?#{query}"
+  end
+
+  def prometheus_label_values_url(name)
+    "https://prometheus.example.com/api/v1/label/#{name}/values"
+  end
+
+  def prometheus_series_url(*matches, start: 8.hours.ago, stop: Time.now)
+    query = {
+      match: matches,
+      start: start.to_f,
+      end: stop.to_f
+    }.to_query
+    "https://prometheus.example.com/api/v1/series?#{query}"
+  end
+
+  def stub_prometheus_request(url, body: {}, status: 200)
+    WebMock.stub_request(:get, url)
+      .to_return({
+        status: status,
+        headers: { 'Content-Type' => 'application/json' },
+        body: body.to_json
+      })
+  end
+
+  def stub_prometheus_request_with_exception(url, exception_type)
+    WebMock.stub_request(:get, url).to_raise(exception_type)
+  end
+
+  def stub_all_prometheus_requests(environment_slug, body: nil, status: 200)
+    stub_prometheus_request(
+      prometheus_query_with_time_url(prometheus_memory_query(environment_slug), Time.now.utc),
+      status: status,
+      body: body || prometheus_value_body
+    )
+    stub_prometheus_request(
+      prometheus_query_with_time_url(prometheus_memory_query(environment_slug), 8.hours.ago),
+      status: status,
+      body: body || prometheus_value_body
+    )
+    stub_prometheus_request(
+      prometheus_query_range_url(prometheus_memory_query(environment_slug)),
+      status: status,
+      body: body || prometheus_values_body
+    )
+    stub_prometheus_request(
+      prometheus_query_with_time_url(prometheus_cpu_query(environment_slug), Time.now.utc),
+      status: status,
+      body: body || prometheus_value_body
+    )
+    stub_prometheus_request(
+      prometheus_query_with_time_url(prometheus_cpu_query(environment_slug), 8.hours.ago),
+      status: status,
+      body: body || prometheus_value_body
+    )
+    stub_prometheus_request(
+      prometheus_query_range_url(prometheus_cpu_query(environment_slug)),
+      status: status,
+      body: body || prometheus_values_body
+    )
+  end
+
+  def prometheus_data(last_update: Time.now.utc)
+    {
+      success: true,
+      data: {
+        memory_values: prometheus_values_body('matrix').dig(:data, :result),
+        memory_current: prometheus_value_body('vector').dig(:data, :result),
+        cpu_values: prometheus_values_body('matrix').dig(:data, :result),
+        cpu_current: prometheus_value_body('vector').dig(:data, :result)
+      },
+      last_update: last_update
+    }
+  end
+
+  def prometheus_metrics_data(last_update: Time.now.utc)
+    {
+      success: true,
+      metrics: {
+        memory_values: prometheus_values_body('matrix').dig(:data, :result),
+        memory_current: prometheus_value_body('vector').dig(:data, :result),
+        cpu_values: prometheus_values_body('matrix').dig(:data, :result),
+        cpu_current: prometheus_value_body('vector').dig(:data, :result)
+      },
+      last_update: last_update
+    }
+  end
+
+  def prometheus_empty_body(type)
+    {
+      "status": "success",
+      "data": {
+        "resultType": type,
+        "result": []
+      }
+    }
+  end
+
+  def prometheus_value_body(type = 'vector')
+    {
+      "status": "success",
+      "data": {
+        "resultType": type,
+        "result": [
+          {
+            "metric": {},
+            "value": [
+              1488772511.004,
+              "0.000041021495238095323"
+            ]
+          }
+        ]
+      }
+    }
+  end
+
+  def prometheus_values_body(type = 'matrix')
+    {
+      "status": "success",
+      "data": {
+        "resultType": type,
+        "result": [
+          {
+            "metric": {},
+            "values": [
+              [1488758662.506, "0.00002996364761904785"],
+              [1488758722.506, "0.00003090239047619091"]
+            ]
+          }
+        ]
+      }
+    }
+  end
+
+  def prometheus_label_values
+    {
+      'status': 'success',
+      'data': %w(job_adds job_controller_rate_limiter_use job_depth job_queue_latency job_work_duration_sum up)
+    }
+  end
+
+  def prometheus_series(name)
+    {
+      'status': 'success',
+      'data': [
+        {
+          '__name__': name,
+          'container_name': 'gitlab',
+          'environment': 'mattermost',
+          'id': '/docker/9953982f95cf5010dfc59d7864564d5f188aaecddeda343699783009f89db667',
+          'image': 'gitlab/gitlab-ce:8.15.4-ce.1',
+          'instance': 'minikube',
+          'job': 'kubernetes-nodes',
+          'name': 'k8s_gitlab.e6611886_mattermost-4210310111-77z8r_gitlab_2298ae6b-da24-11e6-baee-8e7f67d0eb3a_43536cb6',
+          'namespace': 'gitlab',
+          'pod_name': 'mattermost-4210310111-77z8r'
+        },
+        {
+          '__name__': name,
+          'id': '/docker',
+          'instance': 'minikube',
+          'job': 'kubernetes-nodes'
+        }
+      ]
+    }
+  end
+end
diff --git a/spec/support/helpers/query_recorder.rb b/spec/support/helpers/query_recorder.rb
new file mode 100644
index 00000000000..28536bbef5e
--- /dev/null
+++ b/spec/support/helpers/query_recorder.rb
@@ -0,0 +1,38 @@
+module ActiveRecord
+  class QueryRecorder
+    attr_reader :log, :cached
+
+    def initialize(&block)
+      @log = []
+      @cached = []
+      ActiveSupport::Notifications.subscribed(method(:callback), 'sql.active_record', &block)
+    end
+
+    def show_backtrace(values)
+      Rails.logger.debug("QueryRecorder SQL: #{values[:sql]}")
+      caller.each { |line| Rails.logger.debug("   --> #{line}") }
+    end
+
+    def callback(name, start, finish, message_id, values)
+      show_backtrace(values) if ENV['QUERY_RECORDER_DEBUG']
+
+      if values[:name]&.include?("CACHE")
+        @cached << values[:sql]
+      elsif !values[:name]&.include?("SCHEMA")
+        @log << values[:sql]
+      end
+    end
+
+    def count
+      @log.count
+    end
+
+    def cached_count
+      @cached.count
+    end
+
+    def log_message
+      @log.join("\n\n")
+    end
+  end
+end
diff --git a/spec/support/helpers/quick_actions_helpers.rb b/spec/support/helpers/quick_actions_helpers.rb
new file mode 100644
index 00000000000..361190aa352
--- /dev/null
+++ b/spec/support/helpers/quick_actions_helpers.rb
@@ -0,0 +1,10 @@
+module QuickActionsHelpers
+  def write_note(text)
+    Sidekiq::Testing.fake! do
+      page.within('.js-main-target-form') do
+        fill_in 'note[note]', with: text
+        find('.js-comment-submit-button').click
+      end
+    end
+  end
+end
diff --git a/spec/support/helpers/rake_helpers.rb b/spec/support/helpers/rake_helpers.rb
new file mode 100644
index 00000000000..86bfeed107c
--- /dev/null
+++ b/spec/support/helpers/rake_helpers.rb
@@ -0,0 +1,19 @@
+module RakeHelpers
+  def run_rake_task(task_name, *args)
+    Rake::Task[task_name].reenable
+    Rake.application.invoke_task("#{task_name}[#{args.join(',')}]")
+  end
+
+  def stub_warn_user_is_not_gitlab
+    allow(main_object).to receive(:warn_user_is_not_gitlab)
+  end
+
+  def silence_output
+    allow(main_object).to receive(:puts)
+    allow(main_object).to receive(:print)
+  end
+
+  def main_object
+    @main_object ||= TOPLEVEL_BINDING.eval('self')
+  end
+end
diff --git a/spec/support/helpers/reactive_caching_helpers.rb b/spec/support/helpers/reactive_caching_helpers.rb
new file mode 100644
index 00000000000..e22dd974c6a
--- /dev/null
+++ b/spec/support/helpers/reactive_caching_helpers.rb
@@ -0,0 +1,48 @@
+module ReactiveCachingHelpers
+  def reactive_cache_key(subject, *qualifiers)
+    ([subject.class.reactive_cache_key.call(subject)].flatten + qualifiers).join(':')
+  end
+
+  def alive_reactive_cache_key(subject, *qualifiers)
+    reactive_cache_key(subject, *(qualifiers + ['alive']))
+  end
+
+  def stub_reactive_cache(subject = nil, data = nil, *qualifiers)
+    allow(ReactiveCachingWorker).to receive(:perform_async)
+    allow(ReactiveCachingWorker).to receive(:perform_in)
+    write_reactive_cache(subject, data, *qualifiers) if data
+  end
+
+  def synchronous_reactive_cache(subject)
+    allow(service).to receive(:with_reactive_cache) do |*args, &block|
+      block.call(service.calculate_reactive_cache(*args))
+    end
+  end
+
+  def read_reactive_cache(subject, *qualifiers)
+    Rails.cache.read(reactive_cache_key(subject, *qualifiers))
+  end
+
+  def write_reactive_cache(subject, data, *qualifiers)
+    start_reactive_cache_lifetime(subject, *qualifiers)
+    Rails.cache.write(reactive_cache_key(subject, *qualifiers), data)
+  end
+
+  def reactive_cache_alive?(subject, *qualifiers)
+    Rails.cache.read(alive_reactive_cache_key(subject, *qualifiers))
+  end
+
+  def invalidate_reactive_cache(subject, *qualifiers)
+    Rails.cache.delete(alive_reactive_cache_key(subject, *qualifiers))
+  end
+
+  def start_reactive_cache_lifetime(subject, *qualifiers)
+    Rails.cache.write(alive_reactive_cache_key(subject, *qualifiers), true)
+  end
+
+  def expect_reactive_cache_update_queued(subject)
+    expect(ReactiveCachingWorker)
+      .to receive(:perform_in)
+      .with(subject.class.reactive_cache_refresh_interval, subject.class, subject.id)
+  end
+end
diff --git a/spec/support/helpers/redis_without_keys.rb b/spec/support/helpers/redis_without_keys.rb
new file mode 100644
index 00000000000..6220167dee6
--- /dev/null
+++ b/spec/support/helpers/redis_without_keys.rb
@@ -0,0 +1,8 @@
+class Redis
+  ForbiddenCommand = Class.new(StandardError)
+
+  def keys(*args)
+    raise ForbiddenCommand.new("Don't use `Redis#keys` as it iterates over all "\
+                               "keys in redis. Use `Redis#scan_each` instead.")
+  end
+end
diff --git a/spec/support/helpers/reference_parser_helpers.rb b/spec/support/helpers/reference_parser_helpers.rb
new file mode 100644
index 00000000000..c01897ed1a1
--- /dev/null
+++ b/spec/support/helpers/reference_parser_helpers.rb
@@ -0,0 +1,39 @@
+module ReferenceParserHelpers
+  def empty_html_link
+    Nokogiri::HTML.fragment('<a></a>').children[0]
+  end
+
+  shared_examples 'no N+1 queries' do
+    it 'avoids N+1 queries in #nodes_visible_to_user', :request_store do
+      context = Banzai::RenderContext.new(project, user)
+
+      record_queries = lambda do |links|
+        ActiveRecord::QueryRecorder.new do
+          described_class.new(context).nodes_visible_to_user(user, links)
+        end
+      end
+
+      control = record_queries.call(control_links)
+      actual = record_queries.call(actual_links)
+
+      expect(actual.count).to be <= control.count
+      expect(actual.cached_count).to be <= control.cached_count
+    end
+
+    it 'avoids N+1 queries in #records_for_nodes', :request_store do
+      context = Banzai::RenderContext.new(project, user)
+
+      record_queries = lambda do |links|
+        ActiveRecord::QueryRecorder.new do
+          described_class.new(context).records_for_nodes(links)
+        end
+      end
+
+      control = record_queries.call(control_links)
+      actual = record_queries.call(actual_links)
+
+      expect(actual.count).to be <= control.count
+      expect(actual.cached_count).to be <= control.cached_count
+    end
+  end
+end
diff --git a/spec/support/helpers/repo_helpers.rb b/spec/support/helpers/repo_helpers.rb
new file mode 100644
index 00000000000..3c6956cf5e0
--- /dev/null
+++ b/spec/support/helpers/repo_helpers.rb
@@ -0,0 +1,118 @@
+module RepoHelpers
+  extend self
+
+  # Text file in repo
+  #
+  # Ex.
+  #
+  #   # Get object
+  #   blob = RepoHelpers.text_blob
+  #
+  #   blob.path # => 'files/js/commit.js.coffee'
+  #   blob.data # => 'class Commit...'
+  #
+  def sample_blob
+    OpenStruct.new(
+      oid: '5f53439ca4b009096571d3c8bc3d09d30e7431b3',
+      path: "files/js/commit.js.coffee",
+      data: <<eos
+class Commit
+  constructor: ->
+    $('.files .diff-file').each ->
+      new CommitFile(this)
+
+@Commit = Commit
+eos
+    )
+  end
+
+  def sample_commit
+    OpenStruct.new(
+      id: "570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
+      parent_id: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9',
+      author_full_name: "Dmitriy Zaporozhets",
+      author_email: "dmitriy.zaporozhets@gmail.com",
+      files_changed_count: 2,
+      line_code: '2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_14',
+      line_code_path: 'files/ruby/popen.rb',
+      del_line_code: '2f6fcd96b88b36ce98c38da085c795a27d92a3dd_13_13',
+      message: <<eos
+Change some files
+Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
+eos
+    )
+  end
+
+  def another_sample_commit
+    OpenStruct.new(
+      id: "e56497bb5f03a90a51293fc6d516788730953899",
+      parent_id: '4cd80ccab63c82b4bad16faa5193fbd2aa06df40',
+      author_full_name: "Sytse Sijbrandij",
+      author_email: "sytse@gitlab.com",
+      files_changed_count: 1,
+      message: <<eos
+Add directory structure for tree_helper spec
+
+This directory structure is needed for a testing the method flatten_tree(tree) in the TreeHelper module
+
+See [merge request #275](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/275#note_732774)
+
+See merge request !2
+eos
+    )
+  end
+
+  def sample_big_commit
+    OpenStruct.new(
+      id: "913c66a37b4a45b9769037c55c2d238bd0942d2e",
+      author_full_name: "Dmitriy Zaporozhets",
+      author_email: "dmitriy.zaporozhets@gmail.com",
+      message: <<eos
+Files, encoding and much more
+Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
+eos
+    )
+  end
+
+  def sample_image_commit
+    OpenStruct.new(
+      id: "2f63565e7aac07bcdadb654e253078b727143ec4",
+      author_full_name: "Dmitriy Zaporozhets",
+      author_email: "dmitriy.zaporozhets@gmail.com",
+      old_blob_id: '33f3729a45c02fc67d00adb1b8bca394b0e761d9',
+      new_blob_id: '2f63565e7aac07bcdadb654e253078b727143ec4',
+      message: <<eos
+Modified image
+Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
+eos
+    )
+  end
+
+  def sample_compare
+    changes = [
+      {
+        line_code: 'a5cc2925ca8258af241be7e5b0381edf30266302_20_20',
+        file_path: '.gitignore'
+      },
+      {
+        line_code: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44_4_6',
+        file_path: '.gitmodules'
+      }
+    ]
+
+    commits = %w(
+      5937ac0a7beb003549fc5fd26fc247adbce4a52e
+      570e7b2abdd848b95f2f578043fc23bd6f6fd24d
+      6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
+      d14d6c0abdd253381df51a723d58691b2ee1ab08
+      c1acaa58bbcbc3eafe538cb8274ba387047b69f8
+    ).reverse # last commit is recent one
+
+    OpenStruct.new(
+      source_branch: 'master',
+      target_branch: 'feature',
+      changes: changes,
+      commits: commits
+    )
+  end
+end
diff --git a/spec/support/helpers/search_helpers.rb b/spec/support/helpers/search_helpers.rb
new file mode 100644
index 00000000000..abbbb636d66
--- /dev/null
+++ b/spec/support/helpers/search_helpers.rb
@@ -0,0 +1,5 @@
+module SearchHelpers
+  def select_filter(name)
+    find(:xpath, "//ul[contains(@class, 'search-filter')]//a[contains(.,'#{name}')]").click
+  end
+end
diff --git a/spec/support/helpers/seed_helper.rb b/spec/support/helpers/seed_helper.rb
new file mode 100644
index 00000000000..8fd107260cc
--- /dev/null
+++ b/spec/support/helpers/seed_helper.rb
@@ -0,0 +1,110 @@
+require_relative 'test_env'
+
+# This file is specific to specs in spec/lib/gitlab/git/
+
+SEED_STORAGE_PATH      = TestEnv.repos_path
+TEST_REPO_PATH         = 'gitlab-git-test.git'.freeze
+TEST_NORMAL_REPO_PATH  = 'not-bare-repo.git'.freeze
+TEST_MUTABLE_REPO_PATH = 'mutable-repo.git'.freeze
+TEST_BROKEN_REPO_PATH  = 'broken-repo.git'.freeze
+
+module SeedHelper
+  GITLAB_GIT_TEST_REPO_URL = File.expand_path('../gitlab-git-test.git', __dir__).freeze
+
+  def ensure_seeds
+    if File.exist?(SEED_STORAGE_PATH)
+      FileUtils.rm_r(SEED_STORAGE_PATH)
+    end
+
+    FileUtils.mkdir_p(SEED_STORAGE_PATH)
+
+    create_bare_seeds
+    create_normal_seeds
+    create_mutable_seeds
+    create_broken_seeds
+    create_git_attributes
+    create_invalid_git_attributes
+  end
+
+  def create_bare_seeds
+    system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{GITLAB_GIT_TEST_REPO_URL}),
+           chdir: SEED_STORAGE_PATH,
+           out:   '/dev/null',
+           err:   '/dev/null')
+  end
+
+  def create_normal_seeds
+    system(git_env, *%W(#{Gitlab.config.git.bin_path} clone #{TEST_REPO_PATH} #{TEST_NORMAL_REPO_PATH}),
+           chdir: SEED_STORAGE_PATH,
+           out: '/dev/null',
+           err: '/dev/null')
+  end
+
+  def create_mutable_seeds
+    system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{TEST_REPO_PATH} #{TEST_MUTABLE_REPO_PATH}),
+           chdir: SEED_STORAGE_PATH,
+           out: '/dev/null',
+           err: '/dev/null')
+
+    mutable_repo_full_path = File.join(SEED_STORAGE_PATH, TEST_MUTABLE_REPO_PATH)
+    system(git_env, *%W(#{Gitlab.config.git.bin_path} branch -t feature origin/feature),
+           chdir: mutable_repo_full_path, out: '/dev/null', err: '/dev/null')
+
+    system(git_env, *%W(#{Gitlab.config.git.bin_path} remote add expendable #{GITLAB_GIT_TEST_REPO_URL}),
+           chdir: mutable_repo_full_path, out: '/dev/null', err: '/dev/null')
+  end
+
+  def create_broken_seeds
+    system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{TEST_REPO_PATH} #{TEST_BROKEN_REPO_PATH}),
+           chdir: SEED_STORAGE_PATH,
+           out: '/dev/null',
+           err: '/dev/null')
+
+    refs_path = File.join(SEED_STORAGE_PATH, TEST_BROKEN_REPO_PATH, 'refs')
+
+    FileUtils.rm_r(refs_path)
+  end
+
+  def create_git_attributes
+    dir = File.join(SEED_STORAGE_PATH, 'with-git-attributes.git', 'info')
+
+    FileUtils.mkdir_p(dir)
+
+    File.open(File.join(dir, 'attributes'), 'w') do |handle|
+      handle.write <<-EOF.strip
+# This is a comment, it should be ignored.
+
+*.txt     text
+*.jpg     -text
+*.sh      eol=lf gitlab-language=shell
+*.haml.*  gitlab-language=haml
+foo/bar.* foo
+*.cgi     key=value?p1=v1&p2=v2
+/*.png    gitlab-language=png
+*.binary  binary
+
+# This uses a tab instead of spaces to ensure the parser also supports this.
+*.md\tgitlab-language=markdown
+bla/bla.txt
+      EOF
+    end
+  end
+
+  def create_invalid_git_attributes
+    dir = File.join(SEED_STORAGE_PATH, 'with-invalid-git-attributes.git', 'info')
+
+    FileUtils.mkdir_p(dir)
+
+    enc = Encoding::UTF_16
+
+    File.open(File.join(dir, 'attributes'), 'w', encoding: enc) do |handle|
+      handle.write('# hello'.encode(enc))
+    end
+  end
+
+  # Prevent developer git configurations from being persisted to test
+  # repositories
+  def git_env
+    { 'GIT_TEMPLATE_DIR' => '' }
+  end
+end
diff --git a/spec/support/helpers/seed_repo.rb b/spec/support/helpers/seed_repo.rb
new file mode 100644
index 00000000000..b4868e82cd7
--- /dev/null
+++ b/spec/support/helpers/seed_repo.rb
@@ -0,0 +1,153 @@
+# This file is generated by generate-seed-repo-rb. Do not edit this file manually.
+#
+# Seed repo:
+# 4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 Merge branch 'master' into 'master'
+# 0e1b353b348f8477bdbec1ef47087171c5032cd9 adds an executable with different permissions
+# 0e50ec4d3c7ce42ab74dda1d422cb2cbffe1e326 Merge branch 'lfs_pointers' into 'master'
+# 33bcff41c232a11727ac6d660bd4b0c2ba86d63d Add valid and invalid lfs pointers
+# 732401c65e924df81435deb12891ef570167d2e2 Update year in license file
+# b0e52af38d7ea43cf41d8a6f2471351ac036d6c9 Empty commit
+# 40f4a7a617393735a95a0bb67b08385bc1e7c66d Add ISO-8859-encoded file
+# 66028349a123e695b589e09a36634d976edcc5e8 Merge branch 'add-comments-to-gitmodules' into 'master'
+# de5714f34c4e34f1d50b9a61a2e6c9132fe2b5fd Add comments to the end of .gitmodules to test parsing
+# fa1b1e6c004a68b7d8763b86455da9e6b23e36d6 Merge branch 'add-files' into 'master'
+# eb49186cfa5c4338011f5f590fac11bd66c5c631 Add submodules nested deeper than the root
+# 18d9c205d0d22fdf62bc2f899443b83aafbf941f Add executables and links files
+# 5937ac0a7beb003549fc5fd26fc247adbce4a52e Add submodule from gitlab.com
+# 570e7b2abdd848b95f2f578043fc23bd6f6fd24d Change some files
+# 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 More submodules
+# d14d6c0abdd253381df51a723d58691b2ee1ab08 Remove ds_store files
+# c1acaa58bbcbc3eafe538cb8274ba387047b69f8 Ignore DS files
+# ae73cb07c9eeaf35924a10f713b364d32b2dd34f Binary file added
+# 874797c3a73b60d2187ed6e2fcabd289ff75171e Ruby files modified
+# 2f63565e7aac07bcdadb654e253078b727143ec4 Modified image
+# 33f3729a45c02fc67d00adb1b8bca394b0e761d9 Image added
+# 913c66a37b4a45b9769037c55c2d238bd0942d2e Files, encoding and much more
+# cfe32cf61b73a0d5e9f13e774abde7ff789b1660 Add submodule
+# 6d394385cf567f80a8fd85055db1ab4c5295806f Added contributing guide
+# 1a0b36b3cdad1d2ee32457c102a8c0b7056fa863 Initial commit
+
+module SeedRepo
+  module BigCommit
+    ID               = "913c66a37b4a45b9769037c55c2d238bd0942d2e".freeze
+    PARENT_ID        = "cfe32cf61b73a0d5e9f13e774abde7ff789b1660".freeze
+    MESSAGE          = "Files, encoding and much more".freeze
+    AUTHOR_FULL_NAME = "Dmitriy Zaporozhets".freeze
+    FILES_COUNT      = 2
+  end
+
+  module Commit
+    ID               = "570e7b2abdd848b95f2f578043fc23bd6f6fd24d".freeze
+    PARENT_ID        = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9".freeze
+    MESSAGE          = "Change some files\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n".freeze
+    AUTHOR_FULL_NAME = "Dmitriy Zaporozhets".freeze
+    FILES            = ["files/ruby/popen.rb", "files/ruby/regex.rb"].freeze
+    FILES_COUNT      = 2
+    C_FILE_PATH      = "files/ruby".freeze
+    C_FILES          = ["popen.rb", "regex.rb", "version_info.rb"].freeze
+    BLOB_FILE        = %{%h3= @key.title\n%hr\n%pre= @key.key\n.actions\n  = link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => \"btn danger delete-key\"\n\n\n}.freeze
+    BLOB_FILE_PATH   = "app/views/keys/show.html.haml".freeze
+  end
+
+  module EmptyCommit
+    ID               = "b0e52af38d7ea43cf41d8a6f2471351ac036d6c9".freeze
+    PARENT_ID        = "40f4a7a617393735a95a0bb67b08385bc1e7c66d".freeze
+    MESSAGE          = "Empty commit".freeze
+    AUTHOR_FULL_NAME = "Rémy Coutable".freeze
+    FILES            = [].freeze
+    FILES_COUNT      = FILES.count
+  end
+
+  module EncodingCommit
+    ID               = "40f4a7a617393735a95a0bb67b08385bc1e7c66d".freeze
+    PARENT_ID        = "66028349a123e695b589e09a36634d976edcc5e8".freeze
+    MESSAGE          = "Add ISO-8859-encoded file".freeze
+    AUTHOR_FULL_NAME = "Stan Hu".freeze
+    FILES            = ["encoding/iso8859.txt"].freeze
+    FILES_COUNT      = FILES.count
+  end
+
+  module FirstCommit
+    ID               = "1a0b36b3cdad1d2ee32457c102a8c0b7056fa863".freeze
+    PARENT_ID        = nil
+    MESSAGE          = "Initial commit".freeze
+    AUTHOR_FULL_NAME = "Dmitriy Zaporozhets".freeze
+    FILES            = ["LICENSE", ".gitignore", "README.md"].freeze
+    FILES_COUNT      = 3
+  end
+
+  module LastCommit
+    ID               = "4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6".freeze
+    PARENT_ID        = "0e1b353b348f8477bdbec1ef47087171c5032cd9".freeze
+    MESSAGE          = "Merge branch 'master' into 'master'".freeze
+    AUTHOR_FULL_NAME = "Stan Hu".freeze
+    FILES            = ["bin/executable"].freeze
+    FILES_COUNT      = FILES.count
+  end
+
+  module Repo
+    HEAD = "master".freeze
+    BRANCHES = %w[
+      feature
+      fix
+      fix-blob-path
+      fix-existing-submodule-dir
+      fix-mode
+      gitattributes
+      gitattributes-updated
+      master
+      merge-test
+      missing-gitmodules
+    ].freeze
+    TAGS = %w[
+      v1.0.0
+      v1.1.0
+      v1.2.0
+      v1.2.1
+    ].freeze
+  end
+
+  module RubyBlob
+    ID = "7e3e39ebb9b2bf433b4ad17313770fbe4051649c".freeze
+    NAME = "popen.rb".freeze
+    CONTENT = <<-eos.freeze
+require 'fileutils'
+require 'open3'
+
+module Popen
+  extend self
+
+  def popen(cmd, path=nil)
+    unless cmd.is_a?(Array)
+      raise RuntimeError, "System commands must be given as an array of strings"
+    end
+
+    path ||= Dir.pwd
+
+    vars = {
+      "PWD" => path
+    }
+
+    options = {
+      chdir: path
+    }
+
+    unless File.directory?(path)
+      FileUtils.mkdir_p(path)
+    end
+
+    @cmd_output = ""
+    @cmd_status = 0
+
+    Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
+      @cmd_output << stdout.read
+      @cmd_output << stderr.read
+      @cmd_status = wait_thr.value.exitstatus
+    end
+
+    return @cmd_output, @cmd_status
+  end
+end
+    eos
+  end
+end
diff --git a/spec/support/helpers/select2_helper.rb b/spec/support/helpers/select2_helper.rb
new file mode 100644
index 00000000000..90618ba5b19
--- /dev/null
+++ b/spec/support/helpers/select2_helper.rb
@@ -0,0 +1,35 @@
+# Select2 ajax programmatic helper
+# It allows you to select value from select2
+#
+# Params
+#   value - real value of selected item
+#   opts - options containing css selector
+#
+# Usage:
+#
+#   select2(2, from: '#user_ids')
+#
+
+module Select2Helper
+  def select2(value, options = {})
+    raise ArgumentError, 'options must be a Hash' unless options.is_a?(Hash)
+
+    selector = options.fetch(:from)
+
+    first(selector, visible: false)
+
+    if options[:multiple]
+      execute_script("$('#{selector}').select2('val', ['#{value}']).trigger('change');")
+    else
+      execute_script("$('#{selector}').select2('val', '#{value}').trigger('change');")
+    end
+  end
+
+  def open_select2(selector)
+    execute_script("$('#{selector}').select2('open');")
+  end
+
+  def scroll_select2_to_bottom(selector)
+    evaluate_script "$('#{selector}').scrollTop($('#{selector}')[0].scrollHeight); $('#{selector}');"
+  end
+end
diff --git a/spec/support/helpers/selection_helper.rb b/spec/support/helpers/selection_helper.rb
new file mode 100644
index 00000000000..b4725b137b2
--- /dev/null
+++ b/spec/support/helpers/selection_helper.rb
@@ -0,0 +1,6 @@
+module SelectionHelper
+  def select_element(selector)
+    find(selector)
+    execute_script("let range = document.createRange(); let sel = window.getSelection(); range.selectNodeContents(document.querySelector('#{selector}')); sel.addRange(range);")
+  end
+end
diff --git a/spec/support/helpers/sorting_helper.rb b/spec/support/helpers/sorting_helper.rb
new file mode 100644
index 00000000000..577518d726c
--- /dev/null
+++ b/spec/support/helpers/sorting_helper.rb
@@ -0,0 +1,18 @@
+# Helper allows you to sort items
+#
+# Params
+#   value - value for sorting
+#
+# Usage:
+#   include SortingHelper
+#
+#   sorting_by('Oldest updated')
+#
+module SortingHelper
+  def sorting_by(value)
+    find('button.dropdown-toggle').click
+    page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
+      click_link value
+    end
+  end
+end
diff --git a/spec/support/helpers/stub_configuration.rb b/spec/support/helpers/stub_configuration.rb
new file mode 100644
index 00000000000..1823099dd9c
--- /dev/null
+++ b/spec/support/helpers/stub_configuration.rb
@@ -0,0 +1,102 @@
+require 'active_support/core_ext/hash/transform_values'
+require 'active_support/hash_with_indifferent_access'
+
+module StubConfiguration
+  def stub_application_setting(messages)
+    add_predicates(messages)
+
+    # Stubbing both of these because we're not yet consistent with how we access
+    # current application settings
+    allow_any_instance_of(ApplicationSetting).to receive_messages(to_settings(messages))
+    allow(Gitlab::CurrentSettings.current_application_settings)
+      .to receive_messages(to_settings(messages))
+
+    # Ensure that we don't use the Markdown cache when stubbing these values
+    allow_any_instance_of(ApplicationSetting).to receive(:cached_html_up_to_date?).and_return(false)
+  end
+
+  def stub_not_protect_default_branch
+    stub_application_setting(
+      default_branch_protection: Gitlab::Access::PROTECTION_NONE)
+  end
+
+  def stub_config_setting(messages)
+    allow(Gitlab.config.gitlab).to receive_messages(to_settings(messages))
+  end
+
+  def stub_gravatar_setting(messages)
+    allow(Gitlab.config.gravatar).to receive_messages(to_settings(messages))
+  end
+
+  def stub_incoming_email_setting(messages)
+    allow(Gitlab.config.incoming_email).to receive_messages(to_settings(messages))
+  end
+
+  def stub_mattermost_setting(messages)
+    allow(Gitlab.config.mattermost).to receive_messages(to_settings(messages))
+  end
+
+  def stub_omniauth_setting(messages)
+    allow(Gitlab.config.omniauth).to receive_messages(to_settings(messages))
+  end
+
+  def stub_backup_setting(messages)
+    allow(Gitlab.config.backup).to receive_messages(to_settings(messages))
+  end
+
+  def stub_lfs_setting(messages)
+    allow(Gitlab.config.lfs).to receive_messages(to_settings(messages))
+  end
+
+  def stub_artifacts_setting(messages)
+    allow(Gitlab.config.artifacts).to receive_messages(to_settings(messages))
+  end
+
+  def stub_storage_settings(messages)
+    messages.deep_stringify_keys!
+
+    # Default storage is always required
+    messages['default'] ||= Gitlab.config.repositories.storages.default
+    messages.each do |storage_name, storage_hash|
+      if !storage_hash.key?('path') || storage_hash['path'] == Gitlab::GitalyClient::StorageSettings::Deprecated
+        storage_hash['path'] = TestEnv.repos_path
+      end
+
+      messages[storage_name] = Gitlab::GitalyClient::StorageSettings.new(storage_hash.to_h)
+    end
+
+    allow(Gitlab.config.repositories).to receive(:storages).and_return(Settingslogic.new(messages))
+  end
+
+  private
+
+  # Modifies stubbed messages to also stub possible predicate versions
+  #
+  # Examples:
+  #
+  #   add_predicates(foo: true)
+  #   # => {foo: true, foo?: true}
+  #
+  #   add_predicates(signup_enabled?: false)
+  #   # => {signup_enabled? false}
+  def add_predicates(messages)
+    # Only modify keys that aren't already predicates
+    keys = messages.keys.map(&:to_s).reject { |k| k.end_with?('?') }
+
+    keys.each do |key|
+      predicate = key + '?'
+      messages[predicate.to_sym] = messages[key.to_sym]
+    end
+  end
+
+  # Support nested hashes by converting all values into Settingslogic objects
+  def to_settings(hash)
+    hash.transform_values do |value|
+      if value.is_a? Hash
+        Settingslogic.new(value.deep_stringify_keys)
+      else
+        value
+      end
+    end
+  end
+end
diff --git a/spec/support/helpers/stub_env.rb b/spec/support/helpers/stub_env.rb
new file mode 100644
index 00000000000..36b90fc68d6
--- /dev/null
+++ b/spec/support/helpers/stub_env.rb
@@ -0,0 +1,36 @@
+# Inspired by https://github.com/ljkbennett/stub_env/blob/master/lib/stub_env/helpers.rb
+module StubENV
+  def stub_env(key_or_hash, value = nil)
+    init_stub unless env_stubbed?
+
+    if key_or_hash.is_a? Hash
+      key_or_hash.each { |k, v| add_stubbed_value(k, v) }
+    else
+      add_stubbed_value key_or_hash, value
+    end
+  end
+
+  private
+
+  STUBBED_KEY = '__STUBBED__'.freeze
+
+  def add_stubbed_value(key, value)
+    allow(ENV).to receive(:[]).with(key).and_return(value)
+    allow(ENV).to receive(:key?).with(key).and_return(true)
+    allow(ENV).to receive(:fetch).with(key).and_return(value)
+    allow(ENV).to receive(:fetch).with(key, anything()) do |_, default_val|
+      value || default_val
+    end
+  end
+
+  def env_stubbed?
+    ENV[STUBBED_KEY]
+  end
+
+  def init_stub
+    allow(ENV).to receive(:[]).and_call_original
+    allow(ENV).to receive(:key?).and_call_original
+    allow(ENV).to receive(:fetch).and_call_original
+    add_stubbed_value(STUBBED_KEY, true)
+  end
+end
diff --git a/spec/support/helpers/stub_feature_flags.rb b/spec/support/helpers/stub_feature_flags.rb
new file mode 100644
index 00000000000..b96338bf548
--- /dev/null
+++ b/spec/support/helpers/stub_feature_flags.rb
@@ -0,0 +1,8 @@
+module StubFeatureFlags
+  def stub_feature_flags(features)
+    features.each do |feature_name, enabled|
+      allow(Feature).to receive(:enabled?).with(feature_name) { enabled }
+      allow(Feature).to receive(:enabled?).with(feature_name.to_s) { enabled }
+    end
+  end
+end
diff --git a/spec/support/helpers/stub_gitlab_calls.rb b/spec/support/helpers/stub_gitlab_calls.rb
new file mode 100644
index 00000000000..c1618f5086c
--- /dev/null
+++ b/spec/support/helpers/stub_gitlab_calls.rb
@@ -0,0 +1,129 @@
+module StubGitlabCalls
+  def stub_gitlab_calls
+    stub_session
+    stub_user
+    stub_project_8
+    stub_project_8_hooks
+    stub_projects
+    stub_projects_owned
+    stub_ci_enable
+  end
+
+  def stub_js_gitlab_calls
+    allow_any_instance_of(Network).to receive(:projects) { project_hash_array }
+  end
+
+  def stub_ci_pipeline_to_return_yaml_file
+    stub_ci_pipeline_yaml_file(gitlab_ci_yaml)
+  end
+
+  def stub_ci_pipeline_yaml_file(ci_yaml)
+    allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file) { ci_yaml }
+  end
+
+  def stub_repository_ci_yaml_file(sha:, path: '.gitlab-ci.yml')
+    allow_any_instance_of(Repository)
+      .to receive(:gitlab_ci_yml_for).with(sha, path)
+      .and_return(gitlab_ci_yaml)
+  end
+
+  def stub_ci_builds_disabled
+    allow_any_instance_of(Project).to receive(:builds_enabled?).and_return(false)
+  end
+
+  def stub_container_registry_config(registry_settings)
+    allow(Gitlab.config.registry).to receive_messages(registry_settings)
+    allow(Auth::ContainerRegistryAuthenticationService)
+      .to receive(:full_access_token).and_return('token')
+  end
+
+  def stub_container_registry_tags(repository: :any, tags:)
+    repository = any_args if repository == :any
+
+    allow_any_instance_of(ContainerRegistry::Client)
+      .to receive(:repository_tags).with(repository)
+      .and_return({ 'tags' => tags })
+
+    allow_any_instance_of(ContainerRegistry::Client)
+      .to receive(:repository_manifest).with(repository, anything)
+      .and_return(stub_container_registry_tag_manifest)
+
+    allow_any_instance_of(ContainerRegistry::Client)
+      .to receive(:blob).with(repository, anything, 'application/octet-stream')
+      .and_return(stub_container_registry_blob)
+  end
+
+  private
+
+  def stub_container_registry_tag_manifest
+    fixture_path = 'spec/fixtures/container_registry/tag_manifest.json'
+
+    JSON.parse(File.read(Rails.root + fixture_path))
+  end
+
+  def stub_container_registry_blob
+    fixture_path = 'spec/fixtures/container_registry/config_blob.json'
+
+    File.read(Rails.root + fixture_path)
+  end
+
+  def gitlab_url
+    Gitlab.config.gitlab.url
+  end
+
+  def stub_session
+    f = File.read(Rails.root.join('spec/support/gitlab_stubs/session.json'))
+
+    stub_request(:post, "#{gitlab_url}api/v3/session.json")
+      .with(body: "{\"email\":\"test@test.com\",\"password\":\"123456\"}",
+            headers: { 'Content-Type' => 'application/json' })
+      .to_return(status: 201, body: f, headers: { 'Content-Type' => 'application/json' })
+  end
+
+  def stub_user
+    f = File.read(Rails.root.join('spec/support/gitlab_stubs/user.json'))
+
+    stub_request(:get, "#{gitlab_url}api/v3/user?private_token=Wvjy2Krpb7y8xi93owUz")
+      .with(headers: { 'Content-Type' => 'application/json' })
+      .to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
+
+    stub_request(:get, "#{gitlab_url}api/v3/user?access_token=some_token")
+      .with(headers: { 'Content-Type' => 'application/json' })
+      .to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
+  end
+
+  def stub_project_8
+    data = File.read(Rails.root.join('spec/support/gitlab_stubs/project_8.json'))
+    allow_any_instance_of(Network).to receive(:project).and_return(JSON.parse(data))
+  end
+
+  def stub_project_8_hooks
+    data = File.read(Rails.root.join('spec/support/gitlab_stubs/project_8_hooks.json'))
+    allow_any_instance_of(Network).to receive(:project_hooks).and_return(JSON.parse(data))
+  end
+
+  def stub_projects
+    f = File.read(Rails.root.join('spec/support/gitlab_stubs/projects.json'))
+
+    stub_request(:get, "#{gitlab_url}api/v3/projects.json?archived=false&ci_enabled_first=true&private_token=Wvjy2Krpb7y8xi93owUz")
+      .with(headers: { 'Content-Type' => 'application/json' })
+      .to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
+  end
+
+  def stub_projects_owned
+    stub_request(:get, "#{gitlab_url}api/v3/projects/owned.json?archived=false&ci_enabled_first=true&private_token=Wvjy2Krpb7y8xi93owUz")
+      .with(headers: { 'Content-Type' => 'application/json' })
+      .to_return(status: 200, body: "", headers: {})
+  end
+
+  def stub_ci_enable
+    stub_request(:put, "#{gitlab_url}api/v3/projects/2/services/gitlab-ci.json?private_token=Wvjy2Krpb7y8xi93owUz")
+      .with(headers: { 'Content-Type' => 'application/json' })
+      .to_return(status: 200, body: "", headers: {})
+  end
+
+  def project_hash_array
+    f = File.read(Rails.root.join('spec/support/gitlab_stubs/projects.json'))
+    JSON.parse f
+  end
+end
diff --git a/spec/support/helpers/stub_gitlab_data.rb b/spec/support/helpers/stub_gitlab_data.rb
new file mode 100644
index 00000000000..fa402f35b95
--- /dev/null
+++ b/spec/support/helpers/stub_gitlab_data.rb
@@ -0,0 +1,5 @@
+module StubGitlabData
+  def gitlab_ci_yaml
+    File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
+  end
+end
diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb
new file mode 100644
index 00000000000..19d744b959a
--- /dev/null
+++ b/spec/support/helpers/stub_object_storage.rb
@@ -0,0 +1,48 @@
+module StubObjectStorage
+  def stub_object_storage_uploader(
+        config:,
+        uploader:,
+        remote_directory:,
+        enabled: true,
+        proxy_download: false,
+        background_upload: false,
+        direct_upload: false
+  )
+    allow(config).to receive(:enabled) { enabled }
+    allow(config).to receive(:proxy_download) { proxy_download }
+    allow(config).to receive(:background_upload) { background_upload }
+    allow(config).to receive(:direct_upload) { direct_upload }
+
+    return unless enabled
+
+    Fog.mock!
+
+    ::Fog::Storage.new(uploader.object_store_credentials).tap do |connection|
+      begin
+        connection.directories.create(key: remote_directory)
+      rescue Excon::Error::Conflict
+      end
+    end
+  end
+
+  def stub_artifacts_object_storage(**params)
+    stub_object_storage_uploader(config: Gitlab.config.artifacts.object_store,
+                                 uploader: JobArtifactUploader,
+                                 remote_directory: 'artifacts',
+                                 **params)
+  end
+
+  def stub_lfs_object_storage(**params)
+    stub_object_storage_uploader(config: Gitlab.config.lfs.object_store,
+                                 uploader: LfsObjectUploader,
+                                 remote_directory: 'lfs-objects',
+                                 **params)
+  end
+
+  def stub_uploads_object_storage(uploader = described_class, **params)
+    stub_object_storage_uploader(config: Gitlab.config.uploads.object_store,
+                                 uploader: uploader,
+                                 remote_directory: 'uploads',
+                                 **params)
+  end
+end
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
new file mode 100644
index 00000000000..d87f265cdf0
--- /dev/null
+++ b/spec/support/helpers/test_env.rb
@@ -0,0 +1,366 @@
+require 'rspec/mocks'
+require 'toml-rb'
+
+module TestEnv
+  extend self
+
+  ComponentFailedToInstallError = Class.new(StandardError)
+
+  # When developing the seed repository, comment out the branch you will modify.
+  BRANCH_SHA = {
+    'signed-commits'                     => '2d1096e',
+    'not-merged-branch'                  => 'b83d6e3',
+    'branch-merged'                      => '498214d',
+    'empty-branch'                       => '7efb185',
+    'ends-with.json'                     => '98b0d8b',
+    'flatten-dir'                        => 'e56497b',
+    'feature'                            => '0b4bc9a',
+    'feature_conflict'                   => 'bb5206f',
+    'fix'                                => '48f0be4',
+    'improve/awesome'                    => '5937ac0',
+    'merged-target'                      => '21751bf',
+    'markdown'                           => '0ed8c6c',
+    'lfs'                                => '55bc176',
+    'master'                             => 'b83d6e3',
+    'merge-test'                         => '5937ac0',
+    "'test'"                             => 'e56497b',
+    'orphaned-branch'                    => '45127a9',
+    'binary-encoding'                    => '7b1cf43',
+    'gitattributes'                      => '5a62481',
+    'expand-collapse-diffs'              => '4842455',
+    'symlink-expand-diff'                => '81e6355',
+    'expand-collapse-files'              => '025db92',
+    'expand-collapse-lines'              => '238e82d',
+    'video'                              => '8879059',
+    'add-balsamiq-file'                  => 'b89b56d',
+    'crlf-diff'                          => '5938907',
+    'conflict-start'                     => '824be60',
+    'conflict-resolvable'                => '1450cd6',
+    'conflict-binary-file'               => '259a6fb',
+    'conflict-contains-conflict-markers' => '78a3086',
+    'conflict-missing-side'              => 'eb227b3',
+    'conflict-non-utf8'                  => 'd0a293c',
+    'conflict-too-large'                 => '39fa04f',
+    'deleted-image-test'                 => '6c17798',
+    'wip'                                => 'b9238ee',
+    'csv'                                => '3dd0896',
+    'v1.1.0'                             => 'b83d6e3',
+    'add-ipython-files'                  => '93ee732',
+    'add-pdf-file'                       => 'e774ebd',
+    'add-pdf-text-binary'                => '79faa7b',
+    'add_images_and_changes'             => '010d106'
+  }.freeze
+
+  # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
+  # need to keep all the branches in sync.
+  # We currently only need a subset of the branches
+  FORKED_BRANCH_SHA = {
+    'add-submodule-version-bump' => '3f547c0',
+    'master'                     => '5937ac0',
+    'remove-submodule'           => '2a33e0c',
+    'conflict-resolvable-fork'   => '404fa3f'
+  }.freeze
+
+  TMP_TEST_PATH = Rails.root.join('tmp', 'tests', '**')
+  REPOS_STORAGE = 'default'.freeze
+
+  # Test environment
+  #
+  # See gitlab.yml.example test section for paths
+  #
+  def init(opts = {})
+    unless Rails.env.test?
+      puts "\nTestEnv.init can only be run if `RAILS_ENV` is set to 'test' not '#{Rails.env}'!\n"
+      exit 1
+    end
+
+    # Disable mailer for spinach tests
+    disable_mailer if opts[:mailer] == false
+
+    clean_test_path
+
+    # Setup GitLab shell for test instance
+    setup_gitlab_shell
+
+    setup_gitaly
+
+    # Create repository for FactoryBot.create(:project)
+    setup_factory_repo
+
+    # Create repository for FactoryBot.create(:forked_project_with_submodules)
+    setup_forked_repo
+  end
+
+  def disable_mailer
+    allow_any_instance_of(NotificationService).to receive(:mailer)
+      .and_return(double.as_null_object)
+  end
+
+  def enable_mailer
+    allow_any_instance_of(NotificationService).to receive(:mailer)
+      .and_call_original
+  end
+
+  def disable_pre_receive
+    allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([true, nil])
+  end
+
+  # Clean /tmp/tests
+  #
+  # Keeps gitlab-shell and gitlab-test
+  def clean_test_path
+    Dir[TMP_TEST_PATH].each do |entry|
+      unless File.basename(entry) =~ /\A(gitaly|gitlab-(shell|test|test_bare|test-fork|test-fork_bare))\z/
+        FileUtils.rm_rf(entry)
+      end
+    end
+
+    FileUtils.mkdir_p(repos_path)
+    FileUtils.mkdir_p(backup_path)
+    FileUtils.mkdir_p(pages_path)
+    FileUtils.mkdir_p(artifacts_path)
+  end
+
+  def clean_gitlab_test_path
+    Dir[TMP_TEST_PATH].each do |entry|
+      if File.basename(entry) =~ /\A(gitlab-(test|test_bare|test-fork|test-fork_bare))\z/
+        FileUtils.rm_rf(entry)
+      end
+    end
+  end
+
+  def setup_gitlab_shell
+    component_timed_setup('GitLab Shell',
+      install_dir: Gitlab.config.gitlab_shell.path,
+      version: Gitlab::Shell.version_required,
+      task: 'gitlab:shell:install')
+  end
+
+  def setup_gitaly
+    socket_path = Gitlab::GitalyClient.address('default').sub(/\Aunix:/, '')
+    gitaly_dir = File.dirname(socket_path)
+
+    component_timed_setup('Gitaly',
+      install_dir: gitaly_dir,
+      version: Gitlab::GitalyClient.expected_server_version,
+      task: "gitlab:gitaly:install[#{gitaly_dir}]") do
+
+      # Always re-create config, in case it's outdated. This is fast anyway.
+      Gitlab::SetupHelper.create_gitaly_configuration(gitaly_dir, force: true)
+
+      start_gitaly(gitaly_dir)
+    end
+  end
+
+  def start_gitaly(gitaly_dir)
+    if ENV['CI'].present?
+      # Gitaly has been spawned outside this process already
+      return
+    end
+
+    spawn_script = Rails.root.join('scripts/gitaly-test-spawn').to_s
+    @gitaly_pid = Bundler.with_original_env { IO.popen([spawn_script], &:read).to_i }
+    Kernel.at_exit { stop_gitaly }
+
+    wait_gitaly
+  end
+
+  def wait_gitaly
+    sleep_time = 10
+    sleep_interval = 0.1
+    socket = Gitlab::GitalyClient.address('default').sub('unix:', '')
+
+    Integer(sleep_time / sleep_interval).times do
+      begin
+        Socket.unix(socket)
+        return
+      rescue
+        sleep sleep_interval
+      end
+    end
+
+    raise "could not connect to gitaly at #{socket.inspect} after #{sleep_time} seconds"
+  end
+
+  def stop_gitaly
+    return unless @gitaly_pid
+
+    Process.kill('KILL', @gitaly_pid)
+  rescue Errno::ESRCH
+    # The process can already be gone if the test run was INTerrupted.
+  end
+
+  def setup_factory_repo
+    setup_repo(factory_repo_path, factory_repo_path_bare, factory_repo_name,
+               BRANCH_SHA)
+  end
+
+  # This repo has a submodule commit that is not present in the main test
+  # repository.
+  def setup_forked_repo
+    setup_repo(forked_repo_path, forked_repo_path_bare, forked_repo_name,
+               FORKED_BRANCH_SHA)
+  end
+
+  def setup_repo(repo_path, repo_path_bare, repo_name, refs)
+    clone_url = "https://gitlab.com/gitlab-org/#{repo_name}.git"
+
+    unless File.directory?(repo_path)
+      system(*%W(#{Gitlab.config.git.bin_path} clone -q #{clone_url} #{repo_path}))
+    end
+
+    set_repo_refs(repo_path, refs)
+
+    unless File.directory?(repo_path_bare)
+      # We must copy bare repositories because we will push to them.
+      system(git_env, *%W(#{Gitlab.config.git.bin_path} clone -q --bare #{repo_path} #{repo_path_bare}))
+    end
+  end
+
+  def copy_repo(project, bare_repo:, refs:)
+    target_repo_path = File.expand_path(project.repository_storage_path + "/#{project.disk_path}.git")
+    FileUtils.mkdir_p(target_repo_path)
+    FileUtils.cp_r("#{File.expand_path(bare_repo)}/.", target_repo_path)
+    FileUtils.chmod_R 0755, target_repo_path
+    set_repo_refs(target_repo_path, refs)
+  end
+
+  def repos_path
+    Gitlab.config.repositories.storages[REPOS_STORAGE].legacy_disk_path
+  end
+
+  def backup_path
+    Gitlab.config.backup.path
+  end
+
+  def pages_path
+    Gitlab.config.pages.path
+  end
+
+  def artifacts_path
+    Gitlab.config.artifacts.storage_path
+  end
+
+  # When no cached assets exist, manually hit the root path to create them
+  #
+  # Otherwise they'd be created by the first test, often timing out and
+  # causing a transient test failure
+  def eager_load_driver_server
+    return unless defined?(Capybara)
+
+    puts "Starting the Capybara driver server..."
+    Capybara.current_session.visit '/'
+  end
+
+  def factory_repo_path_bare
+    "#{factory_repo_path}_bare"
+  end
+
+  def forked_repo_path_bare
+    "#{forked_repo_path}_bare"
+  end
+
+  def with_empty_bare_repository(name = nil)
+    path = Rails.root.join('tmp/tests', name || 'empty-bare-repository').to_s
+
+    yield(Rugged::Repository.init_at(path, :bare))
+  ensure
+    FileUtils.rm_rf(path)
+  end
+
+  private
+
+  def factory_repo_path
+    @factory_repo_path ||= Rails.root.join('tmp', 'tests', factory_repo_name)
+  end
+
+  def factory_repo_name
+    'gitlab-test'
+  end
+
+  def forked_repo_path
+    @forked_repo_path ||= Rails.root.join('tmp', 'tests', forked_repo_name)
+  end
+
+  def forked_repo_name
+    'gitlab-test-fork'
+  end
+
+  # Prevent developer git configurations from being persisted to test
+  # repositories
+  def git_env
+    { 'GIT_TEMPLATE_DIR' => '' }
+  end
+
+  def set_repo_refs(repo_path, branch_sha)
+    instructions = branch_sha.map { |branch, sha| "update refs/heads/#{branch}\x00#{sha}\x00" }.join("\x00") << "\x00"
+    update_refs = %W(#{Gitlab.config.git.bin_path} update-ref --stdin -z)
+    reset = proc do
+      Dir.chdir(repo_path) do
+        IO.popen(update_refs, "w") { |io| io.write(instructions) }
+        $?.success?
+      end
+    end
+
+    # Try to reset without fetching to avoid using the network.
+    unless reset.call
+      raise 'Could not fetch test seed repository.' unless system(*%W(#{Gitlab.config.git.bin_path} -C #{repo_path} fetch origin))
+
+      # Before we used Git clone's --mirror option, bare repos could end up
+      # with missing refs, clearing them and retrying should fix the issue.
+      clean_gitlab_test_path && init unless reset.call
+    end
+  end
+
+  def component_timed_setup(component, install_dir:, version:, task:)
+    puts "\n==> Setting up #{component}..."
+    start = Time.now
+
+    ensure_component_dir_name_is_correct!(component, install_dir)
+
+    # On CI, once installed, components never need update
+    return if File.exist?(install_dir) && ENV['CI']
+
+    if component_needs_update?(install_dir, version)
+      # Cleanup the component entirely to ensure we start fresh
+      FileUtils.rm_rf(install_dir)
+
+      unless system('rake', task)
+        raise ComponentFailedToInstallError
+      end
+    end
+
+    yield if block_given?
+
+  rescue ComponentFailedToInstallError
+    puts "\n#{component} failed to install, cleaning up #{install_dir}!\n"
+    FileUtils.rm_rf(install_dir)
+    exit 1
+  ensure
+    puts "    #{component} setup in #{Time.now - start} seconds...\n"
+  end
+
+  def ensure_component_dir_name_is_correct!(component, path)
+    actual_component_dir_name = File.basename(path)
+    expected_component_dir_name = component.parameterize
+
+    unless actual_component_dir_name == expected_component_dir_name
+      puts "    #{component} install dir should be named '#{expected_component_dir_name}', not '#{actual_component_dir_name}' (full install path given was '#{path}')!\n"
+      exit 1
+    end
+  end
+
+  def component_needs_update?(component_folder, expected_version)
+    # Allow local overrides of the component for tests during development
+    return false if Rails.env.test? && File.symlink?(component_folder)
+
+    version = File.read(File.join(component_folder, 'VERSION')).strip
+
+    # Notice that this will always yield true when using branch versions
+    # (`=branch_name`), but that actually makes sure the server is always based
+    # on the latest branch revision.
+    version != expected_version
+  rescue Errno::ENOENT
+    true
+  end
+end
diff --git a/spec/support/helpers/upload_helpers.rb b/spec/support/helpers/upload_helpers.rb
new file mode 100644
index 00000000000..5eead80c935
--- /dev/null
+++ b/spec/support/helpers/upload_helpers.rb
@@ -0,0 +1,16 @@
+require 'fileutils'
+
+module UploadHelpers
+  extend self
+
+  def uploaded_image_temp_path
+    basename = 'banana_sample.gif'
+    orig_path = File.join(Rails.root, 'spec', 'fixtures', basename)
+    tmp_path = File.join(Rails.root, 'tmp', 'tests', basename)
+    # Because we use 'move_to_store' on all uploaders, we create a new
+    # tempfile on each call: the file we return here will be renamed in most
+    # cases.
+    FileUtils.copy(orig_path, tmp_path)
+    tmp_path
+  end
+end
diff --git a/spec/support/helpers/user_activities_helpers.rb b/spec/support/helpers/user_activities_helpers.rb
new file mode 100644
index 00000000000..44feb104644
--- /dev/null
+++ b/spec/support/helpers/user_activities_helpers.rb
@@ -0,0 +1,7 @@
+module UserActivitiesHelpers
+  def user_activity(user)
+    Gitlab::UserActivities.new
+      .find { |k, _| k == user.id.to_s }&.
+      second
+  end
+end
diff --git a/spec/support/helpers/wait_for_requests.rb b/spec/support/helpers/wait_for_requests.rb
new file mode 100644
index 00000000000..fda0e29f983
--- /dev/null
+++ b/spec/support/helpers/wait_for_requests.rb
@@ -0,0 +1,78 @@
+module WaitForRequests
+  extend self
+
+  # This is inspired by http://www.salsify.com/blog/engineering/tearing-capybara-ajax-tests
+  def block_and_wait_for_requests_complete
+    block_requests { wait_for_all_requests }
+  end
+
+  # Block all requests inside block with 503 response
+  def block_requests
+    Gitlab::Testing::RequestBlockerMiddleware.block_requests!
+    yield
+  ensure
+    Gitlab::Testing::RequestBlockerMiddleware.allow_requests!
+  end
+
+  # Slow down requests inside block by injecting `sleep 0.2` before each response
+  def slow_requests
+    Gitlab::Testing::RequestBlockerMiddleware.slow_requests!
+    yield
+  ensure
+    Gitlab::Testing::RequestBlockerMiddleware.allow_requests!
+  end
+
+  # Wait for client-side AJAX requests
+  def wait_for_requests
+    wait_for('JS requests complete') { finished_all_js_requests? }
+  end
+
+  # Wait for active Rack requests and client-side AJAX requests
+  def wait_for_all_requests
+    wait_for('pending requests complete') do
+      finished_all_rack_reqiests? &&
+        finished_all_js_requests?
+    end
+  end
+
+  private
+
+  def finished_all_rack_reqiests?
+    Gitlab::Testing::RequestBlockerMiddleware.num_active_requests.zero?
+  end
+
+  def finished_all_js_requests?
+    return true unless javascript_test?
+
+    finished_all_ajax_requests? &&
+      finished_all_vue_resource_requests?
+  end
+
+  # Waits until the passed block returns true
+  def wait_for(condition_name, max_wait_time: Capybara.default_max_wait_time, polling_interval: 0.01)
+    wait_until = Time.now + max_wait_time.seconds
+    loop do
+      break if yield
+
+      if Time.now > wait_until
+        raise "Condition not met: #{condition_name}"
+      else
+        sleep(polling_interval)
+      end
+    end
+  end
+
+  def finished_all_vue_resource_requests?
+    Capybara.page.evaluate_script('window.activeVueResources || 0').zero?
+  end
+
+  def finished_all_ajax_requests?
+    return true if Capybara.page.evaluate_script('typeof jQuery === "undefined"')
+
+    Capybara.page.evaluate_script('jQuery.active').zero?
+  end
+
+  def javascript_test?
+    Capybara.current_driver == Capybara.javascript_driver
+  end
+end
diff --git a/spec/support/helpers/workhorse_helpers.rb b/spec/support/helpers/workhorse_helpers.rb
new file mode 100644
index 00000000000..ef1f9f68671
--- /dev/null
+++ b/spec/support/helpers/workhorse_helpers.rb
@@ -0,0 +1,21 @@
+module WorkhorseHelpers
+  extend self
+
+  def workhorse_send_data
+    @_workhorse_send_data ||= begin
+      header = response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]
+      split_header = header.split(':')
+      type = split_header.shift
+      header = split_header.join(':')
+      [
+        type,
+        JSON.parse(Base64.urlsafe_decode64(header))
+      ]
+    end
+  end
+
+  def workhorse_internal_api_request_header
+    jwt_token = JWT.encode({ 'iss' => 'gitlab-workhorse' }, Gitlab::Workhorse.secret, 'HS256')
+    { 'HTTP_' + Gitlab::Workhorse::INTERNAL_API_REQUEST_HEADER.upcase.tr('-', '_') => jwt_token }
+  end
+end
diff --git a/spec/support/import_spec_helper.rb b/spec/support/import_spec_helper.rb
deleted file mode 100644
index d4eced724fa..00000000000
--- a/spec/support/import_spec_helper.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'ostruct'
-
-# Helper methods for controller specs in the Import namespace
-#
-# Must be included manually.
-module ImportSpecHelper
-  # Stub `controller` to return a null object double with the provided messages
-  # when `client` is called
-  #
-  # Examples:
-  #
-  #   stub_client(foo: %w(foo))
-  #
-  #   controller.client.foo         # => ["foo"]
-  #   controller.client.bar.baz.foo # => ["foo"]
-  #
-  # Returns the client double
-  def stub_client(messages = {})
-    client = double('client', messages).as_null_object
-    allow(controller).to receive(:client).and_return(client)
-
-    client
-  end
-
-  def stub_omniauth_provider(name)
-    provider = OpenStruct.new(
-      name: name,
-      app_id: 'asd123',
-      app_secret: 'asd123'
-    )
-    stub_omniauth_setting(providers: [provider])
-  end
-end
diff --git a/spec/support/input_helper.rb b/spec/support/input_helper.rb
deleted file mode 100644
index acbb42274ec..00000000000
--- a/spec/support/input_helper.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# see app/assets/javascripts/test_utils/simulate_input.js
-
-module InputHelper
-  def simulate_input(selector, input = '')
-    evaluate_script("window.simulateInput(#{selector.to_json}, #{input.to_json});")
-  end
-end
diff --git a/spec/support/inspect_requests.rb b/spec/support/inspect_requests.rb
deleted file mode 100644
index 88ddc5c7f6c..00000000000
--- a/spec/support/inspect_requests.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require_relative './wait_for_requests'
-
-module InspectRequests
-  extend self
-  include WaitForRequests
-
-  def inspect_requests(inject_headers: {})
-    Gitlab::Testing::RequestInspectorMiddleware.log_requests!(inject_headers)
-
-    yield
-
-    wait_for_all_requests
-    Gitlab::Testing::RequestInspectorMiddleware.requests
-  ensure
-    Gitlab::Testing::RequestInspectorMiddleware.stop_logging!
-  end
-end
diff --git a/spec/support/issuable_shared_examples.rb b/spec/support/issuable_shared_examples.rb
deleted file mode 100644
index 42f3b4db23c..00000000000
--- a/spec/support/issuable_shared_examples.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-shared_examples 'cache counters invalidator' do
-  it 'invalidates counter cache for assignees' do
-    expect_any_instance_of(User).to receive(:invalidate_merge_request_cache_counts)
-
-    described_class.new(project, user, {}).execute(merge_request)
-  end
-end
-
-shared_examples 'system notes for milestones' do
-  def update_issuable(opts)
-    issuable = try(:issue) || try(:merge_request)
-    described_class.new(project, user, opts).execute(issuable)
-  end
-
-  context 'group milestones' do
-    let(:group) { create(:group) }
-    let(:group_milestone) { create(:milestone, group: group) }
-
-    before do
-      project.update(namespace: group)
-      create(:group_member, group: group, user: user)
-    end
-
-    it 'creates a system note' do
-      expect do
-        update_issuable(milestone: group_milestone)
-      end.to change { Note.system.count }.by(1)
-    end
-  end
-
-  context 'project milestones' do
-    it 'creates a system note' do
-      expect do
-        update_issuable(milestone: create(:milestone))
-      end.to change { Note.system.count }.by(1)
-    end
-  end
-end
diff --git a/spec/support/issuables_list_metadata_shared_examples.rb b/spec/support/issuables_list_metadata_shared_examples.rb
deleted file mode 100644
index e61983c60b4..00000000000
--- a/spec/support/issuables_list_metadata_shared_examples.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-shared_examples 'issuables list meta-data' do |issuable_type, action = nil|
-  before do
-    @issuable_ids = []
-
-    %w[fix improve/awesome].each do |source_branch|
-      issuable =
-        if issuable_type == :issue
-          create(issuable_type, project: project, author: project.creator)
-        else
-          create(issuable_type, source_project: project, source_branch: source_branch, author: project.creator)
-        end
-
-      @issuable_ids << issuable.id
-    end
-  end
-
-  it "creates indexed meta-data object for issuable notes and votes count" do
-    if action
-      get action, author_id: project.creator.id
-    else
-      get :index, namespace_id: project.namespace, project_id: project
-    end
-
-    meta_data = assigns(:issuable_meta_data)
-
-    aggregate_failures do
-      expect(meta_data.keys).to match_array(@issuable_ids)
-      expect(meta_data.values).to all(be_kind_of(Issuable::IssuableMeta))
-    end
-  end
-
-  describe "when given empty collection" do
-    let(:project2) { create(:project, :public) }
-
-    it "doesn't execute any queries with false conditions" do
-      get_action =
-        if action
-          proc { get action, author_id: project.creator.id }
-        else
-          proc { get :index, namespace_id: project2.namespace, project_id: project2 }
-        end
-
-      expect(&get_action).not_to make_queries_matching(/WHERE (?:1=0|0=1)/)
-    end
-  end
-end
diff --git a/spec/support/issue_helpers.rb b/spec/support/issue_helpers.rb
deleted file mode 100644
index ffd72515f37..00000000000
--- a/spec/support/issue_helpers.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module IssueHelpers
-  def visit_issues(project, opts = {})
-    visit project_issues_path project, opts
-  end
-
-  def first_issue
-    page.all('ul.issues-list > li').first.text
-  end
-
-  def last_issue
-    page.all('ul.issues-list > li').last.text
-  end
-end
diff --git a/spec/support/issue_tracker_service_shared_example.rb b/spec/support/issue_tracker_service_shared_example.rb
deleted file mode 100644
index a6ab03cb808..00000000000
--- a/spec/support/issue_tracker_service_shared_example.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-RSpec.shared_examples 'issue tracker service URL attribute' do |url_attr|
-  it { is_expected.to allow_value('https://example.com').for(url_attr) }
-
-  it { is_expected.not_to allow_value('example.com').for(url_attr) }
-  it { is_expected.not_to allow_value('ftp://example.com').for(url_attr) }
-  it { is_expected.not_to allow_value('herp-and-derp').for(url_attr) }
-end
-
-RSpec.shared_examples 'allows project key on reference pattern' do |url_attr|
-  it 'allows underscores in the project name' do
-    expect(described_class.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
-  end
-
-  it 'allows numbers in the project name' do
-    expect(described_class.reference_pattern.match('EXT3_EXT-1234')[0]).to eq 'EXT3_EXT-1234'
-  end
-
-  it 'requires the project name to begin with A-Z' do
-    expect(described_class.reference_pattern.match('3EXT_EXT-1234')).to eq nil
-    expect(described_class.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
-  end
-end
diff --git a/spec/support/javascript_fixtures_helpers.rb b/spec/support/javascript_fixtures_helpers.rb
deleted file mode 100644
index 2197bc9d853..00000000000
--- a/spec/support/javascript_fixtures_helpers.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'action_dispatch/testing/test_request'
-require 'fileutils'
-
-module JavaScriptFixturesHelpers
-  include Gitlab::Popen
-
-  FIXTURE_PATH = 'spec/javascripts/fixtures'.freeze
-
-  # Public: Removes all fixture files from given directory
-  #
-  # directory_name - directory of the fixtures (relative to FIXTURE_PATH)
-  #
-  def clean_frontend_fixtures(directory_name)
-    directory_name = File.expand_path(directory_name, FIXTURE_PATH)
-    Dir[File.expand_path('*.html.raw', directory_name)].each do |file_name|
-      FileUtils.rm(file_name)
-    end
-  end
-
-  # Public: Store a response object as fixture file
-  #
-  # response - string or response object to store
-  # fixture_file_name - file name to store the fixture in (relative to FIXTURE_PATH)
-  #
-  def store_frontend_fixture(response, fixture_file_name)
-    fixture_file_name = File.expand_path(fixture_file_name, FIXTURE_PATH)
-    fixture = response.respond_to?(:body) ? parse_response(response) : response
-
-    FileUtils.mkdir_p(File.dirname(fixture_file_name))
-    File.write(fixture_file_name, fixture)
-  end
-
-  def remove_repository(project)
-    Gitlab::Shell.new.remove_repository(project.repository_storage_path, project.disk_path)
-  end
-
-  private
-
-  # Private: Prepare a response object for use as a frontend fixture
-  #
-  # response - response object to prepare
-  #
-  def parse_response(response)
-    fixture = response.body
-    fixture.force_encoding("utf-8")
-
-    response_mime_type = Mime::Type.lookup(response.content_type)
-    if response_mime_type.html?
-      doc = Nokogiri::HTML::DocumentFragment.parse(fixture)
-
-      link_tags = doc.css('link')
-      link_tags.remove
-
-      scripts = doc.css("script:not([type='text/template']):not([type='text/x-template'])")
-      scripts.remove
-
-      fixture = doc.to_html
-
-      # replace relative links
-      test_host = ActionDispatch::TestRequest::DEFAULT_ENV['HTTP_HOST']
-      fixture.gsub!(%r{="/}, "=\"http://#{test_host}/")
-    end
-
-    fixture
-  end
-end
diff --git a/spec/support/jira_service_helper.rb b/spec/support/jira_service_helper.rb
deleted file mode 100644
index 88a7aeba461..00000000000
--- a/spec/support/jira_service_helper.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-module JiraServiceHelper
-  JIRA_URL = "http://jira.example.net".freeze
-  JIRA_API = JIRA_URL + "/rest/api/2"
-
-  def jira_service_settings
-    properties = {
-      title: "JIRA tracker",
-      url: JIRA_URL,
-      username: 'jira-user',
-      password: 'my-secret-password',
-      project_key: "JIRA",
-      jira_issue_transition_id: '1'
-    }
-
-    jira_tracker.update_attributes(properties: properties, active: true)
-  end
-
-  def jira_issue_comments
-    "{\"startAt\":0,\"maxResults\":11,\"total\":11,
-      \"comments\":[{\"self\":\"http://0.0.0.0:4567/rest/api/2/issue/10002/comment/10609\",
-      \"id\":\"10609\",\"author\":{\"self\":\"http://0.0.0.0:4567/rest/api/2/user?username=gitlab\",
-      \"name\":\"gitlab\",\"emailAddress\":\"gitlab@example.com\",
-      \"avatarUrls\":{\"16x16\":\"http://0.0.0.0:4567/secure/useravatar?size=xsmall&avatarId=10122\",
-      \"24x24\":\"http://0.0.0.0:4567/secure/useravatar?size=small&avatarId=10122\",
-      \"32x32\":\"http://0.0.0.0:4567/secure/useravatar?size=medium&avatarId=10122\",
-      \"48x48\":\"http://0.0.0.0:4567/secure/useravatar?avatarId=10122\"},
-      \"displayName\":\"GitLab\",\"active\":true},
-      \"body\":\"[Administrator|http://localhost:3000/u/root] mentioned JIRA-1 in Merge request of [gitlab-org/gitlab-test|http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2].\",
-      \"updateAuthor\":{\"self\":\"http://0.0.0.0:4567/rest/api/2/user?username=gitlab\",\"name\":\"gitlab\",\"emailAddress\":\"gitlab@example.com\",
-      \"avatarUrls\":{\"16x16\":\"http://0.0.0.0:4567/secure/useravatar?size=xsmall&avatarId=10122\",
-      \"24x24\":\"http://0.0.0.0:4567/secure/useravatar?size=small&avatarId=10122\",
-      \"32x32\":\"http://0.0.0.0:4567/secure/useravatar?size=medium&avatarId=10122\",
-      \"48x48\":\"http://0.0.0.0:4567/secure/useravatar?avatarId=10122\"},\"displayName\":\"GitLab\",\"active\":true},
-      \"created\":\"2015-02-12T22:47:07.826+0100\",
-      \"updated\":\"2015-02-12T22:47:07.826+0100\"},
-     {\"self\":\"http://0.0.0.0:4567/rest/api/2/issue/10002/comment/10700\",
-        \"id\":\"10700\",\"author\":{\"self\":\"http://0.0.0.0:4567/rest/api/2/user?username=gitlab\",
-        \"name\":\"gitlab\",\"emailAddress\":\"gitlab@example.com\",
-        \"avatarUrls\":{\"16x16\":\"http://0.0.0.0:4567/secure/useravatar?size=xsmall&avatarId=10122\",
-        \"24x24\":\"http://0.0.0.0:4567/secure/useravatar?size=small&avatarId=10122\",
-        \"32x32\":\"http://0.0.0.0:4567/secure/useravatar?size=medium&avatarId=10122\",
-        \"48x48\":\"http://0.0.0.0:4567/secure/useravatar?avatarId=10122\"},\"displayName\":\"GitLab\",\"active\":true},
-        \"body\":\"[Administrator|http://localhost:3000/u/root] mentioned this issue in [a commit of h5bp/html5-boilerplate|http://localhost:3000/h5bp/html5-boilerplate/commit/2439f77897122fbeee3bfd9bb692d3608848433e].\",
-        \"updateAuthor\":{\"self\":\"http://0.0.0.0:4567/rest/api/2/user?username=gitlab\",\"name\":\"gitlab\",\"emailAddress\":\"gitlab@example.com\",
-        \"avatarUrls\":{\"16x16\":\"http://0.0.0.0:4567/secure/useravatar?size=xsmall&avatarId=10122\",
-        \"24x24\":\"http://0.0.0.0:4567/secure/useravatar?size=small&avatarId=10122\",
-        \"32x32\":\"http://0.0.0.0:4567/secure/useravatar?size=medium&avatarId=10122\",
-        \"48x48\":\"http://0.0.0.0:4567/secure/useravatar?avatarId=10122\"},\"displayName\":\"GitLab\",\"active\":true},
-        \"created\":\"2015-04-01T03:45:55.667+0200\",
-        \"updated\":\"2015-04-01T03:45:55.667+0200\"
-      }
-      ]}"
-  end
-
-  def jira_project_url
-    JIRA_API + "/project"
-  end
-
-  def jira_api_comment_url(issue_id)
-    JIRA_API + "/issue/#{issue_id}/comment"
-  end
-
-  def jira_api_remote_link_url(issue_id)
-    JIRA_API + "/issue/#{issue_id}/remotelink"
-  end
-
-  def jira_api_transition_url(issue_id)
-    JIRA_API + "/issue/#{issue_id}/transitions"
-  end
-
-  def jira_api_test_url
-    JIRA_API + "/myself"
-  end
-
-  def jira_issue_url(issue_id)
-    JIRA_API + "/issue/#{issue_id}"
-  end
-
-  def stub_jira_urls(issue_id)
-    WebMock.stub_request(:get, jira_project_url)
-    WebMock.stub_request(:get, jira_api_comment_url(issue_id)).to_return(body: jira_issue_comments)
-    WebMock.stub_request(:get, jira_issue_url(issue_id))
-    WebMock.stub_request(:get, jira_api_test_url)
-    WebMock.stub_request(:post, jira_api_comment_url(issue_id))
-    WebMock.stub_request(:post, jira_api_remote_link_url(issue_id))
-    WebMock.stub_request(:post, jira_api_transition_url(issue_id))
-  end
-end
diff --git a/spec/support/json_response.rb b/spec/support/json_response.rb
new file mode 100644
index 00000000000..210b0e6d867
--- /dev/null
+++ b/spec/support/json_response.rb
@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.include_context 'JSON response'
+  config.include_context 'JSON response', type: :request
+  config.include_context 'JSON response', :api
+end
diff --git a/spec/support/json_response_helpers.rb b/spec/support/json_response_helpers.rb
deleted file mode 100644
index aa235529c56..00000000000
--- a/spec/support/json_response_helpers.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-shared_context 'JSON response' do
-  let(:json_response) { JSON.parse(response.body) }
-end
-
-RSpec.configure do |config|
-  config.include_context 'JSON response'
-  config.include_context 'JSON response', type: :request
-  config.include_context 'JSON response', :api
-end
diff --git a/spec/support/kubernetes_helpers.rb b/spec/support/kubernetes_helpers.rb
deleted file mode 100644
index e46b61b6461..00000000000
--- a/spec/support/kubernetes_helpers.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-module KubernetesHelpers
-  include Gitlab::Kubernetes
-
-  def kube_response(body)
-    { body: body.to_json }
-  end
-
-  def kube_pods_response
-    kube_response(kube_pods_body)
-  end
-
-  def stub_kubeclient_discover(api_url)
-    WebMock.stub_request(:get, api_url + '/api/v1').to_return(kube_response(kube_v1_discovery_body))
-  end
-
-  def stub_kubeclient_pods(response = nil)
-    stub_kubeclient_discover(service.api_url)
-    pods_url = service.api_url + "/api/v1/namespaces/#{service.actual_namespace}/pods"
-
-    WebMock.stub_request(:get, pods_url).to_return(response || kube_pods_response)
-  end
-
-  def stub_kubeclient_get_secrets(api_url, **options)
-    WebMock.stub_request(:get, api_url + '/api/v1/secrets')
-      .to_return(kube_response(kube_v1_secrets_body(options)))
-  end
-
-  def stub_kubeclient_get_secrets_error(api_url)
-    WebMock.stub_request(:get, api_url + '/api/v1/secrets')
-      .to_return(status: [404, "Internal Server Error"])
-  end
-
-  def kube_v1_secrets_body(**options)
-    {
-      "kind" => "SecretList",
-      "apiVersion": "v1",
-      "items" => [
-        {
-          "metadata": {
-            "name": options[:metadata_name] || "default-token-1",
-            "namespace": "kube-system"
-          },
-          "data": {
-            "token": options[:token] || Base64.encode64('token-sample-123')
-          }
-        }
-      ]
-    }
-  end
-
-  def kube_v1_discovery_body
-    {
-      "kind" => "APIResourceList",
-      "resources" => [
-        { "name" => "pods", "namespaced" => true, "kind" => "Pod" },
-        { "name" => "secrets", "namespaced" => true, "kind" => "Secret" }
-      ]
-    }
-  end
-
-  def kube_pods_body
-    {
-      "kind" => "PodList",
-      "items" => [kube_pod]
-    }
-  end
-
-  # This is a partial response, it will have many more elements in reality but
-  # these are the ones we care about at the moment
-  def kube_pod(name: "kube-pod", app: "valid-pod-label")
-    {
-      "metadata" => {
-        "name" => name,
-        "creationTimestamp" => "2016-11-25T19:55:19Z",
-        "labels" => { "app" => app }
-      },
-      "spec" => {
-        "containers" => [
-          { "name" => "container-0" },
-          { "name" => "container-1" }
-        ]
-      },
-      "status" => { "phase" => "Running" }
-    }
-  end
-
-  def kube_terminals(service, pod)
-    pod_name = pod['metadata']['name']
-    containers = pod['spec']['containers']
-
-    containers.map do |container|
-      terminal = {
-        selectors: { pod: pod_name, container: container['name'] },
-        url:  container_exec_url(service.api_url, service.actual_namespace, pod_name, container['name']),
-        subprotocols: ['channel.k8s.io'],
-        headers: { 'Authorization' => ["Bearer #{service.token}"] },
-        created_at: DateTime.parse(pod['metadata']['creationTimestamp']),
-        max_session_time: 0
-      }
-      terminal[:ca_pem] = service.ca_pem if service.ca_pem.present?
-      terminal
-    end
-  end
-end
diff --git a/spec/support/ldap_helpers.rb b/spec/support/ldap_helpers.rb
deleted file mode 100644
index 0e87b3d359d..00000000000
--- a/spec/support/ldap_helpers.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-module LdapHelpers
-  def ldap_adapter(provider = 'ldapmain', ldap = double(:ldap))
-    ::Gitlab::Auth::LDAP::Adapter.new(provider, ldap)
-  end
-
-  def user_dn(uid)
-    "uid=#{uid},ou=users,dc=example,dc=com"
-  end
-
-  # Accepts a hash of Gitlab::Auth::LDAP::Config keys and values.
-  #
-  # Example:
-  #   stub_ldap_config(
-  #     group_base: 'ou=groups,dc=example,dc=com',
-  #     admin_group: 'my-admin-group'
-  #   )
-  def stub_ldap_config(messages)
-    allow_any_instance_of(::Gitlab::Auth::LDAP::Config).to receive_messages(messages)
-  end
-
-  # Stub an LDAP person search and provide the return entry. Specify `nil` for
-  # `entry` to simulate when an LDAP person is not found
-  #
-  # Example:
-  #  adapter = ::Gitlab::Auth::LDAP::Adapter.new('ldapmain', double(:ldap))
-  #  ldap_user_entry = ldap_user_entry('john_doe')
-  #
-  #  stub_ldap_person_find_by_uid('john_doe', ldap_user_entry, adapter)
-  def stub_ldap_person_find_by_uid(uid, entry, provider = 'ldapmain')
-    return_value = ::Gitlab::Auth::LDAP::Person.new(entry, provider) if entry.present?
-
-    allow(::Gitlab::Auth::LDAP::Person)
-      .to receive(:find_by_uid).with(uid, any_args).and_return(return_value)
-  end
-
-  # Create a simple LDAP user entry.
-  def ldap_user_entry(uid)
-    entry = Net::LDAP::Entry.new
-    entry['dn'] = user_dn(uid)
-    entry['uid'] = uid
-
-    entry
-  end
-
-  def raise_ldap_connection_error
-    allow_any_instance_of(Gitlab::Auth::LDAP::Adapter)
-      .to receive(:ldap_search).and_raise(Gitlab::Auth::LDAP::LDAPConnectionError)
-  end
-end
diff --git a/spec/support/ldap_shared_examples.rb b/spec/support/ldap_shared_examples.rb
deleted file mode 100644
index 52c34e78965..00000000000
--- a/spec/support/ldap_shared_examples.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-shared_examples_for 'normalizes a DN' do
-  using RSpec::Parameterized::TableSyntax
-
-  where(:test_description, :given, :expected) do
-    'strips extraneous whitespace'                                                                 | 'uid     =John Smith ,  ou = People, dc=  example,dc =com'                                            | 'uid=john smith,ou=people,dc=example,dc=com'
-    'strips extraneous whitespace for a DN with a single RDN'                                      | 'uid  =  John Smith'                                                                                  | 'uid=john smith'
-    'unescapes non-reserved, non-special Unicode characters'                                       | 'uid   =  Sebasti\\c3\\a1n\\ C.\\20Smith,   ou=People (aka. \\22humans\\")  ,dc=example, dc=com'      | 'uid=sebastián c. smith,ou=people (aka. \\"humans\\"),dc=example,dc=com'
-    'downcases the whole string'                                                                   | 'UID=John Smith,ou=People,dc=example,dc=com'                                                          | 'uid=john smith,ou=people,dc=example,dc=com'
-    'for a null DN (empty string), returns empty string and does not error'                        | ''                                                                                                    | ''
-    'does not strip an escaped leading space in an attribute value'                                | 'uid=\\ John Smith,ou=People,dc=example,dc=com'                                                       | 'uid=\\ john smith,ou=people,dc=example,dc=com'
-    'does not strip an escaped leading space in the last attribute value'                          | 'uid=\\ John Smith'                                                                                   | 'uid=\\ john smith'
-    'does not strip an escaped trailing space in an attribute value'                               | 'uid=John Smith\\ ,ou=People,dc=example,dc=com'                                                       | 'uid=john smith\\ ,ou=people,dc=example,dc=com'
-    'strips extraneous spaces after an escaped trailing space'                                     | 'uid=John Smith\\   ,ou=People,dc=example,dc=com'                                                     | 'uid=john smith\\ ,ou=people,dc=example,dc=com'
-    'strips extraneous spaces after an escaped trailing space at the end of the DN'                | 'uid=John Smith,ou=People,dc=example,dc=com\\   '                                                     | 'uid=john smith,ou=people,dc=example,dc=com\\ '
-    'properly preserves escaped trailing space after unescaped trailing spaces'                    | 'uid=John Smith  \\  ,ou=People,dc=example,dc=com'                                                    | 'uid=john smith  \\ ,ou=people,dc=example,dc=com'
-    'preserves multiple inner spaces in an attribute value'                                        | 'uid=John   Smith,ou=People,dc=example,dc=com'                                                        | 'uid=john   smith,ou=people,dc=example,dc=com'
-    'preserves inner spaces after an escaped space'                                                | 'uid=John\\   Smith,ou=People,dc=example,dc=com'                                                      | 'uid=john   smith,ou=people,dc=example,dc=com'
-    'hex-escapes an escaped leading newline in an attribute value'                                 | "uid=\\\nJohn Smith,ou=People,dc=example,dc=com"                                                      | "uid=\\0ajohn smith,ou=people,dc=example,dc=com"
-    'hex-escapes and does not strip an escaped trailing newline in an attribute value'             | "uid=John Smith\\\n,ou=People,dc=example,dc=com"                                                      | "uid=john smith\\0a,ou=people,dc=example,dc=com"
-    'hex-escapes an unescaped leading newline (actually an invalid DN?)'                           | "uid=\nJohn Smith,ou=People,dc=example,dc=com"                                                        | "uid=\\0ajohn smith,ou=people,dc=example,dc=com"
-    'strips an unescaped trailing newline (actually an invalid DN?)'                               | "uid=John Smith\n,ou=People,dc=example,dc=com"                                                        | "uid=john smith,ou=people,dc=example,dc=com"
-    'does not strip if no extraneous whitespace'                                                   | 'uid=John Smith,ou=People,dc=example,dc=com'                                                          | 'uid=john smith,ou=people,dc=example,dc=com'
-    'does not modify an escaped equal sign in an attribute value'                                  | 'uid= foo  \\=  bar'                                                                                  | 'uid=foo  \\=  bar'
-    'converts an escaped hex equal sign to an escaped equal sign in an attribute value'            | 'uid= foo  \\3D  bar'                                                                                 | 'uid=foo  \\=  bar'
-    'does not modify an escaped comma in an attribute value'                                       | 'uid= John C. Smith, ou=San Francisco\\, CA'                                                          | 'uid=john c. smith,ou=san francisco\\, ca'
-    'converts an escaped hex comma to an escaped comma in an attribute value'                      | 'uid= John C. Smith, ou=San Francisco\\2C CA'                                                         | 'uid=john c. smith,ou=san francisco\\, ca'
-    'does not modify an escaped hex carriage return character in an attribute value'               | 'uid= John C. Smith, ou=San Francisco\\,\\0DCA'                                                       | 'uid=john c. smith,ou=san francisco\\,\\0dca'
-    'does not modify an escaped hex line feed character in an attribute value'                     | 'uid= John C. Smith, ou=San Francisco\\,\\0ACA'                                                       | 'uid=john c. smith,ou=san francisco\\,\\0aca'
-    'does not modify an escaped hex CRLF in an attribute value'                                    | 'uid= John C. Smith, ou=San Francisco\\,\\0D\\0ACA'                                                   | 'uid=john c. smith,ou=san francisco\\,\\0d\\0aca'
-    'allows attribute type name OIDs'                                                              | '0.9.2342.19200300.100.1.25=Example,0.9.2342.19200300.100.1.25=Com'                                   | '0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com'
-    'strips extraneous whitespace from attribute type name OIDs'                                   | '0.9.2342.19200300.100.1.25 = Example, 0.9.2342.19200300.100.1.25 = Com'                              | '0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com'
-  end
-
-  with_them do
-    it 'normalizes the DN' do
-      assert_generic_test(test_description, subject, expected)
-    end
-  end
-end
-
-shared_examples_for 'normalizes a DN attribute value' do
-  using RSpec::Parameterized::TableSyntax
-
-  where(:test_description, :given, :expected) do
-    'strips extraneous whitespace'                                                      | '   John Smith   '                 | 'john smith'
-    'unescapes non-reserved, non-special Unicode characters'                            | 'Sebasti\\c3\\a1n\\ C.\\20Smith'   | 'sebastián c. smith'
-    'downcases the whole string'                                                        | 'JoHn C. Smith'                    | 'john c. smith'
-    'does not strip an escaped leading space in an attribute value'                     | '\\ John Smith'                    | '\\ john smith'
-    'does not strip an escaped trailing space in an attribute value'                    | 'John Smith\\ '                    | 'john smith\\ '
-    'hex-escapes an escaped leading newline in an attribute value'                      | "\\\nJohn Smith"                   | "\\0ajohn smith"
-    'hex-escapes and does not strip an escaped trailing newline in an attribute value'  | "John Smith\\\n"                   | "john smith\\0a"
-    'hex-escapes an unescaped leading newline (actually an invalid DN value?)'          | "\nJohn Smith"                     | "\\0ajohn smith"
-    'strips an unescaped trailing newline (actually an invalid DN value?)'              | "John Smith\n"                     | "john smith"
-    'does not strip if no extraneous whitespace'                                        | 'John Smith'                       | 'john smith'
-    'does not modify an escaped equal sign in an attribute value'                       | ' foo  \\=  bar'                   | 'foo  \\=  bar'
-    'converts an escaped hex equal sign to an escaped equal sign in an attribute value' | ' foo  \\3D  bar'                  | 'foo  \\=  bar'
-    'does not modify an escaped comma in an attribute value'                            | 'San Francisco\\, CA'              | 'san francisco\\, ca'
-    'converts an escaped hex comma to an escaped comma in an attribute value'           | 'San Francisco\\2C CA'             | 'san francisco\\, ca'
-    'does not modify an escaped hex carriage return character in an attribute value'    | 'San Francisco\\,\\0DCA'           | 'san francisco\\,\\0dca'
-    'does not modify an escaped hex line feed character in an attribute value'          | 'San Francisco\\,\\0ACA'           | 'san francisco\\,\\0aca'
-    'does not modify an escaped hex CRLF in an attribute value'                         | 'San Francisco\\,\\0D\\0ACA'       | 'san francisco\\,\\0d\\0aca'
-  end
-
-  with_them do
-    it 'normalizes the DN attribute value' do
-      assert_generic_test(test_description, subject, expected)
-    end
-  end
-end
diff --git a/spec/support/legacy_path_redirect_shared_examples.rb b/spec/support/legacy_path_redirect_shared_examples.rb
deleted file mode 100644
index f300bdd48b1..00000000000
--- a/spec/support/legacy_path_redirect_shared_examples.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-shared_examples 'redirecting a legacy path' do |source, target|
-  include RSpec::Rails::RequestExampleGroup
-
-  it "redirects #{source} to #{target} when the resource does not exist" do
-    expect(get(source)).to redirect_to(target)
-  end
-
-  it "does not redirect #{source} to #{target} when the resource exists" do
-    resource
-
-    expect(get(source)).not_to redirect_to(target)
-  end
-end
diff --git a/spec/support/live_debugger.rb b/spec/support/live_debugger.rb
deleted file mode 100644
index 911eb48a8ca..00000000000
--- a/spec/support/live_debugger.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'io/console'
-
-module LiveDebugger
-  def live_debug
-    puts
-    puts "Current example is paused for live debugging."
-    puts "Opening #{current_url} in your default browser..."
-    puts "The current user credentials are: #{@current_user.username} / #{@current_user.password}" if @current_user
-    puts "Press any key to resume the execution of the example!!"
-
-    `open #{current_url}`
-
-    loop until $stdin.getch
-
-    puts "Back to the example!"
-  end
-end
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
deleted file mode 100644
index db34090e971..00000000000
--- a/spec/support/login_helpers.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-require_relative 'devise_helpers'
-
-module LoginHelpers
-  include DeviseHelpers
-
-  # Overriding Devise::Test::IntegrationHelpers#sign_in to store @current_user
-  # since we may need it in LiveDebugger#live_debug.
-  def sign_in(resource, scope: nil)
-    super
-
-    @current_user = resource
-  end
-
-  # Overriding Devise::Test::IntegrationHelpers#sign_out to clear @current_user.
-  def sign_out(resource_or_scope)
-    super
-
-    @current_user = nil
-  end
-
-  # Internal: Log in as a specific user or a new user of a specific role
-  #
-  # user_or_role - User object, or a role to create (e.g., :admin, :user)
-  #
-  # Examples:
-  #
-  #   # Create a user automatically
-  #   gitlab_sign_in(:user)
-  #
-  #   # Create an admin automatically
-  #   gitlab_sign_in(:admin)
-  #
-  #   # Provide an existing User record
-  #   user = create(:user)
-  #   gitlab_sign_in(user)
-  def gitlab_sign_in(user_or_role, **kwargs)
-    user =
-      if user_or_role.is_a?(User)
-        user_or_role
-      else
-        create(user_or_role)
-      end
-
-    gitlab_sign_in_with(user, **kwargs)
-
-    @current_user = user
-  end
-
-  def gitlab_sign_in_via(provider, user, uid)
-    mock_auth_hash(provider, uid, user.email)
-    visit new_user_session_path
-    click_link provider
-  end
-
-  # Requires Javascript driver.
-  def gitlab_sign_out
-    find(".header-user-dropdown-toggle").click
-    click_link "Sign out"
-    @current_user = nil
-
-    expect(page).to have_button('Sign in')
-  end
-
-  private
-
-  # Private: Login as the specified user
-  #
-  # user     - User instance to login with
-  # remember - Whether or not to check "Remember me" (default: false)
-  def gitlab_sign_in_with(user, remember: false)
-    visit new_user_session_path
-
-    fill_in "user_login", with: user.email
-    fill_in "user_password", with: "12345678"
-    check 'user_remember_me' if remember
-
-    click_button "Sign in"
-  end
-
-  def login_via(provider, user, uid, remember_me: false)
-    mock_auth_hash(provider, uid, user.email)
-    visit new_user_session_path
-    expect(page).to have_content('Sign in with')
-
-    check 'remember_me' if remember_me
-
-    click_link "oauth-login-#{provider}"
-  end
-
-  def mock_auth_hash(provider, uid, email)
-    # The mock_auth configuration allows you to set per-provider (or default)
-    # authentication hashes to return during integration testing.
-    OmniAuth.config.mock_auth[provider.to_sym] = OmniAuth::AuthHash.new({
-      provider: provider,
-      uid: uid,
-      info: {
-        name: 'mockuser',
-        email: email,
-        image: 'mock_user_thumbnail_url'
-      },
-      credentials: {
-        token: 'mock_token',
-        secret: 'mock_secret'
-      },
-      extra: {
-        raw_info: {
-          info: {
-            name: 'mockuser',
-            email: email,
-            image: 'mock_user_thumbnail_url'
-          }
-        }
-      }
-    })
-    Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[:saml]
-  end
-
-  def mock_saml_config
-    OpenStruct.new(name: 'saml', label: 'saml', args: {
-      assertion_consumer_service_url: 'https://localhost:3443/users/auth/saml/callback',
-      idp_cert_fingerprint: '26:43:2C:47:AF:F0:6B:D0:07:9C:AD:A3:74:FE:5D:94:5F:4E:9E:52',
-      idp_sso_target_url: 'https://idp.example.com/sso/saml',
-      issuer: 'https://localhost:3443/',
-      name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
-    })
-  end
-
-  def stub_omniauth_provider(provider, context: Rails.application)
-    env = env_from_context(context)
-
-    set_devise_mapping(context: context)
-    env['omniauth.auth'] = OmniAuth.config.mock_auth[provider]
-  end
-
-  def stub_omniauth_saml_config(messages)
-    set_devise_mapping(context: Rails.application)
-    Rails.application.routes.disable_clear_and_finalize = true
-    Rails.application.routes.draw do
-      post '/users/auth/saml' => 'omniauth_callbacks#saml'
-    end
-    allow(Gitlab::Auth::OAuth::Provider).to receive_messages(providers: [:saml], config_for: mock_saml_config)
-    stub_omniauth_setting(messages)
-    stub_saml_authorize_path_helpers
-  end
-
-  def stub_saml_authorize_path_helpers
-    allow_any_instance_of(Object).to receive(:user_saml_omniauth_authorize_path).and_return('/users/auth/saml')
-    allow_any_instance_of(Object).to receive(:omniauth_authorize_path).with(:user, "saml").and_return('/users/auth/saml')
-  end
-
-  def stub_omniauth_config(messages)
-    allow(Gitlab.config.omniauth).to receive_messages(messages)
-  end
-
-  def stub_basic_saml_config
-    allow(Gitlab::Auth::Saml::Config).to receive_messages({ options: { name: 'saml', args: {} } })
-  end
-
-  def stub_saml_group_config(groups)
-    allow(Gitlab::Auth::Saml::Config).to receive_messages({ options: { name: 'saml', groups_attribute: 'groups', external_groups: groups, args: {} } })
-  end
-end
diff --git a/spec/support/malicious_regexp_shared_examples.rb b/spec/support/malicious_regexp_shared_examples.rb
deleted file mode 100644
index ac5d22298bb..00000000000
--- a/spec/support/malicious_regexp_shared_examples.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-shared_examples 'malicious regexp' do
-  let(:malicious_text)  { 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!' }
-  let(:malicious_regexp) { '(?i)^(([a-z])+.)+[A-Z]([a-z])+$' }
-
-  it 'takes under a second' do
-    expect { Timeout.timeout(1) { subject } }.not_to raise_error
-  end
-end
diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
deleted file mode 100644
index 39e94ad53de..00000000000
--- a/spec/support/markdown_feature.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-# This is a helper class used by the GitLab Markdown feature spec
-#
-# Because the feature spec only cares about the output of the Markdown, and the
-# test setup and teardown and parsing is fairly expensive, we only want to do it
-# once. Unfortunately RSpec will not let you access `let`s in a `before(:all)`
-# block, so we fake it by encapsulating all the shared setup in this class.
-#
-# The class renders `spec/fixtures/markdown.md.erb` using ERB, allowing for
-# reference to the factory-created objects.
-class MarkdownFeature
-  include FactoryBot::Syntax::Methods
-
-  def user
-    @user ||= create(:user)
-  end
-
-  def group
-    @group ||= create(:group).tap do |group|
-      group.add_developer(user)
-    end
-  end
-
-  # Direct references ----------------------------------------------------------
-
-  def project
-    @project ||= create(:project, :repository, group: group).tap do |project|
-      project.add_master(user)
-    end
-  end
-
-  def project_wiki
-    @project_wiki ||= ProjectWiki.new(project, user)
-  end
-
-  def project_wiki_page
-    @project_wiki_page ||= build(:wiki_page, wiki: project_wiki)
-  end
-
-  def issue
-    @issue ||= create(:issue, project: project)
-  end
-
-  def merge_request
-    @merge_request ||= create(:merge_request, :simple, source_project: project)
-  end
-
-  def snippet
-    @snippet ||= create(:project_snippet, project: project)
-  end
-
-  def commit
-    @commit ||= project.commit
-  end
-
-  def commit_range
-    @commit_range ||= begin
-      commit2 = project.commit('HEAD~3')
-      CommitRange.new("#{commit.id}...#{commit2.id}", project)
-    end
-  end
-
-  def simple_label
-    @simple_label ||= create(:label, name: 'gfm', project: project)
-  end
-
-  def label
-    @label ||= create(:label, name: 'awaiting feedback', project: project)
-  end
-
-  def simple_milestone
-    @simple_milestone ||= create(:milestone, name: 'gfm-milestone', project: project)
-  end
-
-  def milestone
-    @milestone ||= create(:milestone, name: 'next goal', project: project)
-  end
-
-  def group_milestone
-    @group_milestone ||= create(:milestone, name: 'group-milestone', group: group)
-  end
-
-  # Cross-references -----------------------------------------------------------
-
-  def xproject
-    @xproject ||= begin
-      group = create(:group, :nested)
-      create(:project, :repository, namespace: group) do |project|
-        project.add_developer(user)
-      end
-    end
-  end
-
-  def xissue
-    @xissue ||= create(:issue, project: xproject)
-  end
-
-  def xmerge_request
-    @xmerge_request ||= create(:merge_request, :simple, source_project: xproject)
-  end
-
-  def xsnippet
-    @xsnippet ||= create(:project_snippet, project: xproject)
-  end
-
-  def xcommit
-    @xcommit ||= xproject.commit
-  end
-
-  def xcommit_range
-    @xcommit_range ||= begin
-      xcommit2 = xproject.commit('HEAD~2')
-      CommitRange.new("#{xcommit.id}...#{xcommit2.id}", xproject)
-    end
-  end
-
-  def xmilestone
-    @xmilestone ||= create(:milestone, project: xproject)
-  end
-
-  def urls
-    Gitlab::Routing.url_helpers
-  end
-
-  def raw_markdown
-    markdown = File.read(Rails.root.join('spec/fixtures/markdown.md.erb'))
-    ERB.new(markdown).result(binding)
-  end
-end
diff --git a/spec/support/matchers/background_migrations_matchers.rb b/spec/support/matchers/background_migrations_matchers.rb
new file mode 100644
index 00000000000..f4127efc6ae
--- /dev/null
+++ b/spec/support/matchers/background_migrations_matchers.rb
@@ -0,0 +1,26 @@
+RSpec::Matchers.define :be_scheduled_delayed_migration do |delay, *expected|
+  match do |migration|
+    BackgroundMigrationWorker.jobs.any? do |job|
+      job['args'] == [migration, expected] &&
+        job['at'].to_i == (delay.to_i + Time.now.to_i)
+    end
+  end
+
+  failure_message do |migration|
+    "Migration `#{migration}` with args `#{expected.inspect}` " \
+      'not scheduled in expected time!'
+  end
+end
+
+RSpec::Matchers.define :be_scheduled_migration do |*expected|
+  match do |migration|
+    BackgroundMigrationWorker.jobs.any? do |job|
+      args = job['args'].size == 1 ? [BackgroundMigrationWorker.jobs[0]['args'][0], []] : job['args']
+      args == [migration, expected]
+    end
+  end
+
+  failure_message do |migration|
+    "Migration `#{migration}` with args `#{expected.inspect}` not scheduled!"
+  end
+end
diff --git a/spec/support/matchers/exceed_query_limit.rb b/spec/support/matchers/exceed_query_limit.rb
new file mode 100644
index 00000000000..88d22a3ddd9
--- /dev/null
+++ b/spec/support/matchers/exceed_query_limit.rb
@@ -0,0 +1,64 @@
+RSpec::Matchers.define :exceed_query_limit do |expected|
+  supports_block_expectations
+
+  match do |block|
+    @subject_block = block
+    actual_count > expected_count + threshold
+  end
+
+  failure_message_when_negated do |actual|
+    threshold_message = threshold > 0 ? " (+#{@threshold})" : ''
+    counts = "#{expected_count}#{threshold_message}"
+    "Expected a maximum of #{counts} queries, got #{actual_count}:\n\n#{log_message}"
+  end
+
+  def with_threshold(threshold)
+    @threshold = threshold
+    self
+  end
+
+  def for_query(query)
+    @query = query
+    self
+  end
+
+  def threshold
+    @threshold.to_i
+  end
+
+  def expected_count
+    if expected.is_a?(ActiveRecord::QueryRecorder)
+      expected.count
+    else
+      expected
+    end
+  end
+
+  def actual_count
+    @actual_count ||= if @query
+                        recorder.log.select { |recorded| recorded =~ @query }.size
+                      else
+                        recorder.count
+                      end
+  end
+
+  def recorder
+    @recorder ||= ActiveRecord::QueryRecorder.new(&@subject_block)
+  end
+
+  def count_queries(queries)
+    queries.each_with_object(Hash.new(0)) { |query, counts| counts[query] += 1 }
+  end
+
+  def log_message
+    if expected.is_a?(ActiveRecord::QueryRecorder)
+      counts = count_queries(expected.log)
+      extra_queries = @recorder.log.reject { |query| counts[query] -= 1 unless counts[query].zero? }
+      extra_queries_display = count_queries(extra_queries).map { |query, count| "[#{count}] #{query}" }
+
+      (['Extra queries:'] + extra_queries_display).join("\n\n")
+    else
+      @recorder.log_message
+    end
+  end
+end
diff --git a/spec/support/mentionable_shared_examples.rb b/spec/support/mentionable_shared_examples.rb
deleted file mode 100644
index 1685decbe94..00000000000
--- a/spec/support/mentionable_shared_examples.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-# Specifications for behavior common to all Mentionable implementations.
-# Requires a shared context containing:
-# - subject { "the mentionable implementation" }
-# - let(:backref_text) { "the way that +subject+ should refer to itself in backreferences " }
-# - let(:set_mentionable_text) { lambda { |txt| "block that assigns txt to the subject's mentionable_text" } }
-
-shared_context 'mentionable context' do
-  let(:project) { subject.project }
-  let(:author)  { subject.author }
-
-  let(:mentioned_issue)  { create(:issue, project: project) }
-  let!(:mentioned_mr)     { create(:merge_request, source_project: project) }
-  let(:mentioned_commit) { project.commit("HEAD~1") }
-
-  let(:ext_proj)   { create(:project, :public, :repository) }
-  let(:ext_issue)  { create(:issue, project: ext_proj) }
-  let(:ext_mr)     { create(:merge_request, :simple, source_project: ext_proj) }
-  let(:ext_commit) { ext_proj.commit("HEAD~2") }
-
-  # Override to add known commits to the repository stub.
-  let(:extra_commits) { [] }
-
-  # A string that mentions each of the +mentioned_.*+ objects above. Mentionables should add a self-reference
-  # to this string and place it in their +mentionable_text+.
-  let(:ref_string) do
-    <<-MSG.strip_heredoc
-      These references are new:
-        Issue:  #{mentioned_issue.to_reference}
-        Merge:  #{mentioned_mr.to_reference}
-        Commit: #{mentioned_commit.to_reference}
-
-      This reference is a repeat and should only be mentioned once:
-        Repeat: #{mentioned_issue.to_reference}
-
-      These references are cross-referenced:
-        Issue:  #{ext_issue.to_reference(project)}
-        Merge:  #{ext_mr.to_reference(project)}
-        Commit: #{ext_commit.to_reference(project)}
-
-      This is a self-reference and should not be mentioned at all:
-        Self: #{backref_text}
-    MSG
-  end
-
-  before do
-    # Wire the project's repository to return the mentioned commit, and +nil+
-    # for any unrecognized commits.
-    allow_any_instance_of(::Repository).to receive(:commit).and_call_original
-    allow_any_instance_of(::Repository).to receive(:commit).with(mentioned_commit.short_id).and_return(mentioned_commit)
-    extra_commits.each do |commit|
-      allow_any_instance_of(::Repository).to receive(:commit).with(commit.short_id).and_return(commit)
-    end
-
-    set_mentionable_text.call(ref_string)
-
-    project.add_developer(author)
-  end
-end
-
-shared_examples 'a mentionable' do
-  include_context 'mentionable context'
-
-  it 'generates a descriptive back-reference' do
-    expect(subject.gfm_reference).to eq(backref_text)
-  end
-
-  it "extracts references from its reference property" do
-    # De-duplicate and omit itself
-    refs = subject.referenced_mentionables
-    expect(refs.size).to eq(6)
-    expect(refs).to include(mentioned_issue)
-    expect(refs).to include(mentioned_mr)
-    expect(refs).to include(mentioned_commit)
-    expect(refs).to include(ext_issue)
-    expect(refs).to include(ext_mr)
-    expect(refs).to include(ext_commit)
-  end
-
-  it 'creates cross-reference notes' do
-    mentioned_objects = [mentioned_issue, mentioned_mr, mentioned_commit,
-                         ext_issue, ext_mr, ext_commit]
-
-    mentioned_objects.each do |referenced|
-      expect(SystemNoteService).to receive(:cross_reference)
-        .with(referenced, subject.local_reference, author)
-    end
-
-    subject.create_cross_references!
-  end
-end
-
-shared_examples 'an editable mentionable' do
-  include_context 'mentionable context'
-
-  it_behaves_like 'a mentionable'
-
-  let(:new_issues) do
-    [create(:issue, project: project), create(:issue, project: ext_proj)]
-  end
-
-  it 'creates new cross-reference notes when the mentionable text is edited' do
-    subject.save
-    subject.create_cross_references!
-
-    new_text = <<-MSG.strip_heredoc
-      These references already existed:
-
-      Issue:  #{mentioned_issue.to_reference}
-
-      Commit: #{mentioned_commit.to_reference}
-
-      ---
-
-      This cross-project reference already existed:
-
-      Issue:  #{ext_issue.to_reference(project)}
-
-      ---
-
-      These two references are introduced in an edit:
-
-      Issue: #{new_issues[0].to_reference}
-
-      Cross: #{new_issues[1].to_reference(project)}
-    MSG
-
-    # These three objects were already referenced, and should not receive new
-    # notes
-    [mentioned_issue, mentioned_commit, ext_issue].each do |oldref|
-      expect(SystemNoteService).not_to receive(:cross_reference)
-        .with(oldref, any_args)
-    end
-
-    # These two issues are new and should receive reference notes
-    # In the case of MergeRequests remember that cannot mention commits included in the MergeRequest
-    new_issues.each do |newref|
-      expect(SystemNoteService).to receive(:cross_reference)
-        .with(newref, subject.local_reference, author)
-    end
-
-    set_mentionable_text.call(new_text)
-    subject.create_new_cross_references!(author)
-  end
-end
diff --git a/spec/support/merge_request_helpers.rb b/spec/support/merge_request_helpers.rb
deleted file mode 100644
index 772adff4626..00000000000
--- a/spec/support/merge_request_helpers.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module MergeRequestHelpers
-  def visit_merge_requests(project, opts = {})
-    visit project_merge_requests_path project, opts
-  end
-
-  def first_merge_request
-    page.all('ul.mr-list > li').first.text
-  end
-
-  def last_merge_request
-    page.all('ul.mr-list > li').last.text
-  end
-
-  def expect_mr_list_count(open_count, closed_count = 0)
-    all_count = open_count + closed_count
-
-    expect(page).to have_issuable_counts(open: open_count, closed: closed_count, all: all_count)
-    page.within '.mr-list' do
-      expect(page).to have_selector('.merge-request', count: open_count)
-    end
-  end
-end
diff --git a/spec/support/migrations_helpers.rb b/spec/support/migrations_helpers.rb
deleted file mode 100644
index 5d6f662e8fe..00000000000
--- a/spec/support/migrations_helpers.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-module MigrationsHelpers
-  def table(name)
-    Class.new(ActiveRecord::Base) do
-      self.table_name = name
-      self.inheritance_column = :_type_disabled
-    end
-  end
-
-  def migrations_paths
-    ActiveRecord::Migrator.migrations_paths
-  end
-
-  def table_exists?(name)
-    ActiveRecord::Base.connection.table_exists?(name)
-  end
-
-  def migrations
-    ActiveRecord::Migrator.migrations(migrations_paths)
-  end
-
-  def clear_schema_cache!
-    ActiveRecord::Base.connection_pool.connections.each do |conn|
-      conn.schema_cache.clear!
-    end
-  end
-
-  def reset_column_in_all_models
-    clear_schema_cache!
-
-    # Reset column information for the most offending classes **after** we
-    # migrated the schema up, otherwise, column information could be
-    # outdated. We have a separate method for this so we can override it in EE.
-    ActiveRecord::Base.descendants.each(&method(:reset_column_information))
-
-    # Without that, we get errors because of missing attributes, e.g.
-    # super: no superclass method `elasticsearch_indexing' for #<ApplicationSetting:0x00007f85628508d8>
-    ApplicationSetting.define_attribute_methods
-  end
-
-  def reset_column_information(klass)
-    klass.reset_column_information
-  end
-
-  def previous_migration
-    migrations.each_cons(2) do |previous, migration|
-      break previous if migration.name == described_class.name
-    end
-  end
-
-  def migration_schema_version
-    metadata_schema = self.class.metadata[:schema]
-
-    if metadata_schema == :latest
-      migrations.last.version
-    else
-      metadata_schema || previous_migration.version
-    end
-  end
-
-  def schema_migrate_down!
-    disable_migrations_output do
-      ActiveRecord::Migrator.migrate(migrations_paths,
-                                     migration_schema_version)
-    end
-
-    reset_column_in_all_models
-  end
-
-  def schema_migrate_up!
-    reset_column_in_all_models
-
-    disable_migrations_output do
-      ActiveRecord::Migrator.migrate(migrations_paths)
-    end
-
-    reset_column_in_all_models
-  end
-
-  def disable_migrations_output
-    ActiveRecord::Migration.verbose = false
-
-    yield
-  ensure
-    ActiveRecord::Migration.verbose = true
-  end
-
-  def migrate!
-    ActiveRecord::Migrator.up(migrations_paths) do |migration|
-      migration.name == described_class.name
-    end
-  end
-end
diff --git a/spec/support/milestone_tabs_examples.rb b/spec/support/milestone_tabs_examples.rb
deleted file mode 100644
index 70b499198bf..00000000000
--- a/spec/support/milestone_tabs_examples.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-shared_examples 'milestone tabs' do
-  def go(path, extra_params = {})
-    params =
-      case milestone
-      when DashboardMilestone
-        { id: milestone.safe_title, title: milestone.title }
-      when GroupMilestone
-        { group_id: group.to_param, id: milestone.safe_title, title: milestone.title }
-      else
-        { namespace_id: project.namespace.to_param, project_id: project, id: milestone.iid }
-      end
-
-    get path, params.merge(extra_params)
-  end
-
-  describe '#merge_requests' do
-    context 'as html' do
-      before do
-        go(:merge_requests, format: 'html')
-      end
-
-      it 'redirects to milestone#show' do
-        expect(response).to redirect_to(milestone_path)
-      end
-    end
-
-    context 'as json' do
-      before do
-        go(:merge_requests, format: 'json')
-      end
-
-      it 'renders the merge requests tab template to a string' do
-        expect(response).to render_template('shared/milestones/_merge_requests_tab')
-        expect(json_response).to have_key('html')
-      end
-    end
-  end
-
-  describe '#participants' do
-    context 'as html' do
-      before do
-        go(:participants, format: 'html')
-      end
-
-      it 'redirects to milestone#show' do
-        expect(response).to redirect_to(milestone_path)
-      end
-    end
-
-    context 'as json' do
-      before do
-        go(:participants, format: 'json')
-      end
-
-      it 'renders the participants tab template to a string' do
-        expect(response).to render_template('shared/milestones/_participants_tab')
-        expect(json_response).to have_key('html')
-      end
-    end
-  end
-
-  describe '#labels' do
-    context 'as html' do
-      before do
-        go(:labels, format: 'html')
-      end
-
-      it 'redirects to milestone#show' do
-        expect(response).to redirect_to(milestone_path)
-      end
-    end
-
-    context 'as json' do
-      before do
-        go(:labels, format: 'json')
-      end
-
-      it 'renders the labels tab template to a string' do
-        expect(response).to render_template('shared/milestones/_labels_tab')
-        expect(json_response).to have_key('html')
-      end
-    end
-  end
-end
diff --git a/spec/support/mobile_helpers.rb b/spec/support/mobile_helpers.rb
deleted file mode 100644
index 3b9eb84e824..00000000000
--- a/spec/support/mobile_helpers.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module MobileHelpers
-  def resize_screen_xs
-    resize_window(767, 768)
-  end
-
-  def resize_screen_sm
-    resize_window(900, 768)
-  end
-
-  def restore_window_size
-    resize_window(1366, 768)
-  end
-
-  def resize_window(width, height)
-    Capybara.current_session.current_window.resize_to(width, height)
-  end
-end
diff --git a/spec/support/notify_shared_examples.rb b/spec/support/notify_shared_examples.rb
deleted file mode 100644
index e2c23607406..00000000000
--- a/spec/support/notify_shared_examples.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-shared_context 'gitlab email notification' do
-  set(:project) { create(:project, :repository) }
-  set(:recipient) { create(:user, email: 'recipient@example.com') }
-
-  let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
-  let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
-  let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
-  let(:new_user_address) { 'newguy@example.com' }
-
-  before do
-    email = recipient.emails.create(email: "notifications@example.com")
-    recipient.update_attribute(:notification_email, email.email)
-    stub_incoming_email_setting(enabled: true, address: "reply+%{key}@#{Gitlab.config.gitlab.host}")
-  end
-end
-
-shared_context 'reply-by-email is enabled with incoming address without %{key}' do
-  before do
-    stub_incoming_email_setting(enabled: true, address: "reply@#{Gitlab.config.gitlab.host}")
-  end
-end
-
-shared_examples 'a multiple recipients email' do
-  it 'is sent to the given recipient' do
-    is_expected.to deliver_to recipient.notification_email
-  end
-end
-
-shared_examples 'an email sent from GitLab' do
-  it 'has the characteristics of an email sent from GitLab' do
-    sender = subject.header[:from].addrs[0]
-    reply_to = subject.header[:reply_to].addresses
-
-    aggregate_failures do
-      expect(sender.display_name).to eq(gitlab_sender_display_name)
-      expect(sender.address).to eq(gitlab_sender)
-      expect(reply_to).to eq([gitlab_sender_reply_to])
-    end
-  end
-end
-
-shared_examples 'an email that contains a header with author username' do
-  it 'has X-GitLab-Author header containing author\'s username' do
-    is_expected.to have_header 'X-GitLab-Author', user.username
-  end
-end
-
-shared_examples 'an email with X-GitLab headers containing project details' do
-  it 'has X-GitLab-Project headers' do
-    aggregate_failures do
-      is_expected.to have_header('X-GitLab-Project', /#{project.name}/)
-      is_expected.to have_header('X-GitLab-Project-Id', /#{project.id}/)
-      is_expected.to have_header('X-GitLab-Project-Path', /#{project.full_path}/)
-    end
-  end
-end
-
-shared_examples 'a new thread email with reply-by-email enabled' do
-  it 'has the characteristics of a threaded email' do
-    host = Gitlab.config.gitlab.host
-    route_key = "#{model.class.model_name.singular_route_key}_#{model.id}"
-
-    aggregate_failures do
-      is_expected.to have_header('Message-ID', "<#{route_key}@#{host}>")
-      is_expected.to have_header('References', /\A<reply\-.*@#{host}>\Z/ )
-    end
-  end
-end
-
-shared_examples 'a thread answer email with reply-by-email enabled' do
-  include_examples 'an email with X-GitLab headers containing project details'
-
-  it 'has the characteristics of a threaded reply' do
-    host = Gitlab.config.gitlab.host
-    route_key = "#{model.class.model_name.singular_route_key}_#{model.id}"
-
-    aggregate_failures do
-      is_expected.to have_header('Message-ID', /\A<.*@#{host}>\Z/)
-      is_expected.to have_header('In-Reply-To', "<#{route_key}@#{host}>")
-      is_expected.to have_header('References',  /\A<#{route_key}@#{host}> <reply\-.*@#{host}>\Z/ )
-      is_expected.to have_subject(/^Re: /)
-    end
-  end
-end
-
-shared_examples 'an email starting a new thread with reply-by-email enabled' do
-  include_examples 'an email with X-GitLab headers containing project details'
-  include_examples 'a new thread email with reply-by-email enabled'
-
-  context 'when reply-by-email is enabled with incoming address with %{key}' do
-    it 'has a Reply-To header' do
-      is_expected.to have_header 'Reply-To', /<reply+(.*)@#{Gitlab.config.gitlab.host}>\Z/
-    end
-  end
-
-  context 'when reply-by-email is enabled with incoming address without %{key}' do
-    include_context 'reply-by-email is enabled with incoming address without %{key}'
-    include_examples 'a new thread email with reply-by-email enabled'
-
-    it 'has a Reply-To header' do
-      is_expected.to have_header 'Reply-To', /<reply@#{Gitlab.config.gitlab.host}>\Z/
-    end
-  end
-end
-
-shared_examples 'an answer to an existing thread with reply-by-email enabled' do
-  include_examples 'an email with X-GitLab headers containing project details'
-  include_examples 'a thread answer email with reply-by-email enabled'
-
-  context 'when reply-by-email is enabled with incoming address with %{key}' do
-    it 'has a Reply-To header' do
-      is_expected.to have_header 'Reply-To', /<reply+(.*)@#{Gitlab.config.gitlab.host}>\Z/
-    end
-  end
-
-  context 'when reply-by-email is enabled with incoming address without %{key}' do
-    include_context 'reply-by-email is enabled with incoming address without %{key}'
-    include_examples 'a thread answer email with reply-by-email enabled'
-
-    it 'has a Reply-To header' do
-      is_expected.to have_header 'Reply-To', /<reply@#{Gitlab.config.gitlab.host}>\Z/
-    end
-  end
-end
-
-shared_examples 'it should have Gmail Actions links' do
-  it do
-    aggregate_failures do
-      is_expected.to have_body_text('<script type="application/ld+json">')
-      is_expected.to have_body_text('ViewAction')
-    end
-  end
-end
-
-shared_examples 'it should not have Gmail Actions links' do
-  it do
-    aggregate_failures do
-      is_expected.not_to have_body_text('<script type="application/ld+json">')
-      is_expected.not_to have_body_text('ViewAction')
-    end
-  end
-end
-
-shared_examples 'it should show Gmail Actions View Issue link' do
-  it_behaves_like 'it should have Gmail Actions links'
-
-  it { is_expected.to have_body_text('View Issue') }
-end
-
-shared_examples 'it should show Gmail Actions View Merge request link' do
-  it_behaves_like 'it should have Gmail Actions links'
-
-  it { is_expected.to have_body_text('View Merge request') }
-end
-
-shared_examples 'it should show Gmail Actions View Commit link' do
-  it_behaves_like 'it should have Gmail Actions links'
-
-  it { is_expected.to have_body_text('View Commit') }
-end
-
-shared_examples 'an unsubscribeable thread' do
-  it_behaves_like 'an unsubscribeable thread with incoming address without %{key}'
-
-  it 'has a List-Unsubscribe header in the correct format, and a body link' do
-    aggregate_failures do
-      is_expected.to have_header('List-Unsubscribe', /unsubscribe/)
-      is_expected.to have_header('List-Unsubscribe', /mailto/)
-      is_expected.to have_header('List-Unsubscribe', /^<.+,.+>$/)
-      is_expected.to have_body_text('unsubscribe')
-    end
-  end
-end
-
-shared_examples 'an unsubscribeable thread with incoming address without %{key}' do
-  include_context 'reply-by-email is enabled with incoming address without %{key}'
-
-  it 'has a List-Unsubscribe header in the correct format, and a body link' do
-    aggregate_failures do
-      is_expected.to have_header('List-Unsubscribe', /unsubscribe/)
-      is_expected.not_to have_header('List-Unsubscribe', /mailto/)
-      is_expected.to have_header('List-Unsubscribe', /^<[^,]+>$/)
-      is_expected.to have_body_text('unsubscribe')
-    end
-  end
-end
-
-shared_examples 'a user cannot unsubscribe through footer link' do
-  it 'does not have a List-Unsubscribe header or a body link' do
-    aggregate_failures do
-      is_expected.not_to have_header('List-Unsubscribe', /unsubscribe/)
-      is_expected.not_to have_body_text('unsubscribe')
-    end
-  end
-end
-
-shared_examples 'an email with a labels subscriptions link in its footer' do
-  it { is_expected.to have_body_text('label subscriptions') }
-end
diff --git a/spec/support/prepare-gitlab-git-test-for-commit b/spec/support/prepare-gitlab-git-test-for-commit
index 3047786a599..d08e3ba5481 100755
--- a/spec/support/prepare-gitlab-git-test-for-commit
+++ b/spec/support/prepare-gitlab-git-test-for-commit
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 abort unless [
-  system('spec/support/generate-seed-repo-rb', out: 'spec/support/seed_repo.rb'),
+  system('spec/support/generate-seed-repo-rb', out: 'spec/support/helpers/seed_repo.rb'),
   system('spec/support/unpack-gitlab-git-test')
 ].all?
 
diff --git a/spec/support/project_forks_helper.rb b/spec/support/project_forks_helper.rb
deleted file mode 100644
index 2c501a2a27c..00000000000
--- a/spec/support/project_forks_helper.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-module ProjectForksHelper
-  def fork_project(project, user = nil, params = {})
-    # Load the `fork_network` for the project to fork as there might be one that
-    # wasn't loaded yet.
-    project.reload unless project.fork_network
-
-    unless user
-      user = create(:user)
-      project.add_developer(user)
-    end
-
-    unless params[:namespace] || params[:namespace_id]
-      params[:namespace] = create(:group)
-      params[:namespace].add_owner(user)
-    end
-
-    service = Projects::ForkService.new(project, user, params)
-
-    create_repository = params.delete(:repository)
-    # Avoid creating a repository
-    unless create_repository
-      allow(RepositoryForkWorker).to receive(:perform_async).and_return(true)
-      shell = double('gitlab_shell', fork_repository: true)
-      allow(service).to receive(:gitlab_shell).and_return(shell)
-    end
-
-    forked_project = service.execute
-
-    # Reload the both projects so they know about their newly created fork_network
-    if forked_project.persisted?
-      project.reload
-      forked_project.reload
-    end
-
-    if create_repository
-      # The call to project.repository.after_import in RepositoryForkWorker does
-      # not reset the @exists variable of this forked_project.repository
-      # so we have to explicitely call this method to clear the @exists variable.
-      # of the instance we're returning here.
-      forked_project.repository.after_import
-    end
-
-    forked_project
-  end
-
-  def fork_project_with_submodules(project, user = nil, params = {})
-    forked_project = fork_project(project, user, params)
-    TestEnv.copy_repo(forked_project,
-                      bare_repo: TestEnv.forked_repo_path_bare,
-                      refs: TestEnv::FORKED_BRANCH_SHA)
-    forked_project.repository.after_import
-    forked_project
-  end
-end
diff --git a/spec/support/prometheus_helpers.rb b/spec/support/prometheus_helpers.rb
deleted file mode 100644
index 4212be2cc88..00000000000
--- a/spec/support/prometheus_helpers.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-module PrometheusHelpers
-  def prometheus_memory_query(environment_slug)
-    %{avg(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}) / 2^20}
-  end
-
-  def prometheus_cpu_query(environment_slug)
-    %{avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}[2m])) * 100}
-  end
-
-  def prometheus_ping_url(prometheus_query)
-    query = { query: prometheus_query }.to_query
-
-    "https://prometheus.example.com/api/v1/query?#{query}"
-  end
-
-  def prometheus_query_url(prometheus_query)
-    query = { query: prometheus_query }.to_query
-
-    "https://prometheus.example.com/api/v1/query?#{query}"
-  end
-
-  def prometheus_query_with_time_url(prometheus_query, time)
-    query = { query: prometheus_query, time: time.to_f }.to_query
-
-    "https://prometheus.example.com/api/v1/query?#{query}"
-  end
-
-  def prometheus_query_range_url(prometheus_query, start: 8.hours.ago, stop: Time.now.to_f)
-    query = {
-      query: prometheus_query,
-      start: start.to_f,
-      end: stop,
-      step: 1.minute.to_i
-    }.to_query
-
-    "https://prometheus.example.com/api/v1/query_range?#{query}"
-  end
-
-  def prometheus_label_values_url(name)
-    "https://prometheus.example.com/api/v1/label/#{name}/values"
-  end
-
-  def prometheus_series_url(*matches, start: 8.hours.ago, stop: Time.now)
-    query = {
-      match: matches,
-      start: start.to_f,
-      end: stop.to_f
-    }.to_query
-    "https://prometheus.example.com/api/v1/series?#{query}"
-  end
-
-  def stub_prometheus_request(url, body: {}, status: 200)
-    WebMock.stub_request(:get, url)
-      .to_return({
-        status: status,
-        headers: { 'Content-Type' => 'application/json' },
-        body: body.to_json
-      })
-  end
-
-  def stub_prometheus_request_with_exception(url, exception_type)
-    WebMock.stub_request(:get, url).to_raise(exception_type)
-  end
-
-  def stub_all_prometheus_requests(environment_slug, body: nil, status: 200)
-    stub_prometheus_request(
-      prometheus_query_with_time_url(prometheus_memory_query(environment_slug), Time.now.utc),
-      status: status,
-      body: body || prometheus_value_body
-    )
-    stub_prometheus_request(
-      prometheus_query_with_time_url(prometheus_memory_query(environment_slug), 8.hours.ago),
-      status: status,
-      body: body || prometheus_value_body
-    )
-    stub_prometheus_request(
-      prometheus_query_range_url(prometheus_memory_query(environment_slug)),
-      status: status,
-      body: body || prometheus_values_body
-    )
-    stub_prometheus_request(
-      prometheus_query_with_time_url(prometheus_cpu_query(environment_slug), Time.now.utc),
-      status: status,
-      body: body || prometheus_value_body
-    )
-    stub_prometheus_request(
-      prometheus_query_with_time_url(prometheus_cpu_query(environment_slug), 8.hours.ago),
-      status: status,
-      body: body || prometheus_value_body
-    )
-    stub_prometheus_request(
-      prometheus_query_range_url(prometheus_cpu_query(environment_slug)),
-      status: status,
-      body: body || prometheus_values_body
-    )
-  end
-
-  def prometheus_data(last_update: Time.now.utc)
-    {
-      success: true,
-      data: {
-        memory_values: prometheus_values_body('matrix').dig(:data, :result),
-        memory_current: prometheus_value_body('vector').dig(:data, :result),
-        cpu_values: prometheus_values_body('matrix').dig(:data, :result),
-        cpu_current: prometheus_value_body('vector').dig(:data, :result)
-      },
-      last_update: last_update
-    }
-  end
-
-  def prometheus_metrics_data(last_update: Time.now.utc)
-    {
-      success: true,
-      metrics: {
-        memory_values: prometheus_values_body('matrix').dig(:data, :result),
-        memory_current: prometheus_value_body('vector').dig(:data, :result),
-        cpu_values: prometheus_values_body('matrix').dig(:data, :result),
-        cpu_current: prometheus_value_body('vector').dig(:data, :result)
-      },
-      last_update: last_update
-    }
-  end
-
-  def prometheus_empty_body(type)
-    {
-      "status": "success",
-      "data": {
-        "resultType": type,
-        "result": []
-      }
-    }
-  end
-
-  def prometheus_value_body(type = 'vector')
-    {
-      "status": "success",
-      "data": {
-        "resultType": type,
-        "result": [
-          {
-            "metric": {},
-            "value": [
-              1488772511.004,
-              "0.000041021495238095323"
-            ]
-          }
-        ]
-      }
-    }
-  end
-
-  def prometheus_values_body(type = 'matrix')
-    {
-      "status": "success",
-      "data": {
-        "resultType": type,
-        "result": [
-          {
-            "metric": {},
-            "values": [
-              [1488758662.506, "0.00002996364761904785"],
-              [1488758722.506, "0.00003090239047619091"]
-            ]
-          }
-        ]
-      }
-    }
-  end
-
-  def prometheus_label_values
-    {
-      'status': 'success',
-      'data': %w(job_adds job_controller_rate_limiter_use job_depth job_queue_latency job_work_duration_sum up)
-    }
-  end
-
-  def prometheus_series(name)
-    {
-      'status': 'success',
-      'data': [
-        {
-          '__name__': name,
-          'container_name': 'gitlab',
-          'environment': 'mattermost',
-          'id': '/docker/9953982f95cf5010dfc59d7864564d5f188aaecddeda343699783009f89db667',
-          'image': 'gitlab/gitlab-ce:8.15.4-ce.1',
-          'instance': 'minikube',
-          'job': 'kubernetes-nodes',
-          'name': 'k8s_gitlab.e6611886_mattermost-4210310111-77z8r_gitlab_2298ae6b-da24-11e6-baee-8e7f67d0eb3a_43536cb6',
-          'namespace': 'gitlab',
-          'pod_name': 'mattermost-4210310111-77z8r'
-        },
-        {
-          '__name__': name,
-          'id': '/docker',
-          'instance': 'minikube',
-          'job': 'kubernetes-nodes'
-        }
-      ]
-    }
-  end
-end
diff --git a/spec/support/query_recorder.rb b/spec/support/query_recorder.rb
deleted file mode 100644
index 8cf8f45a8b2..00000000000
--- a/spec/support/query_recorder.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-module ActiveRecord
-  class QueryRecorder
-    attr_reader :log, :cached
-
-    def initialize(&block)
-      @log = []
-      @cached = []
-      ActiveSupport::Notifications.subscribed(method(:callback), 'sql.active_record', &block)
-    end
-
-    def show_backtrace(values)
-      Rails.logger.debug("QueryRecorder SQL: #{values[:sql]}")
-      caller.each { |line| Rails.logger.debug("   --> #{line}") }
-    end
-
-    def callback(name, start, finish, message_id, values)
-      show_backtrace(values) if ENV['QUERY_RECORDER_DEBUG']
-
-      if values[:name]&.include?("CACHE")
-        @cached << values[:sql]
-      elsif !values[:name]&.include?("SCHEMA")
-        @log << values[:sql]
-      end
-    end
-
-    def count
-      @log.count
-    end
-
-    def cached_count
-      @cached.count
-    end
-
-    def log_message
-      @log.join("\n\n")
-    end
-  end
-end
-
-RSpec::Matchers.define :exceed_query_limit do |expected|
-  supports_block_expectations
-
-  match do |block|
-    @subject_block = block
-    actual_count > expected_count + threshold
-  end
-
-  failure_message_when_negated do |actual|
-    threshold_message = threshold > 0 ? " (+#{@threshold})" : ''
-    counts = "#{expected_count}#{threshold_message}"
-    "Expected a maximum of #{counts} queries, got #{actual_count}:\n\n#{log_message}"
-  end
-
-  def with_threshold(threshold)
-    @threshold = threshold
-    self
-  end
-
-  def for_query(query)
-    @query = query
-    self
-  end
-
-  def threshold
-    @threshold.to_i
-  end
-
-  def expected_count
-    if expected.is_a?(ActiveRecord::QueryRecorder)
-      expected.count
-    else
-      expected
-    end
-  end
-
-  def actual_count
-    @actual_count ||= if @query
-                        recorder.log.select { |recorded| recorded =~ @query }.size
-                      else
-                        recorder.count
-                      end
-  end
-
-  def recorder
-    @recorder ||= ActiveRecord::QueryRecorder.new(&@subject_block)
-  end
-
-  def count_queries(queries)
-    queries.each_with_object(Hash.new(0)) { |query, counts| counts[query] += 1 }
-  end
-
-  def log_message
-    if expected.is_a?(ActiveRecord::QueryRecorder)
-      counts = count_queries(expected.log)
-      extra_queries = @recorder.log.reject { |query| counts[query] -= 1 unless counts[query].zero? }
-      extra_queries_display = count_queries(extra_queries).map { |query, count| "[#{count}] #{query}" }
-
-      (['Extra queries:'] + extra_queries_display).join("\n\n")
-    else
-      @recorder.log_message
-    end
-  end
-end
diff --git a/spec/support/rake_helpers.rb b/spec/support/rake_helpers.rb
deleted file mode 100644
index 86bfeed107c..00000000000
--- a/spec/support/rake_helpers.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module RakeHelpers
-  def run_rake_task(task_name, *args)
-    Rake::Task[task_name].reenable
-    Rake.application.invoke_task("#{task_name}[#{args.join(',')}]")
-  end
-
-  def stub_warn_user_is_not_gitlab
-    allow(main_object).to receive(:warn_user_is_not_gitlab)
-  end
-
-  def silence_output
-    allow(main_object).to receive(:puts)
-    allow(main_object).to receive(:print)
-  end
-
-  def main_object
-    @main_object ||= TOPLEVEL_BINDING.eval('self')
-  end
-end
diff --git a/spec/support/reactive_caching_helpers.rb b/spec/support/reactive_caching_helpers.rb
deleted file mode 100644
index e22dd974c6a..00000000000
--- a/spec/support/reactive_caching_helpers.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-module ReactiveCachingHelpers
-  def reactive_cache_key(subject, *qualifiers)
-    ([subject.class.reactive_cache_key.call(subject)].flatten + qualifiers).join(':')
-  end
-
-  def alive_reactive_cache_key(subject, *qualifiers)
-    reactive_cache_key(subject, *(qualifiers + ['alive']))
-  end
-
-  def stub_reactive_cache(subject = nil, data = nil, *qualifiers)
-    allow(ReactiveCachingWorker).to receive(:perform_async)
-    allow(ReactiveCachingWorker).to receive(:perform_in)
-    write_reactive_cache(subject, data, *qualifiers) if data
-  end
-
-  def synchronous_reactive_cache(subject)
-    allow(service).to receive(:with_reactive_cache) do |*args, &block|
-      block.call(service.calculate_reactive_cache(*args))
-    end
-  end
-
-  def read_reactive_cache(subject, *qualifiers)
-    Rails.cache.read(reactive_cache_key(subject, *qualifiers))
-  end
-
-  def write_reactive_cache(subject, data, *qualifiers)
-    start_reactive_cache_lifetime(subject, *qualifiers)
-    Rails.cache.write(reactive_cache_key(subject, *qualifiers), data)
-  end
-
-  def reactive_cache_alive?(subject, *qualifiers)
-    Rails.cache.read(alive_reactive_cache_key(subject, *qualifiers))
-  end
-
-  def invalidate_reactive_cache(subject, *qualifiers)
-    Rails.cache.delete(alive_reactive_cache_key(subject, *qualifiers))
-  end
-
-  def start_reactive_cache_lifetime(subject, *qualifiers)
-    Rails.cache.write(alive_reactive_cache_key(subject, *qualifiers), true)
-  end
-
-  def expect_reactive_cache_update_queued(subject)
-    expect(ReactiveCachingWorker)
-      .to receive(:perform_in)
-      .with(subject.class.reactive_cache_refresh_interval, subject.class, subject.id)
-  end
-end
diff --git a/spec/support/redis_without_keys.rb b/spec/support/redis_without_keys.rb
deleted file mode 100644
index 6220167dee6..00000000000
--- a/spec/support/redis_without_keys.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class Redis
-  ForbiddenCommand = Class.new(StandardError)
-
-  def keys(*args)
-    raise ForbiddenCommand.new("Don't use `Redis#keys` as it iterates over all "\
-                               "keys in redis. Use `Redis#scan_each` instead.")
-  end
-end
diff --git a/spec/support/reference_parser_helpers.rb b/spec/support/reference_parser_helpers.rb
deleted file mode 100644
index c01897ed1a1..00000000000
--- a/spec/support/reference_parser_helpers.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module ReferenceParserHelpers
-  def empty_html_link
-    Nokogiri::HTML.fragment('<a></a>').children[0]
-  end
-
-  shared_examples 'no N+1 queries' do
-    it 'avoids N+1 queries in #nodes_visible_to_user', :request_store do
-      context = Banzai::RenderContext.new(project, user)
-
-      record_queries = lambda do |links|
-        ActiveRecord::QueryRecorder.new do
-          described_class.new(context).nodes_visible_to_user(user, links)
-        end
-      end
-
-      control = record_queries.call(control_links)
-      actual = record_queries.call(actual_links)
-
-      expect(actual.count).to be <= control.count
-      expect(actual.cached_count).to be <= control.cached_count
-    end
-
-    it 'avoids N+1 queries in #records_for_nodes', :request_store do
-      context = Banzai::RenderContext.new(project, user)
-
-      record_queries = lambda do |links|
-        ActiveRecord::QueryRecorder.new do
-          described_class.new(context).records_for_nodes(links)
-        end
-      end
-
-      control = record_queries.call(control_links)
-      actual = record_queries.call(actual_links)
-
-      expect(actual.count).to be <= control.count
-      expect(actual.cached_count).to be <= control.cached_count
-    end
-  end
-end
diff --git a/spec/support/reference_parser_shared_examples.rb b/spec/support/reference_parser_shared_examples.rb
deleted file mode 100644
index baf8bcc04b8..00000000000
--- a/spec/support/reference_parser_shared_examples.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-RSpec.shared_examples "referenced feature visibility" do |*related_features|
-  let(:feature_fields) do
-    related_features.map { |feature| (feature + "_access_level").to_sym }
-  end
-
-  before do
-    link['data-project'] = project.id.to_s
-  end
-
-  context "when feature is disabled" do
-    it "does not create reference" do
-      set_features_fields_to(ProjectFeature::DISABLED)
-      expect(subject.nodes_visible_to_user(user, [link])).to eq([])
-    end
-  end
-
-  context "when feature is enabled only for team members" do
-    before do
-      set_features_fields_to(ProjectFeature::PRIVATE)
-    end
-
-    it "does not create reference for non member" do
-      non_member = create(:user)
-
-      expect(subject.nodes_visible_to_user(non_member, [link])).to eq([])
-    end
-
-    it "creates reference for member" do
-      project.add_developer(user)
-
-      expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
-    end
-  end
-
-  context "when feature is enabled" do
-    # The project is public
-    it "creates reference" do
-      set_features_fields_to(ProjectFeature::ENABLED)
-
-      expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
-    end
-  end
-
-  def set_features_fields_to(visibility_level)
-    feature_fields.each { |field| project.project_feature.update_attribute(field, visibility_level) }
-  end
-end
diff --git a/spec/support/repo_helpers.rb b/spec/support/repo_helpers.rb
deleted file mode 100644
index 3c6956cf5e0..00000000000
--- a/spec/support/repo_helpers.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-module RepoHelpers
-  extend self
-
-  # Text file in repo
-  #
-  # Ex.
-  #
-  #   # Get object
-  #   blob = RepoHelpers.text_blob
-  #
-  #   blob.path # => 'files/js/commit.js.coffee'
-  #   blob.data # => 'class Commit...'
-  #
-  def sample_blob
-    OpenStruct.new(
-      oid: '5f53439ca4b009096571d3c8bc3d09d30e7431b3',
-      path: "files/js/commit.js.coffee",
-      data: <<eos
-class Commit
-  constructor: ->
-    $('.files .diff-file').each ->
-      new CommitFile(this)
-
-@Commit = Commit
-eos
-    )
-  end
-
-  def sample_commit
-    OpenStruct.new(
-      id: "570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
-      parent_id: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9',
-      author_full_name: "Dmitriy Zaporozhets",
-      author_email: "dmitriy.zaporozhets@gmail.com",
-      files_changed_count: 2,
-      line_code: '2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_14',
-      line_code_path: 'files/ruby/popen.rb',
-      del_line_code: '2f6fcd96b88b36ce98c38da085c795a27d92a3dd_13_13',
-      message: <<eos
-Change some files
-Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-eos
-    )
-  end
-
-  def another_sample_commit
-    OpenStruct.new(
-      id: "e56497bb5f03a90a51293fc6d516788730953899",
-      parent_id: '4cd80ccab63c82b4bad16faa5193fbd2aa06df40',
-      author_full_name: "Sytse Sijbrandij",
-      author_email: "sytse@gitlab.com",
-      files_changed_count: 1,
-      message: <<eos
-Add directory structure for tree_helper spec
-
-This directory structure is needed for a testing the method flatten_tree(tree) in the TreeHelper module
-
-See [merge request #275](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/275#note_732774)
-
-See merge request !2
-eos
-    )
-  end
-
-  def sample_big_commit
-    OpenStruct.new(
-      id: "913c66a37b4a45b9769037c55c2d238bd0942d2e",
-      author_full_name: "Dmitriy Zaporozhets",
-      author_email: "dmitriy.zaporozhets@gmail.com",
-      message: <<eos
-Files, encoding and much more
-Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-eos
-    )
-  end
-
-  def sample_image_commit
-    OpenStruct.new(
-      id: "2f63565e7aac07bcdadb654e253078b727143ec4",
-      author_full_name: "Dmitriy Zaporozhets",
-      author_email: "dmitriy.zaporozhets@gmail.com",
-      old_blob_id: '33f3729a45c02fc67d00adb1b8bca394b0e761d9',
-      new_blob_id: '2f63565e7aac07bcdadb654e253078b727143ec4',
-      message: <<eos
-Modified image
-Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-eos
-    )
-  end
-
-  def sample_compare
-    changes = [
-      {
-        line_code: 'a5cc2925ca8258af241be7e5b0381edf30266302_20_20',
-        file_path: '.gitignore'
-      },
-      {
-        line_code: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44_4_6',
-        file_path: '.gitmodules'
-      }
-    ]
-
-    commits = %w(
-      5937ac0a7beb003549fc5fd26fc247adbce4a52e
-      570e7b2abdd848b95f2f578043fc23bd6f6fd24d
-      6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-      d14d6c0abdd253381df51a723d58691b2ee1ab08
-      c1acaa58bbcbc3eafe538cb8274ba387047b69f8
-    ).reverse # last commit is recent one
-
-    OpenStruct.new(
-      source_branch: 'master',
-      target_branch: 'feature',
-      changes: changes,
-      commits: commits
-    )
-  end
-end
diff --git a/spec/support/routing_helpers.rb b/spec/support/routing_helpers.rb
deleted file mode 100644
index af1f4760804..00000000000
--- a/spec/support/routing_helpers.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.include GitlabRoutingHelper
-end
diff --git a/spec/support/rspec.rb b/spec/support/rspec.rb
new file mode 100644
index 00000000000..dffab22d8b5
--- /dev/null
+++ b/spec/support/rspec.rb
@@ -0,0 +1,12 @@
+require_relative "helpers/stub_configuration"
+require_relative "helpers/stub_object_storage"
+require_relative "helpers/stub_env"
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.raise_errors_for_deprecations!
+
+  config.include StubConfiguration
+  config.include StubObjectStorage
+  config.include StubENV
+end
diff --git a/spec/support/search_helpers.rb b/spec/support/search_helpers.rb
deleted file mode 100644
index abbbb636d66..00000000000
--- a/spec/support/search_helpers.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module SearchHelpers
-  def select_filter(name)
-    find(:xpath, "//ul[contains(@class, 'search-filter')]//a[contains(.,'#{name}')]").click
-  end
-end
diff --git a/spec/support/seed.rb b/spec/support/seed.rb
new file mode 100644
index 00000000000..bea2e9c3044
--- /dev/null
+++ b/spec/support/seed.rb
@@ -0,0 +1,7 @@
+RSpec.configure do |config|
+  config.include SeedHelper, :seed_helper
+
+  config.before(:all, :seed_helper) do
+    ensure_seeds
+  end
+end
diff --git a/spec/support/seed_helper.rb b/spec/support/seed_helper.rb
deleted file mode 100644
index 11ef1fc477f..00000000000
--- a/spec/support/seed_helper.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require_relative 'test_env'
-
-# This file is specific to specs in spec/lib/gitlab/git/
-
-SEED_STORAGE_PATH      = TestEnv.repos_path
-TEST_REPO_PATH         = 'gitlab-git-test.git'.freeze
-TEST_NORMAL_REPO_PATH  = 'not-bare-repo.git'.freeze
-TEST_MUTABLE_REPO_PATH = 'mutable-repo.git'.freeze
-TEST_BROKEN_REPO_PATH  = 'broken-repo.git'.freeze
-
-module SeedHelper
-  GITLAB_GIT_TEST_REPO_URL = File.expand_path('../gitlab-git-test.git', __FILE__).freeze
-
-  def ensure_seeds
-    if File.exist?(SEED_STORAGE_PATH)
-      FileUtils.rm_r(SEED_STORAGE_PATH)
-    end
-
-    FileUtils.mkdir_p(SEED_STORAGE_PATH)
-
-    create_bare_seeds
-    create_normal_seeds
-    create_mutable_seeds
-    create_broken_seeds
-    create_git_attributes
-    create_invalid_git_attributes
-  end
-
-  def create_bare_seeds
-    system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{GITLAB_GIT_TEST_REPO_URL}),
-           chdir: SEED_STORAGE_PATH,
-           out:   '/dev/null',
-           err:   '/dev/null')
-  end
-
-  def create_normal_seeds
-    system(git_env, *%W(#{Gitlab.config.git.bin_path} clone #{TEST_REPO_PATH} #{TEST_NORMAL_REPO_PATH}),
-           chdir: SEED_STORAGE_PATH,
-           out: '/dev/null',
-           err: '/dev/null')
-  end
-
-  def create_mutable_seeds
-    system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{TEST_REPO_PATH} #{TEST_MUTABLE_REPO_PATH}),
-           chdir: SEED_STORAGE_PATH,
-           out: '/dev/null',
-           err: '/dev/null')
-
-    mutable_repo_full_path = File.join(SEED_STORAGE_PATH, TEST_MUTABLE_REPO_PATH)
-    system(git_env, *%W(#{Gitlab.config.git.bin_path} branch -t feature origin/feature),
-           chdir: mutable_repo_full_path, out: '/dev/null', err: '/dev/null')
-
-    system(git_env, *%W(#{Gitlab.config.git.bin_path} remote add expendable #{GITLAB_GIT_TEST_REPO_URL}),
-           chdir: mutable_repo_full_path, out: '/dev/null', err: '/dev/null')
-  end
-
-  def create_broken_seeds
-    system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{TEST_REPO_PATH} #{TEST_BROKEN_REPO_PATH}),
-           chdir: SEED_STORAGE_PATH,
-           out: '/dev/null',
-           err: '/dev/null')
-
-    refs_path = File.join(SEED_STORAGE_PATH, TEST_BROKEN_REPO_PATH, 'refs')
-
-    FileUtils.rm_r(refs_path)
-  end
-
-  def create_git_attributes
-    dir = File.join(SEED_STORAGE_PATH, 'with-git-attributes.git', 'info')
-
-    FileUtils.mkdir_p(dir)
-
-    File.open(File.join(dir, 'attributes'), 'w') do |handle|
-      handle.write <<-EOF.strip
-# This is a comment, it should be ignored.
-
-*.txt     text
-*.jpg     -text
-*.sh      eol=lf gitlab-language=shell
-*.haml.*  gitlab-language=haml
-foo/bar.* foo
-*.cgi     key=value?p1=v1&p2=v2
-/*.png    gitlab-language=png
-*.binary  binary
-
-# This uses a tab instead of spaces to ensure the parser also supports this.
-*.md\tgitlab-language=markdown
-bla/bla.txt
-      EOF
-    end
-  end
-
-  def create_invalid_git_attributes
-    dir = File.join(SEED_STORAGE_PATH, 'with-invalid-git-attributes.git', 'info')
-
-    FileUtils.mkdir_p(dir)
-
-    enc = Encoding::UTF_16
-
-    File.open(File.join(dir, 'attributes'), 'w', encoding: enc) do |handle|
-      handle.write('# hello'.encode(enc))
-    end
-  end
-
-  # Prevent developer git configurations from being persisted to test
-  # repositories
-  def git_env
-    { 'GIT_TEMPLATE_DIR' => '' }
-  end
-end
-
-RSpec.configure do |config|
-  config.include SeedHelper, :seed_helper
-
-  config.before(:all, :seed_helper) do
-    ensure_seeds
-  end
-end
diff --git a/spec/support/seed_repo.rb b/spec/support/seed_repo.rb
deleted file mode 100644
index b4868e82cd7..00000000000
--- a/spec/support/seed_repo.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-# This file is generated by generate-seed-repo-rb. Do not edit this file manually.
-#
-# Seed repo:
-# 4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 Merge branch 'master' into 'master'
-# 0e1b353b348f8477bdbec1ef47087171c5032cd9 adds an executable with different permissions
-# 0e50ec4d3c7ce42ab74dda1d422cb2cbffe1e326 Merge branch 'lfs_pointers' into 'master'
-# 33bcff41c232a11727ac6d660bd4b0c2ba86d63d Add valid and invalid lfs pointers
-# 732401c65e924df81435deb12891ef570167d2e2 Update year in license file
-# b0e52af38d7ea43cf41d8a6f2471351ac036d6c9 Empty commit
-# 40f4a7a617393735a95a0bb67b08385bc1e7c66d Add ISO-8859-encoded file
-# 66028349a123e695b589e09a36634d976edcc5e8 Merge branch 'add-comments-to-gitmodules' into 'master'
-# de5714f34c4e34f1d50b9a61a2e6c9132fe2b5fd Add comments to the end of .gitmodules to test parsing
-# fa1b1e6c004a68b7d8763b86455da9e6b23e36d6 Merge branch 'add-files' into 'master'
-# eb49186cfa5c4338011f5f590fac11bd66c5c631 Add submodules nested deeper than the root
-# 18d9c205d0d22fdf62bc2f899443b83aafbf941f Add executables and links files
-# 5937ac0a7beb003549fc5fd26fc247adbce4a52e Add submodule from gitlab.com
-# 570e7b2abdd848b95f2f578043fc23bd6f6fd24d Change some files
-# 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 More submodules
-# d14d6c0abdd253381df51a723d58691b2ee1ab08 Remove ds_store files
-# c1acaa58bbcbc3eafe538cb8274ba387047b69f8 Ignore DS files
-# ae73cb07c9eeaf35924a10f713b364d32b2dd34f Binary file added
-# 874797c3a73b60d2187ed6e2fcabd289ff75171e Ruby files modified
-# 2f63565e7aac07bcdadb654e253078b727143ec4 Modified image
-# 33f3729a45c02fc67d00adb1b8bca394b0e761d9 Image added
-# 913c66a37b4a45b9769037c55c2d238bd0942d2e Files, encoding and much more
-# cfe32cf61b73a0d5e9f13e774abde7ff789b1660 Add submodule
-# 6d394385cf567f80a8fd85055db1ab4c5295806f Added contributing guide
-# 1a0b36b3cdad1d2ee32457c102a8c0b7056fa863 Initial commit
-
-module SeedRepo
-  module BigCommit
-    ID               = "913c66a37b4a45b9769037c55c2d238bd0942d2e".freeze
-    PARENT_ID        = "cfe32cf61b73a0d5e9f13e774abde7ff789b1660".freeze
-    MESSAGE          = "Files, encoding and much more".freeze
-    AUTHOR_FULL_NAME = "Dmitriy Zaporozhets".freeze
-    FILES_COUNT      = 2
-  end
-
-  module Commit
-    ID               = "570e7b2abdd848b95f2f578043fc23bd6f6fd24d".freeze
-    PARENT_ID        = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9".freeze
-    MESSAGE          = "Change some files\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n".freeze
-    AUTHOR_FULL_NAME = "Dmitriy Zaporozhets".freeze
-    FILES            = ["files/ruby/popen.rb", "files/ruby/regex.rb"].freeze
-    FILES_COUNT      = 2
-    C_FILE_PATH      = "files/ruby".freeze
-    C_FILES          = ["popen.rb", "regex.rb", "version_info.rb"].freeze
-    BLOB_FILE        = %{%h3= @key.title\n%hr\n%pre= @key.key\n.actions\n  = link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => \"btn danger delete-key\"\n\n\n}.freeze
-    BLOB_FILE_PATH   = "app/views/keys/show.html.haml".freeze
-  end
-
-  module EmptyCommit
-    ID               = "b0e52af38d7ea43cf41d8a6f2471351ac036d6c9".freeze
-    PARENT_ID        = "40f4a7a617393735a95a0bb67b08385bc1e7c66d".freeze
-    MESSAGE          = "Empty commit".freeze
-    AUTHOR_FULL_NAME = "Rémy Coutable".freeze
-    FILES            = [].freeze
-    FILES_COUNT      = FILES.count
-  end
-
-  module EncodingCommit
-    ID               = "40f4a7a617393735a95a0bb67b08385bc1e7c66d".freeze
-    PARENT_ID        = "66028349a123e695b589e09a36634d976edcc5e8".freeze
-    MESSAGE          = "Add ISO-8859-encoded file".freeze
-    AUTHOR_FULL_NAME = "Stan Hu".freeze
-    FILES            = ["encoding/iso8859.txt"].freeze
-    FILES_COUNT      = FILES.count
-  end
-
-  module FirstCommit
-    ID               = "1a0b36b3cdad1d2ee32457c102a8c0b7056fa863".freeze
-    PARENT_ID        = nil
-    MESSAGE          = "Initial commit".freeze
-    AUTHOR_FULL_NAME = "Dmitriy Zaporozhets".freeze
-    FILES            = ["LICENSE", ".gitignore", "README.md"].freeze
-    FILES_COUNT      = 3
-  end
-
-  module LastCommit
-    ID               = "4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6".freeze
-    PARENT_ID        = "0e1b353b348f8477bdbec1ef47087171c5032cd9".freeze
-    MESSAGE          = "Merge branch 'master' into 'master'".freeze
-    AUTHOR_FULL_NAME = "Stan Hu".freeze
-    FILES            = ["bin/executable"].freeze
-    FILES_COUNT      = FILES.count
-  end
-
-  module Repo
-    HEAD = "master".freeze
-    BRANCHES = %w[
-      feature
-      fix
-      fix-blob-path
-      fix-existing-submodule-dir
-      fix-mode
-      gitattributes
-      gitattributes-updated
-      master
-      merge-test
-      missing-gitmodules
-    ].freeze
-    TAGS = %w[
-      v1.0.0
-      v1.1.0
-      v1.2.0
-      v1.2.1
-    ].freeze
-  end
-
-  module RubyBlob
-    ID = "7e3e39ebb9b2bf433b4ad17313770fbe4051649c".freeze
-    NAME = "popen.rb".freeze
-    CONTENT = <<-eos.freeze
-require 'fileutils'
-require 'open3'
-
-module Popen
-  extend self
-
-  def popen(cmd, path=nil)
-    unless cmd.is_a?(Array)
-      raise RuntimeError, "System commands must be given as an array of strings"
-    end
-
-    path ||= Dir.pwd
-
-    vars = {
-      "PWD" => path
-    }
-
-    options = {
-      chdir: path
-    }
-
-    unless File.directory?(path)
-      FileUtils.mkdir_p(path)
-    end
-
-    @cmd_output = ""
-    @cmd_status = 0
-
-    Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
-      @cmd_output << stdout.read
-      @cmd_output << stderr.read
-      @cmd_status = wait_thr.value.exitstatus
-    end
-
-    return @cmd_output, @cmd_status
-  end
-end
-    eos
-  end
-end
diff --git a/spec/support/select2_helper.rb b/spec/support/select2_helper.rb
deleted file mode 100644
index 90618ba5b19..00000000000
--- a/spec/support/select2_helper.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Select2 ajax programmatic helper
-# It allows you to select value from select2
-#
-# Params
-#   value - real value of selected item
-#   opts - options containing css selector
-#
-# Usage:
-#
-#   select2(2, from: '#user_ids')
-#
-
-module Select2Helper
-  def select2(value, options = {})
-    raise ArgumentError, 'options must be a Hash' unless options.is_a?(Hash)
-
-    selector = options.fetch(:from)
-
-    first(selector, visible: false)
-
-    if options[:multiple]
-      execute_script("$('#{selector}').select2('val', ['#{value}']).trigger('change');")
-    else
-      execute_script("$('#{selector}').select2('val', '#{value}').trigger('change');")
-    end
-  end
-
-  def open_select2(selector)
-    execute_script("$('#{selector}').select2('open');")
-  end
-
-  def scroll_select2_to_bottom(selector)
-    evaluate_script "$('#{selector}').scrollTop($('#{selector}')[0].scrollHeight); $('#{selector}');"
-  end
-end
diff --git a/spec/support/selection_helper.rb b/spec/support/selection_helper.rb
deleted file mode 100644
index b4725b137b2..00000000000
--- a/spec/support/selection_helper.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module SelectionHelper
-  def select_element(selector)
-    find(selector)
-    execute_script("let range = document.createRange(); let sel = window.getSelection(); range.selectNodeContents(document.querySelector('#{selector}')); sel.addRange(range);")
-  end
-end
diff --git a/spec/support/services_shared_context.rb b/spec/support/services_shared_context.rb
deleted file mode 100644
index 23f9b46ae0c..00000000000
--- a/spec/support/services_shared_context.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-Service.available_services_names.each do |service|
-  shared_context service do
-    let(:dashed_service) { service.dasherize }
-    let(:service_method) { "#{service}_service".to_sym }
-    let(:service_klass) { "#{service}_service".classify.constantize }
-    let(:service_instance) { service_klass.new }
-    let(:service_fields) { service_instance.fields }
-    let(:service_attrs_list) { service_fields.inject([]) {|arr, hash| arr << hash[:name].to_sym } }
-    let(:service_attrs) do
-      service_attrs_list.inject({}) do |hash, k|
-        if k =~ /^(token*|.*_token|.*_key)/
-          hash.merge!(k => 'secrettoken')
-        elsif k =~ /^(.*_url|url|webhook)/
-          hash.merge!(k => "http://example.com")
-        elsif service_klass.method_defined?("#{k}?")
-          hash.merge!(k => true)
-        elsif service == 'irker' && k == :recipients
-          hash.merge!(k => 'irc://irc.network.net:666/#channel')
-        elsif service == 'irker' && k == :server_port
-          hash.merge!(k => 1234)
-        elsif service == 'jira' && k == :jira_issue_transition_id
-          hash.merge!(k => 1234)
-        else
-          hash.merge!(k => "someword")
-        end
-      end
-    end
-
-    def initialize_service(service)
-      service_item = project.find_or_initialize_service(service)
-      service_item.properties = service_attrs
-      service_item.active = true if service == "kubernetes"
-      service_item.save
-      service_item
-    end
-  end
-end
diff --git a/spec/support/shared_contexts/json_response_shared_context.rb b/spec/support/shared_contexts/json_response_shared_context.rb
new file mode 100644
index 00000000000..df5fc288089
--- /dev/null
+++ b/spec/support/shared_contexts/json_response_shared_context.rb
@@ -0,0 +1,3 @@
+shared_context 'JSON response' do
+  let(:json_response) { JSON.parse(response.body) }
+end
diff --git a/spec/support/shared_contexts/services_shared_context.rb b/spec/support/shared_contexts/services_shared_context.rb
new file mode 100644
index 00000000000..23f9b46ae0c
--- /dev/null
+++ b/spec/support/shared_contexts/services_shared_context.rb
@@ -0,0 +1,37 @@
+Service.available_services_names.each do |service|
+  shared_context service do
+    let(:dashed_service) { service.dasherize }
+    let(:service_method) { "#{service}_service".to_sym }
+    let(:service_klass) { "#{service}_service".classify.constantize }
+    let(:service_instance) { service_klass.new }
+    let(:service_fields) { service_instance.fields }
+    let(:service_attrs_list) { service_fields.inject([]) {|arr, hash| arr << hash[:name].to_sym } }
+    let(:service_attrs) do
+      service_attrs_list.inject({}) do |hash, k|
+        if k =~ /^(token*|.*_token|.*_key)/
+          hash.merge!(k => 'secrettoken')
+        elsif k =~ /^(.*_url|url|webhook)/
+          hash.merge!(k => "http://example.com")
+        elsif service_klass.method_defined?("#{k}?")
+          hash.merge!(k => true)
+        elsif service == 'irker' && k == :recipients
+          hash.merge!(k => 'irc://irc.network.net:666/#channel')
+        elsif service == 'irker' && k == :server_port
+          hash.merge!(k => 1234)
+        elsif service == 'jira' && k == :jira_issue_transition_id
+          hash.merge!(k => 1234)
+        else
+          hash.merge!(k => "someword")
+        end
+      end
+    end
+
+    def initialize_service(service)
+      service_item = project.find_or_initialize_service(service)
+      service_item.properties = service_attrs
+      service_item.active = true if service == "kubernetes"
+      service_item.save
+      service_item
+    end
+  end
+end
diff --git a/spec/support/shared_examples/chat_slash_commands_shared_examples.rb b/spec/support/shared_examples/chat_slash_commands_shared_examples.rb
new file mode 100644
index 00000000000..dc97a39f051
--- /dev/null
+++ b/spec/support/shared_examples/chat_slash_commands_shared_examples.rb
@@ -0,0 +1,97 @@
+RSpec.shared_examples 'chat slash commands service' do
+  describe "Associations" do
+    it { is_expected.to respond_to :token }
+    it { is_expected.to have_many :chat_names }
+  end
+
+  describe '#valid_token?' do
+    subject { described_class.new }
+
+    context 'when the token is empty' do
+      it 'is false' do
+        expect(subject.valid_token?('wer')).to be_falsey
+      end
+    end
+
+    context 'when there is a token' do
+      before do
+        subject.token = '123'
+      end
+
+      it 'accepts equal tokens' do
+        expect(subject.valid_token?('123')).to be_truthy
+      end
+    end
+  end
+
+  describe '#trigger' do
+    subject { described_class.new }
+
+    context 'no token is passed' do
+      let(:params) { Hash.new }
+
+      it 'returns nil' do
+        expect(subject.trigger(params)).to be_nil
+      end
+    end
+
+    context 'with a token passed' do
+      let(:project) { create(:project) }
+      let(:params) { { token: 'token' } }
+
+      before do
+        allow(subject).to receive(:token).and_return('token')
+      end
+
+      context 'no user can be found' do
+        context 'when no url can be generated' do
+          it 'responds with the authorize url' do
+            response = subject.trigger(params)
+
+            expect(response[:response_type]).to eq :ephemeral
+            expect(response[:text]).to start_with ":sweat_smile: Couldn't identify you"
+          end
+        end
+
+        context 'when an auth url can be generated' do
+          let(:params) do
+            {
+              team_domain: 'http://domain.tld',
+              team_id: 'T3423423',
+              user_id: 'U234234',
+              user_name: 'mepmep',
+              token: 'token'
+            }
+          end
+
+          let(:service) do
+            project.create_mattermost_slash_commands_service(
+              properties: { token: 'token' }
+            )
+          end
+
+          it 'generates the url' do
+            response = service.trigger(params)
+
+            expect(response[:text]).to start_with(':wave: Hi there!')
+          end
+        end
+      end
+
+      context 'when the user is authenticated' do
+        let!(:chat_name) { create(:chat_name, service: subject) }
+        let(:params) { { token: 'token', team_id: chat_name.team_id, user_id: chat_name.chat_id } }
+
+        subject do
+          described_class.create(project: project, properties: { token: 'token' })
+        end
+
+        it 'triggers the command' do
+          expect_any_instance_of(Gitlab::SlashCommands::Command).to receive(:execute)
+
+          subject.trigger(params)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/email_format_shared_examples.rb b/spec/support/shared_examples/email_format_shared_examples.rb
new file mode 100644
index 00000000000..b924a208e71
--- /dev/null
+++ b/spec/support/shared_examples/email_format_shared_examples.rb
@@ -0,0 +1,44 @@
+# Specifications for behavior common to all objects with an email attribute.
+# Takes a list of email-format attributes and requires:
+# - subject { "the object with a attribute= setter"  }
+#   Note: You have access to `email_value` which is the email address value
+#         being currently tested).
+
+shared_examples 'an object with email-formated attributes' do |*attributes|
+  attributes.each do |attribute|
+    describe "specifically its :#{attribute} attribute" do
+      %w[
+        info@example.com
+        info+test@example.com
+        o'reilly@example.com
+        mailto:test@example.com
+        lol!'+=?><#$%^&*()@gmail.com
+      ].each do |valid_email|
+        context "with a value of '#{valid_email}'" do
+          let(:email_value) { valid_email }
+
+          it 'is valid' do
+            subject.send("#{attribute}=", valid_email)
+
+            expect(subject).to be_valid
+          end
+        end
+      end
+
+      %w[
+        foobar
+        test@test@example.com
+      ].each do |invalid_email|
+        context "with a value of '#{invalid_email}'" do
+          let(:email_value) { invalid_email }
+
+          it 'is invalid' do
+            subject.send("#{attribute}=", invalid_email)
+
+            expect(subject).to be_invalid
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/gitlab_verify.rb b/spec/support/shared_examples/gitlab_verify.rb
new file mode 100644
index 00000000000..560913ca92f
--- /dev/null
+++ b/spec/support/shared_examples/gitlab_verify.rb
@@ -0,0 +1,19 @@
+RSpec.shared_examples 'Gitlab::Verify::BatchVerifier subclass' do
+  describe 'batching' do
+    let(:first_batch) { objects[0].id..objects[0].id }
+    let(:second_batch) { objects[1].id..objects[1].id }
+    let(:third_batch) { objects[2].id..objects[2].id }
+
+    it 'iterates through objects in batches' do
+      expect(collect_ranges).to eq([first_batch, second_batch, third_batch])
+    end
+
+    it 'allows the starting ID to be specified' do
+      expect(collect_ranges(start: second_batch.first)).to eq([second_batch, third_batch])
+    end
+
+    it 'allows the finishing ID to be specified' do
+      expect(collect_ranges(finish: second_batch.last)).to eq([first_batch, second_batch])
+    end
+  end
+end
diff --git a/spec/support/shared_examples/group_members_shared_example.rb b/spec/support/shared_examples/group_members_shared_example.rb
new file mode 100644
index 00000000000..547c83c7955
--- /dev/null
+++ b/spec/support/shared_examples/group_members_shared_example.rb
@@ -0,0 +1,27 @@
+RSpec.shared_examples 'members and requesters associations' do
+  describe '#members_and_requesters' do
+    it 'includes members and requesters' do
+      member_and_requester_user_ids = namespace.members_and_requesters.pluck(:user_id)
+
+      expect(member_and_requester_user_ids).to include(requester.id, developer.id)
+    end
+  end
+
+  describe '#members' do
+    it 'includes members and exclude requesters' do
+      member_user_ids = namespace.members.pluck(:user_id)
+
+      expect(member_user_ids).to include(developer.id)
+      expect(member_user_ids).not_to include(requester.id)
+    end
+  end
+
+  describe '#requesters' do
+    it 'does not include requesters' do
+      requester_user_ids = namespace.requesters.pluck(:user_id)
+
+      expect(requester_user_ids).to include(requester.id)
+      expect(requester_user_ids).not_to include(developer.id)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/issuable_shared_examples.rb b/spec/support/shared_examples/issuable_shared_examples.rb
new file mode 100644
index 00000000000..42f3b4db23c
--- /dev/null
+++ b/spec/support/shared_examples/issuable_shared_examples.rb
@@ -0,0 +1,38 @@
+shared_examples 'cache counters invalidator' do
+  it 'invalidates counter cache for assignees' do
+    expect_any_instance_of(User).to receive(:invalidate_merge_request_cache_counts)
+
+    described_class.new(project, user, {}).execute(merge_request)
+  end
+end
+
+shared_examples 'system notes for milestones' do
+  def update_issuable(opts)
+    issuable = try(:issue) || try(:merge_request)
+    described_class.new(project, user, opts).execute(issuable)
+  end
+
+  context 'group milestones' do
+    let(:group) { create(:group) }
+    let(:group_milestone) { create(:milestone, group: group) }
+
+    before do
+      project.update(namespace: group)
+      create(:group_member, group: group, user: user)
+    end
+
+    it 'creates a system note' do
+      expect do
+        update_issuable(milestone: group_milestone)
+      end.to change { Note.system.count }.by(1)
+    end
+  end
+
+  context 'project milestones' do
+    it 'creates a system note' do
+      expect do
+        update_issuable(milestone: create(:milestone))
+      end.to change { Note.system.count }.by(1)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/issuables_list_metadata_shared_examples.rb b/spec/support/shared_examples/issuables_list_metadata_shared_examples.rb
new file mode 100644
index 00000000000..e61983c60b4
--- /dev/null
+++ b/spec/support/shared_examples/issuables_list_metadata_shared_examples.rb
@@ -0,0 +1,46 @@
+shared_examples 'issuables list meta-data' do |issuable_type, action = nil|
+  before do
+    @issuable_ids = []
+
+    %w[fix improve/awesome].each do |source_branch|
+      issuable =
+        if issuable_type == :issue
+          create(issuable_type, project: project, author: project.creator)
+        else
+          create(issuable_type, source_project: project, source_branch: source_branch, author: project.creator)
+        end
+
+      @issuable_ids << issuable.id
+    end
+  end
+
+  it "creates indexed meta-data object for issuable notes and votes count" do
+    if action
+      get action, author_id: project.creator.id
+    else
+      get :index, namespace_id: project.namespace, project_id: project
+    end
+
+    meta_data = assigns(:issuable_meta_data)
+
+    aggregate_failures do
+      expect(meta_data.keys).to match_array(@issuable_ids)
+      expect(meta_data.values).to all(be_kind_of(Issuable::IssuableMeta))
+    end
+  end
+
+  describe "when given empty collection" do
+    let(:project2) { create(:project, :public) }
+
+    it "doesn't execute any queries with false conditions" do
+      get_action =
+        if action
+          proc { get action, author_id: project.creator.id }
+        else
+          proc { get :index, namespace_id: project2.namespace, project_id: project2 }
+        end
+
+      expect(&get_action).not_to make_queries_matching(/WHERE (?:1=0|0=1)/)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/issue_tracker_service_shared_example.rb b/spec/support/shared_examples/issue_tracker_service_shared_example.rb
new file mode 100644
index 00000000000..a6ab03cb808
--- /dev/null
+++ b/spec/support/shared_examples/issue_tracker_service_shared_example.rb
@@ -0,0 +1,22 @@
+RSpec.shared_examples 'issue tracker service URL attribute' do |url_attr|
+  it { is_expected.to allow_value('https://example.com').for(url_attr) }
+
+  it { is_expected.not_to allow_value('example.com').for(url_attr) }
+  it { is_expected.not_to allow_value('ftp://example.com').for(url_attr) }
+  it { is_expected.not_to allow_value('herp-and-derp').for(url_attr) }
+end
+
+RSpec.shared_examples 'allows project key on reference pattern' do |url_attr|
+  it 'allows underscores in the project name' do
+    expect(described_class.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
+  end
+
+  it 'allows numbers in the project name' do
+    expect(described_class.reference_pattern.match('EXT3_EXT-1234')[0]).to eq 'EXT3_EXT-1234'
+  end
+
+  it 'requires the project name to begin with A-Z' do
+    expect(described_class.reference_pattern.match('3EXT_EXT-1234')).to eq nil
+    expect(described_class.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
+  end
+end
diff --git a/spec/support/shared_examples/ldap_shared_examples.rb b/spec/support/shared_examples/ldap_shared_examples.rb
new file mode 100644
index 00000000000..52c34e78965
--- /dev/null
+++ b/spec/support/shared_examples/ldap_shared_examples.rb
@@ -0,0 +1,69 @@
+shared_examples_for 'normalizes a DN' do
+  using RSpec::Parameterized::TableSyntax
+
+  where(:test_description, :given, :expected) do
+    'strips extraneous whitespace'                                                                 | 'uid     =John Smith ,  ou = People, dc=  example,dc =com'                                            | 'uid=john smith,ou=people,dc=example,dc=com'
+    'strips extraneous whitespace for a DN with a single RDN'                                      | 'uid  =  John Smith'                                                                                  | 'uid=john smith'
+    'unescapes non-reserved, non-special Unicode characters'                                       | 'uid   =  Sebasti\\c3\\a1n\\ C.\\20Smith,   ou=People (aka. \\22humans\\")  ,dc=example, dc=com'      | 'uid=sebastián c. smith,ou=people (aka. \\"humans\\"),dc=example,dc=com'
+    'downcases the whole string'                                                                   | 'UID=John Smith,ou=People,dc=example,dc=com'                                                          | 'uid=john smith,ou=people,dc=example,dc=com'
+    'for a null DN (empty string), returns empty string and does not error'                        | ''                                                                                                    | ''
+    'does not strip an escaped leading space in an attribute value'                                | 'uid=\\ John Smith,ou=People,dc=example,dc=com'                                                       | 'uid=\\ john smith,ou=people,dc=example,dc=com'
+    'does not strip an escaped leading space in the last attribute value'                          | 'uid=\\ John Smith'                                                                                   | 'uid=\\ john smith'
+    'does not strip an escaped trailing space in an attribute value'                               | 'uid=John Smith\\ ,ou=People,dc=example,dc=com'                                                       | 'uid=john smith\\ ,ou=people,dc=example,dc=com'
+    'strips extraneous spaces after an escaped trailing space'                                     | 'uid=John Smith\\   ,ou=People,dc=example,dc=com'                                                     | 'uid=john smith\\ ,ou=people,dc=example,dc=com'
+    'strips extraneous spaces after an escaped trailing space at the end of the DN'                | 'uid=John Smith,ou=People,dc=example,dc=com\\   '                                                     | 'uid=john smith,ou=people,dc=example,dc=com\\ '
+    'properly preserves escaped trailing space after unescaped trailing spaces'                    | 'uid=John Smith  \\  ,ou=People,dc=example,dc=com'                                                    | 'uid=john smith  \\ ,ou=people,dc=example,dc=com'
+    'preserves multiple inner spaces in an attribute value'                                        | 'uid=John   Smith,ou=People,dc=example,dc=com'                                                        | 'uid=john   smith,ou=people,dc=example,dc=com'
+    'preserves inner spaces after an escaped space'                                                | 'uid=John\\   Smith,ou=People,dc=example,dc=com'                                                      | 'uid=john   smith,ou=people,dc=example,dc=com'
+    'hex-escapes an escaped leading newline in an attribute value'                                 | "uid=\\\nJohn Smith,ou=People,dc=example,dc=com"                                                      | "uid=\\0ajohn smith,ou=people,dc=example,dc=com"
+    'hex-escapes and does not strip an escaped trailing newline in an attribute value'             | "uid=John Smith\\\n,ou=People,dc=example,dc=com"                                                      | "uid=john smith\\0a,ou=people,dc=example,dc=com"
+    'hex-escapes an unescaped leading newline (actually an invalid DN?)'                           | "uid=\nJohn Smith,ou=People,dc=example,dc=com"                                                        | "uid=\\0ajohn smith,ou=people,dc=example,dc=com"
+    'strips an unescaped trailing newline (actually an invalid DN?)'                               | "uid=John Smith\n,ou=People,dc=example,dc=com"                                                        | "uid=john smith,ou=people,dc=example,dc=com"
+    'does not strip if no extraneous whitespace'                                                   | 'uid=John Smith,ou=People,dc=example,dc=com'                                                          | 'uid=john smith,ou=people,dc=example,dc=com'
+    'does not modify an escaped equal sign in an attribute value'                                  | 'uid= foo  \\=  bar'                                                                                  | 'uid=foo  \\=  bar'
+    'converts an escaped hex equal sign to an escaped equal sign in an attribute value'            | 'uid= foo  \\3D  bar'                                                                                 | 'uid=foo  \\=  bar'
+    'does not modify an escaped comma in an attribute value'                                       | 'uid= John C. Smith, ou=San Francisco\\, CA'                                                          | 'uid=john c. smith,ou=san francisco\\, ca'
+    'converts an escaped hex comma to an escaped comma in an attribute value'                      | 'uid= John C. Smith, ou=San Francisco\\2C CA'                                                         | 'uid=john c. smith,ou=san francisco\\, ca'
+    'does not modify an escaped hex carriage return character in an attribute value'               | 'uid= John C. Smith, ou=San Francisco\\,\\0DCA'                                                       | 'uid=john c. smith,ou=san francisco\\,\\0dca'
+    'does not modify an escaped hex line feed character in an attribute value'                     | 'uid= John C. Smith, ou=San Francisco\\,\\0ACA'                                                       | 'uid=john c. smith,ou=san francisco\\,\\0aca'
+    'does not modify an escaped hex CRLF in an attribute value'                                    | 'uid= John C. Smith, ou=San Francisco\\,\\0D\\0ACA'                                                   | 'uid=john c. smith,ou=san francisco\\,\\0d\\0aca'
+    'allows attribute type name OIDs'                                                              | '0.9.2342.19200300.100.1.25=Example,0.9.2342.19200300.100.1.25=Com'                                   | '0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com'
+    'strips extraneous whitespace from attribute type name OIDs'                                   | '0.9.2342.19200300.100.1.25 = Example, 0.9.2342.19200300.100.1.25 = Com'                              | '0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com'
+  end
+
+  with_them do
+    it 'normalizes the DN' do
+      assert_generic_test(test_description, subject, expected)
+    end
+  end
+end
+
+shared_examples_for 'normalizes a DN attribute value' do
+  using RSpec::Parameterized::TableSyntax
+
+  where(:test_description, :given, :expected) do
+    'strips extraneous whitespace'                                                      | '   John Smith   '                 | 'john smith'
+    'unescapes non-reserved, non-special Unicode characters'                            | 'Sebasti\\c3\\a1n\\ C.\\20Smith'   | 'sebastián c. smith'
+    'downcases the whole string'                                                        | 'JoHn C. Smith'                    | 'john c. smith'
+    'does not strip an escaped leading space in an attribute value'                     | '\\ John Smith'                    | '\\ john smith'
+    'does not strip an escaped trailing space in an attribute value'                    | 'John Smith\\ '                    | 'john smith\\ '
+    'hex-escapes an escaped leading newline in an attribute value'                      | "\\\nJohn Smith"                   | "\\0ajohn smith"
+    'hex-escapes and does not strip an escaped trailing newline in an attribute value'  | "John Smith\\\n"                   | "john smith\\0a"
+    'hex-escapes an unescaped leading newline (actually an invalid DN value?)'          | "\nJohn Smith"                     | "\\0ajohn smith"
+    'strips an unescaped trailing newline (actually an invalid DN value?)'              | "John Smith\n"                     | "john smith"
+    'does not strip if no extraneous whitespace'                                        | 'John Smith'                       | 'john smith'
+    'does not modify an escaped equal sign in an attribute value'                       | ' foo  \\=  bar'                   | 'foo  \\=  bar'
+    'converts an escaped hex equal sign to an escaped equal sign in an attribute value' | ' foo  \\3D  bar'                  | 'foo  \\=  bar'
+    'does not modify an escaped comma in an attribute value'                            | 'San Francisco\\, CA'              | 'san francisco\\, ca'
+    'converts an escaped hex comma to an escaped comma in an attribute value'           | 'San Francisco\\2C CA'             | 'san francisco\\, ca'
+    'does not modify an escaped hex carriage return character in an attribute value'    | 'San Francisco\\,\\0DCA'           | 'san francisco\\,\\0dca'
+    'does not modify an escaped hex line feed character in an attribute value'          | 'San Francisco\\,\\0ACA'           | 'san francisco\\,\\0aca'
+    'does not modify an escaped hex CRLF in an attribute value'                         | 'San Francisco\\,\\0D\\0ACA'       | 'san francisco\\,\\0d\\0aca'
+  end
+
+  with_them do
+    it 'normalizes the DN attribute value' do
+      assert_generic_test(test_description, subject, expected)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/legacy_path_redirect_shared_examples.rb b/spec/support/shared_examples/legacy_path_redirect_shared_examples.rb
new file mode 100644
index 00000000000..f300bdd48b1
--- /dev/null
+++ b/spec/support/shared_examples/legacy_path_redirect_shared_examples.rb
@@ -0,0 +1,13 @@
+shared_examples 'redirecting a legacy path' do |source, target|
+  include RSpec::Rails::RequestExampleGroup
+
+  it "redirects #{source} to #{target} when the resource does not exist" do
+    expect(get(source)).to redirect_to(target)
+  end
+
+  it "does not redirect #{source} to #{target} when the resource exists" do
+    resource
+
+    expect(get(source)).not_to redirect_to(target)
+  end
+end
diff --git a/spec/support/shared_examples/malicious_regexp_shared_examples.rb b/spec/support/shared_examples/malicious_regexp_shared_examples.rb
new file mode 100644
index 00000000000..ac5d22298bb
--- /dev/null
+++ b/spec/support/shared_examples/malicious_regexp_shared_examples.rb
@@ -0,0 +1,8 @@
+shared_examples 'malicious regexp' do
+  let(:malicious_text)  { 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!' }
+  let(:malicious_regexp) { '(?i)^(([a-z])+.)+[A-Z]([a-z])+$' }
+
+  it 'takes under a second' do
+    expect { Timeout.timeout(1) { subject } }.not_to raise_error
+  end
+end
diff --git a/spec/support/shared_examples/mentionable_shared_examples.rb b/spec/support/shared_examples/mentionable_shared_examples.rb
new file mode 100644
index 00000000000..1685decbe94
--- /dev/null
+++ b/spec/support/shared_examples/mentionable_shared_examples.rb
@@ -0,0 +1,144 @@
+# Specifications for behavior common to all Mentionable implementations.
+# Requires a shared context containing:
+# - subject { "the mentionable implementation" }
+# - let(:backref_text) { "the way that +subject+ should refer to itself in backreferences " }
+# - let(:set_mentionable_text) { lambda { |txt| "block that assigns txt to the subject's mentionable_text" } }
+
+shared_context 'mentionable context' do
+  let(:project) { subject.project }
+  let(:author)  { subject.author }
+
+  let(:mentioned_issue)  { create(:issue, project: project) }
+  let!(:mentioned_mr)     { create(:merge_request, source_project: project) }
+  let(:mentioned_commit) { project.commit("HEAD~1") }
+
+  let(:ext_proj)   { create(:project, :public, :repository) }
+  let(:ext_issue)  { create(:issue, project: ext_proj) }
+  let(:ext_mr)     { create(:merge_request, :simple, source_project: ext_proj) }
+  let(:ext_commit) { ext_proj.commit("HEAD~2") }
+
+  # Override to add known commits to the repository stub.
+  let(:extra_commits) { [] }
+
+  # A string that mentions each of the +mentioned_.*+ objects above. Mentionables should add a self-reference
+  # to this string and place it in their +mentionable_text+.
+  let(:ref_string) do
+    <<-MSG.strip_heredoc
+      These references are new:
+        Issue:  #{mentioned_issue.to_reference}
+        Merge:  #{mentioned_mr.to_reference}
+        Commit: #{mentioned_commit.to_reference}
+
+      This reference is a repeat and should only be mentioned once:
+        Repeat: #{mentioned_issue.to_reference}
+
+      These references are cross-referenced:
+        Issue:  #{ext_issue.to_reference(project)}
+        Merge:  #{ext_mr.to_reference(project)}
+        Commit: #{ext_commit.to_reference(project)}
+
+      This is a self-reference and should not be mentioned at all:
+        Self: #{backref_text}
+    MSG
+  end
+
+  before do
+    # Wire the project's repository to return the mentioned commit, and +nil+
+    # for any unrecognized commits.
+    allow_any_instance_of(::Repository).to receive(:commit).and_call_original
+    allow_any_instance_of(::Repository).to receive(:commit).with(mentioned_commit.short_id).and_return(mentioned_commit)
+    extra_commits.each do |commit|
+      allow_any_instance_of(::Repository).to receive(:commit).with(commit.short_id).and_return(commit)
+    end
+
+    set_mentionable_text.call(ref_string)
+
+    project.add_developer(author)
+  end
+end
+
+shared_examples 'a mentionable' do
+  include_context 'mentionable context'
+
+  it 'generates a descriptive back-reference' do
+    expect(subject.gfm_reference).to eq(backref_text)
+  end
+
+  it "extracts references from its reference property" do
+    # De-duplicate and omit itself
+    refs = subject.referenced_mentionables
+    expect(refs.size).to eq(6)
+    expect(refs).to include(mentioned_issue)
+    expect(refs).to include(mentioned_mr)
+    expect(refs).to include(mentioned_commit)
+    expect(refs).to include(ext_issue)
+    expect(refs).to include(ext_mr)
+    expect(refs).to include(ext_commit)
+  end
+
+  it 'creates cross-reference notes' do
+    mentioned_objects = [mentioned_issue, mentioned_mr, mentioned_commit,
+                         ext_issue, ext_mr, ext_commit]
+
+    mentioned_objects.each do |referenced|
+      expect(SystemNoteService).to receive(:cross_reference)
+        .with(referenced, subject.local_reference, author)
+    end
+
+    subject.create_cross_references!
+  end
+end
+
+shared_examples 'an editable mentionable' do
+  include_context 'mentionable context'
+
+  it_behaves_like 'a mentionable'
+
+  let(:new_issues) do
+    [create(:issue, project: project), create(:issue, project: ext_proj)]
+  end
+
+  it 'creates new cross-reference notes when the mentionable text is edited' do
+    subject.save
+    subject.create_cross_references!
+
+    new_text = <<-MSG.strip_heredoc
+      These references already existed:
+
+      Issue:  #{mentioned_issue.to_reference}
+
+      Commit: #{mentioned_commit.to_reference}
+
+      ---
+
+      This cross-project reference already existed:
+
+      Issue:  #{ext_issue.to_reference(project)}
+
+      ---
+
+      These two references are introduced in an edit:
+
+      Issue: #{new_issues[0].to_reference}
+
+      Cross: #{new_issues[1].to_reference(project)}
+    MSG
+
+    # These three objects were already referenced, and should not receive new
+    # notes
+    [mentioned_issue, mentioned_commit, ext_issue].each do |oldref|
+      expect(SystemNoteService).not_to receive(:cross_reference)
+        .with(oldref, any_args)
+    end
+
+    # These two issues are new and should receive reference notes
+    # In the case of MergeRequests remember that cannot mention commits included in the MergeRequest
+    new_issues.each do |newref|
+      expect(SystemNoteService).to receive(:cross_reference)
+        .with(newref, subject.local_reference, author)
+    end
+
+    set_mentionable_text.call(new_text)
+    subject.create_new_cross_references!(author)
+  end
+end
diff --git a/spec/support/shared_examples/milestone_tabs_examples.rb b/spec/support/shared_examples/milestone_tabs_examples.rb
new file mode 100644
index 00000000000..70b499198bf
--- /dev/null
+++ b/spec/support/shared_examples/milestone_tabs_examples.rb
@@ -0,0 +1,84 @@
+shared_examples 'milestone tabs' do
+  def go(path, extra_params = {})
+    params =
+      case milestone
+      when DashboardMilestone
+        { id: milestone.safe_title, title: milestone.title }
+      when GroupMilestone
+        { group_id: group.to_param, id: milestone.safe_title, title: milestone.title }
+      else
+        { namespace_id: project.namespace.to_param, project_id: project, id: milestone.iid }
+      end
+
+    get path, params.merge(extra_params)
+  end
+
+  describe '#merge_requests' do
+    context 'as html' do
+      before do
+        go(:merge_requests, format: 'html')
+      end
+
+      it 'redirects to milestone#show' do
+        expect(response).to redirect_to(milestone_path)
+      end
+    end
+
+    context 'as json' do
+      before do
+        go(:merge_requests, format: 'json')
+      end
+
+      it 'renders the merge requests tab template to a string' do
+        expect(response).to render_template('shared/milestones/_merge_requests_tab')
+        expect(json_response).to have_key('html')
+      end
+    end
+  end
+
+  describe '#participants' do
+    context 'as html' do
+      before do
+        go(:participants, format: 'html')
+      end
+
+      it 'redirects to milestone#show' do
+        expect(response).to redirect_to(milestone_path)
+      end
+    end
+
+    context 'as json' do
+      before do
+        go(:participants, format: 'json')
+      end
+
+      it 'renders the participants tab template to a string' do
+        expect(response).to render_template('shared/milestones/_participants_tab')
+        expect(json_response).to have_key('html')
+      end
+    end
+  end
+
+  describe '#labels' do
+    context 'as html' do
+      before do
+        go(:labels, format: 'html')
+      end
+
+      it 'redirects to milestone#show' do
+        expect(response).to redirect_to(milestone_path)
+      end
+    end
+
+    context 'as json' do
+      before do
+        go(:labels, format: 'json')
+      end
+
+      it 'renders the labels tab template to a string' do
+        expect(response).to render_template('shared/milestones/_labels_tab')
+        expect(json_response).to have_key('html')
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/notify_shared_examples.rb b/spec/support/shared_examples/notify_shared_examples.rb
new file mode 100644
index 00000000000..e2c23607406
--- /dev/null
+++ b/spec/support/shared_examples/notify_shared_examples.rb
@@ -0,0 +1,199 @@
+shared_context 'gitlab email notification' do
+  set(:project) { create(:project, :repository) }
+  set(:recipient) { create(:user, email: 'recipient@example.com') }
+
+  let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
+  let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
+  let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
+  let(:new_user_address) { 'newguy@example.com' }
+
+  before do
+    email = recipient.emails.create(email: "notifications@example.com")
+    recipient.update_attribute(:notification_email, email.email)
+    stub_incoming_email_setting(enabled: true, address: "reply+%{key}@#{Gitlab.config.gitlab.host}")
+  end
+end
+
+shared_context 'reply-by-email is enabled with incoming address without %{key}' do
+  before do
+    stub_incoming_email_setting(enabled: true, address: "reply@#{Gitlab.config.gitlab.host}")
+  end
+end
+
+shared_examples 'a multiple recipients email' do
+  it 'is sent to the given recipient' do
+    is_expected.to deliver_to recipient.notification_email
+  end
+end
+
+shared_examples 'an email sent from GitLab' do
+  it 'has the characteristics of an email sent from GitLab' do
+    sender = subject.header[:from].addrs[0]
+    reply_to = subject.header[:reply_to].addresses
+
+    aggregate_failures do
+      expect(sender.display_name).to eq(gitlab_sender_display_name)
+      expect(sender.address).to eq(gitlab_sender)
+      expect(reply_to).to eq([gitlab_sender_reply_to])
+    end
+  end
+end
+
+shared_examples 'an email that contains a header with author username' do
+  it 'has X-GitLab-Author header containing author\'s username' do
+    is_expected.to have_header 'X-GitLab-Author', user.username
+  end
+end
+
+shared_examples 'an email with X-GitLab headers containing project details' do
+  it 'has X-GitLab-Project headers' do
+    aggregate_failures do
+      is_expected.to have_header('X-GitLab-Project', /#{project.name}/)
+      is_expected.to have_header('X-GitLab-Project-Id', /#{project.id}/)
+      is_expected.to have_header('X-GitLab-Project-Path', /#{project.full_path}/)
+    end
+  end
+end
+
+shared_examples 'a new thread email with reply-by-email enabled' do
+  it 'has the characteristics of a threaded email' do
+    host = Gitlab.config.gitlab.host
+    route_key = "#{model.class.model_name.singular_route_key}_#{model.id}"
+
+    aggregate_failures do
+      is_expected.to have_header('Message-ID', "<#{route_key}@#{host}>")
+      is_expected.to have_header('References', /\A<reply\-.*@#{host}>\Z/ )
+    end
+  end
+end
+
+shared_examples 'a thread answer email with reply-by-email enabled' do
+  include_examples 'an email with X-GitLab headers containing project details'
+
+  it 'has the characteristics of a threaded reply' do
+    host = Gitlab.config.gitlab.host
+    route_key = "#{model.class.model_name.singular_route_key}_#{model.id}"
+
+    aggregate_failures do
+      is_expected.to have_header('Message-ID', /\A<.*@#{host}>\Z/)
+      is_expected.to have_header('In-Reply-To', "<#{route_key}@#{host}>")
+      is_expected.to have_header('References',  /\A<#{route_key}@#{host}> <reply\-.*@#{host}>\Z/ )
+      is_expected.to have_subject(/^Re: /)
+    end
+  end
+end
+
+shared_examples 'an email starting a new thread with reply-by-email enabled' do
+  include_examples 'an email with X-GitLab headers containing project details'
+  include_examples 'a new thread email with reply-by-email enabled'
+
+  context 'when reply-by-email is enabled with incoming address with %{key}' do
+    it 'has a Reply-To header' do
+      is_expected.to have_header 'Reply-To', /<reply+(.*)@#{Gitlab.config.gitlab.host}>\Z/
+    end
+  end
+
+  context 'when reply-by-email is enabled with incoming address without %{key}' do
+    include_context 'reply-by-email is enabled with incoming address without %{key}'
+    include_examples 'a new thread email with reply-by-email enabled'
+
+    it 'has a Reply-To header' do
+      is_expected.to have_header 'Reply-To', /<reply@#{Gitlab.config.gitlab.host}>\Z/
+    end
+  end
+end
+
+shared_examples 'an answer to an existing thread with reply-by-email enabled' do
+  include_examples 'an email with X-GitLab headers containing project details'
+  include_examples 'a thread answer email with reply-by-email enabled'
+
+  context 'when reply-by-email is enabled with incoming address with %{key}' do
+    it 'has a Reply-To header' do
+      is_expected.to have_header 'Reply-To', /<reply+(.*)@#{Gitlab.config.gitlab.host}>\Z/
+    end
+  end
+
+  context 'when reply-by-email is enabled with incoming address without %{key}' do
+    include_context 'reply-by-email is enabled with incoming address without %{key}'
+    include_examples 'a thread answer email with reply-by-email enabled'
+
+    it 'has a Reply-To header' do
+      is_expected.to have_header 'Reply-To', /<reply@#{Gitlab.config.gitlab.host}>\Z/
+    end
+  end
+end
+
+shared_examples 'it should have Gmail Actions links' do
+  it do
+    aggregate_failures do
+      is_expected.to have_body_text('<script type="application/ld+json">')
+      is_expected.to have_body_text('ViewAction')
+    end
+  end
+end
+
+shared_examples 'it should not have Gmail Actions links' do
+  it do
+    aggregate_failures do
+      is_expected.not_to have_body_text('<script type="application/ld+json">')
+      is_expected.not_to have_body_text('ViewAction')
+    end
+  end
+end
+
+shared_examples 'it should show Gmail Actions View Issue link' do
+  it_behaves_like 'it should have Gmail Actions links'
+
+  it { is_expected.to have_body_text('View Issue') }
+end
+
+shared_examples 'it should show Gmail Actions View Merge request link' do
+  it_behaves_like 'it should have Gmail Actions links'
+
+  it { is_expected.to have_body_text('View Merge request') }
+end
+
+shared_examples 'it should show Gmail Actions View Commit link' do
+  it_behaves_like 'it should have Gmail Actions links'
+
+  it { is_expected.to have_body_text('View Commit') }
+end
+
+shared_examples 'an unsubscribeable thread' do
+  it_behaves_like 'an unsubscribeable thread with incoming address without %{key}'
+
+  it 'has a List-Unsubscribe header in the correct format, and a body link' do
+    aggregate_failures do
+      is_expected.to have_header('List-Unsubscribe', /unsubscribe/)
+      is_expected.to have_header('List-Unsubscribe', /mailto/)
+      is_expected.to have_header('List-Unsubscribe', /^<.+,.+>$/)
+      is_expected.to have_body_text('unsubscribe')
+    end
+  end
+end
+
+shared_examples 'an unsubscribeable thread with incoming address without %{key}' do
+  include_context 'reply-by-email is enabled with incoming address without %{key}'
+
+  it 'has a List-Unsubscribe header in the correct format, and a body link' do
+    aggregate_failures do
+      is_expected.to have_header('List-Unsubscribe', /unsubscribe/)
+      is_expected.not_to have_header('List-Unsubscribe', /mailto/)
+      is_expected.to have_header('List-Unsubscribe', /^<[^,]+>$/)
+      is_expected.to have_body_text('unsubscribe')
+    end
+  end
+end
+
+shared_examples 'a user cannot unsubscribe through footer link' do
+  it 'does not have a List-Unsubscribe header or a body link' do
+    aggregate_failures do
+      is_expected.not_to have_header('List-Unsubscribe', /unsubscribe/)
+      is_expected.not_to have_body_text('unsubscribe')
+    end
+  end
+end
+
+shared_examples 'an email with a labels subscriptions link in its footer' do
+  it { is_expected.to have_body_text('label subscriptions') }
+end
diff --git a/spec/support/shared_examples/reference_parser_shared_examples.rb b/spec/support/shared_examples/reference_parser_shared_examples.rb
new file mode 100644
index 00000000000..baf8bcc04b8
--- /dev/null
+++ b/spec/support/shared_examples/reference_parser_shared_examples.rb
@@ -0,0 +1,47 @@
+RSpec.shared_examples "referenced feature visibility" do |*related_features|
+  let(:feature_fields) do
+    related_features.map { |feature| (feature + "_access_level").to_sym }
+  end
+
+  before do
+    link['data-project'] = project.id.to_s
+  end
+
+  context "when feature is disabled" do
+    it "does not create reference" do
+      set_features_fields_to(ProjectFeature::DISABLED)
+      expect(subject.nodes_visible_to_user(user, [link])).to eq([])
+    end
+  end
+
+  context "when feature is enabled only for team members" do
+    before do
+      set_features_fields_to(ProjectFeature::PRIVATE)
+    end
+
+    it "does not create reference for non member" do
+      non_member = create(:user)
+
+      expect(subject.nodes_visible_to_user(non_member, [link])).to eq([])
+    end
+
+    it "creates reference for member" do
+      project.add_developer(user)
+
+      expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+    end
+  end
+
+  context "when feature is enabled" do
+    # The project is public
+    it "creates reference" do
+      set_features_fields_to(ProjectFeature::ENABLED)
+
+      expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+    end
+  end
+
+  def set_features_fields_to(visibility_level)
+    feature_fields.each { |field| project.project_feature.update_attribute(field, visibility_level) }
+  end
+end
diff --git a/spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb b/spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb
new file mode 100644
index 00000000000..07bc3a51fd8
--- /dev/null
+++ b/spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb
@@ -0,0 +1,429 @@
+Dir[Rails.root.join("app/models/project_services/chat_message/*.rb")].each { |f| require f }
+
+RSpec.shared_examples 'slack or mattermost notifications' do
+  let(:chat_service) { described_class.new }
+  let(:webhook_url) { 'https://example.gitlab.com/' }
+
+  def execute_with_options(options)
+    receive(:new).with(webhook_url, options)
+     .and_return(double(:slack_service).as_null_object)
+  end
+
+  describe "Associations" do
+    it { is_expected.to belong_to :project }
+    it { is_expected.to have_one :service_hook }
+  end
+
+  describe 'Validations' do
+    context 'when service is active' do
+      before do
+        subject.active = true
+      end
+
+      it { is_expected.to validate_presence_of(:webhook) }
+      it_behaves_like 'issue tracker service URL attribute', :webhook
+    end
+
+    context 'when service is inactive' do
+      before do
+        subject.active = false
+      end
+
+      it { is_expected.not_to validate_presence_of(:webhook) }
+    end
+  end
+
+  describe "#execute" do
+    let(:user)    { create(:user) }
+    let(:project) { create(:project, :repository) }
+    let(:username) { 'slack_username' }
+    let(:channel)  { 'slack_channel' }
+    let(:issue_service_options) { { title: 'Awesome issue', description: 'please fix' } }
+
+    let(:push_sample_data) do
+      Gitlab::DataBuilder::Push.build_sample(project, user)
+    end
+
+    before do
+      allow(chat_service).to receive_messages(
+        project: project,
+        project_id: project.id,
+        service_hook: true,
+        webhook: webhook_url
+      )
+
+      WebMock.stub_request(:post, webhook_url)
+
+      issue_service = Issues::CreateService.new(project, user, issue_service_options)
+      @issue = issue_service.execute
+      @issues_sample_data = issue_service.hook_data(@issue, 'open')
+
+      project.add_developer(user)
+      opts = {
+        title: 'Awesome merge_request',
+        description: 'please fix',
+        source_branch: 'feature',
+        target_branch: 'master'
+      }
+      merge_service = MergeRequests::CreateService.new(project,
+                                                       user, opts)
+      @merge_request = merge_service.execute
+      @merge_sample_data = merge_service.hook_data(@merge_request,
+                                                   'open')
+
+      opts = {
+        title: "Awesome wiki_page",
+        content: "Some text describing some thing or another",
+        format: "md",
+        message: "user created page: Awesome wiki_page"
+      }
+
+      @wiki_page = create(:wiki_page, wiki: project.wiki, attrs: opts)
+      @wiki_page_sample_data = Gitlab::DataBuilder::WikiPage.build(@wiki_page, user, 'create')
+    end
+
+    it "calls Slack/Mattermost API for push events" do
+      chat_service.execute(push_sample_data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+
+    it "calls Slack/Mattermost API for issue events" do
+      chat_service.execute(@issues_sample_data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+
+    it "calls Slack/Mattermost API for merge requests events" do
+      chat_service.execute(@merge_sample_data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+
+    it "calls Slack/Mattermost API for wiki page events" do
+      chat_service.execute(@wiki_page_sample_data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+
+    it 'uses the username as an option for slack when configured' do
+      allow(chat_service).to receive(:username).and_return(username)
+
+      expect(Slack::Notifier).to receive(:new)
+       .with(webhook_url, username: username)
+       .and_return(
+         double(:slack_service).as_null_object
+       )
+
+      chat_service.execute(push_sample_data)
+    end
+
+    it 'uses the channel as an option when it is configured' do
+      allow(chat_service).to receive(:channel).and_return(channel)
+      expect(Slack::Notifier).to receive(:new)
+        .with(webhook_url, channel: channel)
+        .and_return(
+          double(:slack_service).as_null_object
+        )
+      chat_service.execute(push_sample_data)
+    end
+
+    context "event channels" do
+      it "uses the right channel for push event" do
+        chat_service.update_attributes(push_channel: "random")
+
+        expect(Slack::Notifier).to receive(:new)
+         .with(webhook_url, channel: "random")
+         .and_return(
+           double(:slack_service).as_null_object
+         )
+
+        chat_service.execute(push_sample_data)
+      end
+
+      it "uses the right channel for merge request event" do
+        chat_service.update_attributes(merge_request_channel: "random")
+
+        expect(Slack::Notifier).to receive(:new)
+         .with(webhook_url, channel: "random")
+         .and_return(
+           double(:slack_service).as_null_object
+         )
+
+        chat_service.execute(@merge_sample_data)
+      end
+
+      it "uses the right channel for issue event" do
+        chat_service.update_attributes(issue_channel: "random")
+
+        expect(Slack::Notifier).to receive(:new)
+         .with(webhook_url, channel: "random")
+         .and_return(
+           double(:slack_service).as_null_object
+         )
+
+        chat_service.execute(@issues_sample_data)
+      end
+
+      context 'for confidential issues' do
+        let(:issue_service_options) { { title: 'Secret', confidential: true } }
+
+        it "uses confidential issue channel" do
+          chat_service.update_attributes(confidential_issue_channel: 'confidential')
+
+          expect(Slack::Notifier).to execute_with_options(channel: 'confidential')
+
+          chat_service.execute(@issues_sample_data)
+        end
+
+        it 'falls back to issue channel' do
+          chat_service.update_attributes(issue_channel: 'fallback_channel')
+
+          expect(Slack::Notifier).to execute_with_options(channel: 'fallback_channel')
+
+          chat_service.execute(@issues_sample_data)
+        end
+      end
+
+      it "uses the right channel for wiki event" do
+        chat_service.update_attributes(wiki_page_channel: "random")
+
+        expect(Slack::Notifier).to receive(:new)
+         .with(webhook_url, channel: "random")
+         .and_return(
+           double(:slack_service).as_null_object
+         )
+
+        chat_service.execute(@wiki_page_sample_data)
+      end
+
+      context "note event" do
+        let(:issue_note) do
+          create(:note_on_issue, project: project, note: "issue note")
+        end
+
+        it "uses the right channel" do
+          chat_service.update_attributes(note_channel: "random")
+
+          note_data = Gitlab::DataBuilder::Note.build(issue_note, user)
+
+          expect(Slack::Notifier).to receive(:new)
+           .with(webhook_url, channel: "random")
+           .and_return(
+             double(:slack_service).as_null_object
+           )
+
+          chat_service.execute(note_data)
+        end
+
+        context 'for confidential notes' do
+          before do
+            issue_note.noteable.update!(confidential: true)
+          end
+
+          it "uses confidential channel" do
+            chat_service.update_attributes(confidential_note_channel: "confidential")
+
+            note_data = Gitlab::DataBuilder::Note.build(issue_note, user)
+
+            expect(Slack::Notifier).to execute_with_options(channel: 'confidential')
+
+            chat_service.execute(note_data)
+          end
+
+          it 'falls back to note channel' do
+            chat_service.update_attributes(note_channel: "fallback_channel")
+
+            note_data = Gitlab::DataBuilder::Note.build(issue_note, user)
+
+            expect(Slack::Notifier).to execute_with_options(channel: 'fallback_channel')
+
+            chat_service.execute(note_data)
+          end
+        end
+      end
+    end
+  end
+
+  describe "Note events" do
+    let(:user) { create(:user) }
+    let(:project) { create(:project, :repository, creator: user) }
+
+    before do
+      allow(chat_service).to receive_messages(
+        project: project,
+        project_id: project.id,
+        service_hook: true,
+        webhook: webhook_url
+      )
+
+      WebMock.stub_request(:post, webhook_url)
+    end
+
+    context 'when commit comment event executed' do
+      let(:commit_note) do
+        create(:note_on_commit, author: user,
+                                project: project,
+                                commit_id: project.repository.commit.id,
+                                note: 'a comment on a commit')
+      end
+
+      it "calls Slack/Mattermost API for commit comment events" do
+        data = Gitlab::DataBuilder::Note.build(commit_note, user)
+        chat_service.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
+    end
+
+    context 'when merge request comment event executed' do
+      let(:merge_request_note) do
+        create(:note_on_merge_request, project: project,
+                                       note: "merge request note")
+      end
+
+      it "calls Slack API for merge request comment events" do
+        data = Gitlab::DataBuilder::Note.build(merge_request_note, user)
+        chat_service.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
+    end
+
+    context 'when issue comment event executed' do
+      let(:issue_note) do
+        create(:note_on_issue, project: project, note: "issue note")
+      end
+
+      let(:data) { Gitlab::DataBuilder::Note.build(issue_note, user) }
+
+      it "calls Slack API for issue comment events" do
+        chat_service.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
+    end
+
+    context 'when snippet comment event executed' do
+      let(:snippet_note) do
+        create(:note_on_project_snippet, project: project,
+                                         note: "snippet note")
+      end
+
+      it "calls Slack API for snippet comment events" do
+        data = Gitlab::DataBuilder::Note.build(snippet_note, user)
+        chat_service.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
+    end
+  end
+
+  describe 'Pipeline events' do
+    let(:user) { create(:user) }
+    let(:project) { create(:project, :repository) }
+
+    let(:pipeline) do
+      create(:ci_pipeline,
+             project: project, status: status,
+             sha: project.commit.sha, ref: project.default_branch)
+    end
+
+    before do
+      allow(chat_service).to receive_messages(
+        project: project,
+        service_hook: true,
+        webhook: webhook_url
+      )
+    end
+
+    shared_examples 'call Slack/Mattermost API' do
+      before do
+        WebMock.stub_request(:post, webhook_url)
+      end
+
+      it 'calls Slack/Mattermost API for pipeline events' do
+        data = Gitlab::DataBuilder::Pipeline.build(pipeline)
+        chat_service.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
+    end
+
+    context 'with failed pipeline' do
+      let(:status) { 'failed' }
+
+      it_behaves_like 'call Slack/Mattermost API'
+    end
+
+    context 'with succeeded pipeline' do
+      let(:status) { 'success' }
+
+      context 'with default to notify_only_broken_pipelines' do
+        it 'does not call Slack/Mattermost API for pipeline events' do
+          data = Gitlab::DataBuilder::Pipeline.build(pipeline)
+          result = chat_service.execute(data)
+
+          expect(result).to be_falsy
+        end
+      end
+
+      context 'with setting notify_only_broken_pipelines to false' do
+        before do
+          chat_service.notify_only_broken_pipelines = false
+        end
+
+        it_behaves_like 'call Slack/Mattermost API'
+      end
+    end
+
+    context 'only notify for the default branch' do
+      context 'when enabled' do
+        let(:pipeline) do
+          create(:ci_pipeline, :failed, project: project, ref: 'not-the-default-branch')
+        end
+
+        before do
+          chat_service.notify_only_default_branch = true
+          WebMock.stub_request(:post, webhook_url)
+        end
+
+        it 'does not call the Slack/Mattermost API for pipeline events' do
+          data = Gitlab::DataBuilder::Pipeline.build(pipeline)
+          result = chat_service.execute(data)
+
+          expect(result).to be_falsy
+        end
+
+        it 'does not notify push events if they are not for the default branch' do
+          ref = "#{Gitlab::Git::BRANCH_REF_PREFIX}test"
+          push_sample_data = Gitlab::DataBuilder::Push.build(project, user, nil, nil, ref, [])
+
+          chat_service.execute(push_sample_data)
+
+          expect(WebMock).not_to have_requested(:post, webhook_url)
+        end
+
+        it 'notifies about push events for the default branch' do
+          push_sample_data = Gitlab::DataBuilder::Push.build_sample(project, user)
+
+          chat_service.execute(push_sample_data)
+
+          expect(WebMock).to have_requested(:post, webhook_url).once
+        end
+      end
+
+      context 'when disabled' do
+        let(:pipeline) do
+          create(:ci_pipeline, :failed, project: project, ref: 'not-the-default-branch')
+        end
+
+        before do
+          chat_service.notify_only_default_branch = false
+        end
+
+        it_behaves_like 'call Slack/Mattermost API'
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/snippet_visibility.rb b/spec/support/shared_examples/snippet_visibility.rb
new file mode 100644
index 00000000000..3a7c69b7877
--- /dev/null
+++ b/spec/support/shared_examples/snippet_visibility.rb
@@ -0,0 +1,322 @@
+RSpec.shared_examples 'snippet visibility' do
+  let!(:author) { create(:user) }
+  let!(:member) { create(:user) }
+  let!(:external) { create(:user, :external) }
+
+  let!(:snippet_type_visibilities) do
+    {
+      public: Snippet::PUBLIC,
+      internal: Snippet::INTERNAL,
+      private: Snippet::PRIVATE
+    }
+  end
+
+  context "For project snippets" do
+    let!(:users) do
+      {
+        unauthenticated: nil,
+        external: external,
+        non_member: create(:user),
+        member: member,
+        author: author
+      }
+    end
+
+    let!(:project_type_visibilities) do
+      {
+        public: Gitlab::VisibilityLevel::PUBLIC,
+        internal: Gitlab::VisibilityLevel::INTERNAL,
+        private: Gitlab::VisibilityLevel::PRIVATE
+      }
+    end
+
+    let(:project_feature_visibilities) do
+      {
+        enabled: ProjectFeature::ENABLED,
+        private: ProjectFeature::PRIVATE,
+        disabled: ProjectFeature::DISABLED
+      }
+    end
+
+    where(:project_type, :feature_visibility, :user_type, :snippet_type, :outcome) do
+      [
+        # Public projects
+        [:public, :enabled, :unauthenticated,    :public,   true],
+        [:public, :enabled, :unauthenticated,    :internal, false],
+        [:public, :enabled, :unauthenticated,    :private,  false],
+
+        [:public, :enabled, :external,           :public,   true],
+        [:public, :enabled, :external,           :internal, false],
+        [:public, :enabled, :external,           :private,  false],
+
+        [:public, :enabled, :non_member,         :public,   true],
+        [:public, :enabled, :non_member,         :internal, true],
+        [:public, :enabled, :non_member,         :private,  false],
+
+        [:public, :enabled, :member,             :public,   true],
+        [:public, :enabled, :member,             :internal, true],
+        [:public, :enabled, :member,             :private,  true],
+
+        [:public, :enabled, :author,             :public,   true],
+        [:public, :enabled, :author,             :internal, true],
+        [:public, :enabled, :author,             :private,  true],
+
+        [:public, :private, :unauthenticated,    :public,   false],
+        [:public, :private, :unauthenticated,    :internal, false],
+        [:public, :private, :unauthenticated,    :private,  false],
+
+        [:public, :private, :external,           :public,   false],
+        [:public, :private, :external,           :internal, false],
+        [:public, :private, :external,           :private,  false],
+
+        [:public, :private, :non_member,         :public,   false],
+        [:public, :private, :non_member,         :internal, false],
+        [:public, :private, :non_member,         :private,  false],
+
+        [:public, :private, :member,             :public,   true],
+        [:public, :private, :member,             :internal, true],
+        [:public, :private, :member,             :private,  true],
+
+        [:public, :private, :author,             :public,   true],
+        [:public, :private, :author,             :internal, true],
+        [:public, :private, :author,             :private,  true],
+
+        [:public, :disabled, :unauthenticated,   :public,   false],
+        [:public, :disabled, :unauthenticated,   :internal, false],
+        [:public, :disabled, :unauthenticated,   :private,  false],
+
+        [:public, :disabled, :external,          :public,   false],
+        [:public, :disabled, :external,          :internal, false],
+        [:public, :disabled, :external,          :private,  false],
+
+        [:public, :disabled, :non_member,        :public,   false],
+        [:public, :disabled, :non_member,        :internal, false],
+        [:public, :disabled, :non_member,        :private,  false],
+
+        [:public, :disabled, :member,            :public,   false],
+        [:public, :disabled, :member,            :internal, false],
+        [:public, :disabled, :member,            :private,  false],
+
+        [:public, :disabled, :author,            :public,   false],
+        [:public, :disabled, :author,            :internal, false],
+        [:public, :disabled, :author,            :private,  false],
+
+        # Internal projects
+        [:internal, :enabled, :unauthenticated,  :public,   false],
+        [:internal, :enabled, :unauthenticated,  :internal, false],
+        [:internal, :enabled, :unauthenticated,  :private,  false],
+
+        [:internal, :enabled, :external,         :public,   false],
+        [:internal, :enabled, :external,         :internal, false],
+        [:internal, :enabled, :external,         :private,  false],
+
+        [:internal, :enabled, :non_member,       :public,   true],
+        [:internal, :enabled, :non_member,       :internal, true],
+        [:internal, :enabled, :non_member,       :private,  false],
+
+        [:internal, :enabled, :member,           :public,   true],
+        [:internal, :enabled, :member,           :internal, true],
+        [:internal, :enabled, :member,           :private,  true],
+
+        [:internal, :enabled, :author,           :public,   true],
+        [:internal, :enabled, :author,           :internal, true],
+        [:internal, :enabled, :author,           :private,  true],
+
+        [:internal, :private, :unauthenticated,  :public,   false],
+        [:internal, :private, :unauthenticated,  :internal, false],
+        [:internal, :private, :unauthenticated,  :private,  false],
+
+        [:internal, :private, :external,         :public,   false],
+        [:internal, :private, :external,         :internal, false],
+        [:internal, :private, :external,         :private,  false],
+
+        [:internal, :private, :non_member,       :public,   false],
+        [:internal, :private, :non_member,       :internal, false],
+        [:internal, :private, :non_member,       :private,  false],
+
+        [:internal, :private, :member,           :public,   true],
+        [:internal, :private, :member,           :internal, true],
+        [:internal, :private, :member,           :private,  true],
+
+        [:internal, :private, :author,           :public,   true],
+        [:internal, :private, :author,           :internal, true],
+        [:internal, :private, :author,           :private,  true],
+
+        [:internal, :disabled, :unauthenticated, :public,   false],
+        [:internal, :disabled, :unauthenticated, :internal, false],
+        [:internal, :disabled, :unauthenticated, :private,  false],
+
+        [:internal, :disabled, :external,        :public,   false],
+        [:internal, :disabled, :external,        :internal, false],
+        [:internal, :disabled, :external,        :private,  false],
+
+        [:internal, :disabled, :non_member,      :public,   false],
+        [:internal, :disabled, :non_member,      :internal, false],
+        [:internal, :disabled, :non_member,      :private,  false],
+
+        [:internal, :disabled, :member,          :public,   false],
+        [:internal, :disabled, :member,          :internal, false],
+        [:internal, :disabled, :member,          :private,  false],
+
+        [:internal, :disabled, :author,          :public,   false],
+        [:internal, :disabled, :author,          :internal, false],
+        [:internal, :disabled, :author,          :private,  false],
+
+        # Private projects
+        [:private, :enabled, :unauthenticated,   :public,   false],
+        [:private, :enabled, :unauthenticated,   :internal, false],
+        [:private, :enabled, :unauthenticated,   :private,  false],
+
+        [:private, :enabled, :external,          :public,   true],
+        [:private, :enabled, :external,          :internal, true],
+        [:private, :enabled, :external,          :private,  true],
+
+        [:private, :enabled, :non_member,        :public,   false],
+        [:private, :enabled, :non_member,        :internal, false],
+        [:private, :enabled, :non_member,        :private,  false],
+
+        [:private, :enabled, :member,            :public,   true],
+        [:private, :enabled, :member,            :internal, true],
+        [:private, :enabled, :member,            :private,  true],
+
+        [:private, :enabled, :author,            :public,   true],
+        [:private, :enabled, :author,            :internal, true],
+        [:private, :enabled, :author,            :private,  true],
+
+        [:private, :private, :unauthenticated,   :public,   false],
+        [:private, :private, :unauthenticated,   :internal, false],
+        [:private, :private, :unauthenticated,   :private,  false],
+
+        [:private, :private, :external,          :public,   true],
+        [:private, :private, :external,          :internal, true],
+        [:private, :private, :external,          :private,  true],
+
+        [:private, :private, :non_member,        :public,   false],
+        [:private, :private, :non_member,        :internal, false],
+        [:private, :private, :non_member,        :private,  false],
+
+        [:private, :private, :member,            :public,   true],
+        [:private, :private, :member,            :internal, true],
+        [:private, :private, :member,            :private,  true],
+
+        [:private, :private, :author,            :public,   true],
+        [:private, :private, :author,            :internal, true],
+        [:private, :private, :author,            :private,  true],
+
+        [:private, :disabled, :unauthenticated,  :public,   false],
+        [:private, :disabled, :unauthenticated,  :internal, false],
+        [:private, :disabled, :unauthenticated,  :private,  false],
+
+        [:private, :disabled, :external,         :public,   false],
+        [:private, :disabled, :external,         :internal, false],
+        [:private, :disabled, :external,         :private,  false],
+
+        [:private, :disabled, :non_member,       :public,   false],
+        [:private, :disabled, :non_member,       :internal, false],
+        [:private, :disabled, :non_member,       :private,  false],
+
+        [:private, :disabled, :member,           :public,   false],
+        [:private, :disabled, :member,           :internal, false],
+        [:private, :disabled, :member,           :private,  false],
+
+        [:private, :disabled, :author,           :public,   false],
+        [:private, :disabled, :author,           :internal, false],
+        [:private, :disabled, :author,           :private,  false]
+      ]
+    end
+
+    with_them do
+      let!(:project) { create(:project, visibility_level: project_type_visibilities[project_type]) }
+      let!(:project_feature) { project.project_feature.update_column(:snippets_access_level, project_feature_visibilities[feature_visibility]) }
+      let!(:user) { users[user_type] }
+      let!(:snippet) { create(:project_snippet, visibility_level: snippet_type_visibilities[snippet_type], project: project, author: author) }
+      let!(:members) do
+        project.add_developer(author)
+        project.add_developer(member)
+        project.add_developer(external) if project.private?
+      end
+
+      context "For #{params[:project_type]} project and #{params[:user_type]} users" do
+        it 'should agree with the read_project_snippet policy' do
+          expect(can?(user, :read_project_snippet, snippet)).to eq(outcome)
+        end
+
+        it 'should return proper outcome' do
+          results = described_class.new(user, project: project).execute
+          expect(results.include?(snippet)).to eq(outcome)
+        end
+      end
+
+      context "Without a given project and #{params[:user_type]} users" do
+        it 'should return proper outcome' do
+          results = described_class.new(user).execute
+          expect(results.include?(snippet)).to eq(outcome)
+        end
+
+        it 'returns no snippets when the user cannot read cross project' do
+          allow(Ability).to receive(:allowed?).and_call_original
+          allow(Ability).to receive(:allowed?).with(user, :read_cross_project) { false }
+
+          snippets = described_class.new(user).execute
+
+          expect(snippets).to be_empty
+        end
+      end
+    end
+  end
+
+  context 'For personal snippets' do
+    let!(:users) do
+      {
+        unauthenticated: nil,
+        external: external,
+        non_member: create(:user),
+        author: author
+      }
+    end
+
+    where(:snippet_visibility, :user_type, :outcome) do
+      [
+        [:public,   :unauthenticated, true],
+        [:public,   :external,        true],
+        [:public,   :non_member,      true],
+        [:public,   :author,          true],
+
+        [:internal, :unauthenticated, false],
+        [:internal, :external,        false],
+        [:internal, :non_member,      true],
+        [:internal, :author,          true],
+
+        [:private,  :unauthenticated, false],
+        [:private,  :external,        false],
+        [:private,  :non_member,      false],
+        [:private,  :author,          true]
+      ]
+    end
+
+    with_them do
+      let!(:user) { users[user_type] }
+      let!(:snippet) { create(:personal_snippet, visibility_level: snippet_type_visibilities[snippet_visibility], author: author) }
+
+      context "For personal and #{params[:snippet_visibility]} snippets with #{params[:user_type]} user" do
+        it 'should agree with read_personal_snippet policy' do
+          expect(can?(user, :read_personal_snippet, snippet)).to eq(outcome)
+        end
+
+        it 'should return proper outcome' do
+          results = described_class.new(user).execute
+          expect(results.include?(snippet)).to eq(outcome)
+        end
+
+        it 'should return personal snippets when the user cannot read cross project' do
+          allow(Ability).to receive(:allowed?).and_call_original
+          allow(Ability).to receive(:allowed?).with(user, :read_cross_project) { false }
+
+          results = described_class.new(user).execute
+
+          expect(results.include?(snippet)).to eq(outcome)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/snippets_shared_examples.rb b/spec/support/shared_examples/snippets_shared_examples.rb
new file mode 100644
index 00000000000..85f0facd5c3
--- /dev/null
+++ b/spec/support/shared_examples/snippets_shared_examples.rb
@@ -0,0 +1,18 @@
+# These shared examples expect a `snippets` array of snippets
+RSpec.shared_examples 'paginated snippets' do |remote: false|
+  it "is limited to #{Snippet.default_per_page} items per page" do
+    expect(page.all('.snippets-list-holder .snippet-row').count).to eq(Snippet.default_per_page)
+  end
+
+  context 'clicking on the link to the second page' do
+    before do
+      click_link('2')
+      wait_for_requests if remote
+    end
+
+    it 'shows the remaining snippets' do
+      remaining_snippets_count = [snippets.size - Snippet.default_per_page, Snippet.default_per_page].min
+      expect(page).to have_selector('.snippets-list-holder .snippet-row', count: remaining_snippets_count)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/taskable_shared_examples.rb b/spec/support/shared_examples/taskable_shared_examples.rb
new file mode 100644
index 00000000000..4056ff06b84
--- /dev/null
+++ b/spec/support/shared_examples/taskable_shared_examples.rb
@@ -0,0 +1,108 @@
+# Specs for task state functionality for issues and merge requests.
+#
+# Requires a context containing:
+#   subject { Issue or MergeRequest }
+shared_examples 'a Taskable' do
+  describe 'with multiple tasks' do
+    before do
+      subject.description = <<-EOT.strip_heredoc
+        * [ ] Task 1
+        * [x] Task 2
+        * [x] Task 3
+        * [ ] Task 4
+        * [ ] Task 5
+      EOT
+    end
+
+    it 'returns the correct task status' do
+      expect(subject.task_status).to match('2 of')
+      expect(subject.task_status).to match('5 tasks completed')
+      expect(subject.task_status_short).to match('2/')
+      expect(subject.task_status_short).to match('5 tasks')
+    end
+
+    describe '#tasks?' do
+      it 'returns true when object has tasks' do
+        expect(subject.tasks?).to eq true
+      end
+
+      it 'returns false when object has no tasks' do
+        subject.description = 'Now I have no tasks'
+        expect(subject.tasks?).to eq false
+      end
+    end
+  end
+
+  describe 'with nested tasks' do
+    before do
+      subject.description = <<-EOT.strip_heredoc
+        - [ ] Task a
+          - [x] Task a.1
+          - [ ] Task a.2
+        - [ ] Task b
+
+        1. [ ] Task 1
+          1. [ ] Task 1.1
+          1. [ ] Task 1.2
+        1. [x] Task 2
+          1. [x] Task 2.1
+      EOT
+    end
+
+    it 'returns the correct task status' do
+      expect(subject.task_status).to match('3 of')
+      expect(subject.task_status).to match('9 tasks completed')
+      expect(subject.task_status_short).to match('3/')
+      expect(subject.task_status_short).to match('9 tasks')
+    end
+  end
+
+  describe 'with an incomplete task' do
+    before do
+      subject.description = <<-EOT.strip_heredoc
+        * [ ] Task 1
+      EOT
+    end
+
+    it 'returns the correct task status' do
+      expect(subject.task_status).to match('0 of')
+      expect(subject.task_status).to match('1 task completed')
+      expect(subject.task_status_short).to match('0/')
+      expect(subject.task_status_short).to match('1 task')
+    end
+  end
+
+  describe 'with tasks that are not formatted correctly' do
+    before do
+      subject.description = <<-EOT.strip_heredoc
+        [ ] task 1
+        [ ] task 2
+
+        - [ ]task 1
+        -[ ] task 2
+      EOT
+    end
+
+    it 'returns the correct task status' do
+      expect(subject.task_status).to match('0 of')
+      expect(subject.task_status).to match('0 tasks completed')
+      expect(subject.task_status_short).to match('0/')
+      expect(subject.task_status_short).to match('0 task')
+    end
+  end
+
+  describe 'with a complete task' do
+    before do
+      subject.description = <<-EOT.strip_heredoc
+        * [x] Task 1
+      EOT
+    end
+
+    it 'returns the correct task status' do
+      expect(subject.task_status).to match('1 of')
+      expect(subject.task_status).to match('1 task completed')
+      expect(subject.task_status_short).to match('1/')
+      expect(subject.task_status_short).to match('1 task')
+    end
+  end
+end
diff --git a/spec/support/shared_examples/time_tracking_shared_examples.rb b/spec/support/shared_examples/time_tracking_shared_examples.rb
new file mode 100644
index 00000000000..909d4e2ee8d
--- /dev/null
+++ b/spec/support/shared_examples/time_tracking_shared_examples.rb
@@ -0,0 +1,85 @@
+shared_examples 'issuable time tracker' do
+  it 'renders the sidebar component empty state' do
+    page.within '.time-tracking-no-tracking-pane' do
+      expect(page).to have_content 'No estimate or time spent'
+    end
+  end
+
+  it 'updates the sidebar component when estimate is added' do
+    submit_time('/estimate 3w 1d 1h')
+
+    wait_for_requests
+    page.within '.time-tracking-estimate-only-pane' do
+      expect(page).to have_content '3w 1d 1h'
+    end
+  end
+
+  it 'updates the sidebar component when spent is added' do
+    submit_time('/spend 3w 1d 1h')
+
+    wait_for_requests
+    page.within '.time-tracking-spend-only-pane' do
+      expect(page).to have_content '3w 1d 1h'
+    end
+  end
+
+  it 'shows the comparison when estimate and spent are added' do
+    submit_time('/estimate 3w 1d 1h')
+    submit_time('/spend 3w 1d 1h')
+
+    wait_for_requests
+    page.within '.time-tracking-comparison-pane' do
+      expect(page).to have_content '3w 1d 1h'
+    end
+  end
+
+  it 'updates the sidebar component when estimate is removed' do
+    submit_time('/estimate 3w 1d 1h')
+    submit_time('/remove_estimate')
+
+    page.within '.time-tracking-component-wrap' do
+      expect(page).to have_content 'No estimate or time spent'
+    end
+  end
+
+  it 'updates the sidebar component when spent is removed' do
+    submit_time('/spend 3w 1d 1h')
+    submit_time('/remove_time_spent')
+
+    page.within '.time-tracking-component-wrap' do
+      expect(page).to have_content 'No estimate or time spent'
+    end
+  end
+
+  it 'shows the help state when icon is clicked' do
+    page.within '.time-tracking-component-wrap' do
+      find('.help-button').click
+      expect(page).to have_content 'Track time with quick actions'
+      expect(page).to have_content 'Learn more'
+    end
+  end
+
+  it 'hides the help state when close icon is clicked' do
+    page.within '.time-tracking-component-wrap' do
+      find('.help-button').click
+      find('.close-help-button').click
+
+      expect(page).not_to have_content 'Track time with quick actions'
+      expect(page).not_to have_content 'Learn more'
+    end
+  end
+
+  it 'displays the correct help url' do
+    page.within '.time-tracking-component-wrap' do
+      find('.help-button').click
+
+      expect(find_link('Learn more')[:href]).to have_content('/help/workflow/time_tracking.md')
+    end
+  end
+end
+
+def submit_time(quick_action)
+  fill_in 'note[note]', with: quick_action
+  find('.js-comment-submit-button').click
+  wait_for_requests
+end
diff --git a/spec/support/shared_examples/unique_ip_check_shared_examples.rb b/spec/support/shared_examples/unique_ip_check_shared_examples.rb
new file mode 100644
index 00000000000..e5c8ac6a004
--- /dev/null
+++ b/spec/support/shared_examples/unique_ip_check_shared_examples.rb
@@ -0,0 +1,68 @@
+shared_context 'unique ips sign in limit' do
+  include StubENV
+  before do
+    Gitlab::Redis::Cache.with(&:flushall)
+    Gitlab::Redis::Queues.with(&:flushall)
+    Gitlab::Redis::SharedState.with(&:flushall)
+  end
+
+  before do
+    stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
+
+    Gitlab::CurrentSettings.update!(
+      unique_ips_limit_enabled: true,
+      unique_ips_limit_time_window: 10000
+    )
+  end
+
+  def change_ip(ip)
+    allow(Gitlab::RequestContext).to receive(:client_ip).and_return(ip)
+  end
+
+  def request_from_ip(ip)
+    change_ip(ip)
+    request
+    response
+  end
+
+  def operation_from_ip(ip)
+    change_ip(ip)
+    operation
+  end
+end
+
+shared_examples 'user login operation with unique ip limit' do
+  include_context 'unique ips sign in limit' do
+    before do
+      Gitlab::CurrentSettings.update!(unique_ips_limit_per_user: 1)
+    end
+
+    it 'allows user authenticating from the same ip' do
+      expect { operation_from_ip('ip') }.not_to raise_error
+      expect { operation_from_ip('ip') }.not_to raise_error
+    end
+
+    it 'blocks user authenticating from two distinct ips' do
+      expect { operation_from_ip('ip') }.not_to raise_error
+      expect { operation_from_ip('ip2') }.to raise_error(Gitlab::Auth::TooManyIps)
+    end
+  end
+end
+
+shared_examples 'user login request with unique ip limit' do |success_status = 200|
+  include_context 'unique ips sign in limit' do
+    before do
+      Gitlab::CurrentSettings.update!(unique_ips_limit_per_user: 1)
+    end
+
+    it 'allows user authenticating from the same ip' do
+      expect(request_from_ip('ip')).to have_gitlab_http_status(success_status)
+      expect(request_from_ip('ip')).to have_gitlab_http_status(success_status)
+    end
+
+    it 'blocks user authenticating from two distinct ips' do
+      expect(request_from_ip('ip')).to have_gitlab_http_status(success_status)
+      expect(request_from_ip('ip2')).to have_gitlab_http_status(403)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/update_invalid_issuable.rb b/spec/support/shared_examples/update_invalid_issuable.rb
new file mode 100644
index 00000000000..1490287681b
--- /dev/null
+++ b/spec/support/shared_examples/update_invalid_issuable.rb
@@ -0,0 +1,57 @@
+shared_examples 'update invalid issuable' do |klass|
+  let(:params) do
+    {
+      namespace_id: project.namespace.path,
+      project_id: project.path,
+      id: issuable.iid
+    }
+  end
+
+  let(:issuable) do
+    klass == Issue ? issue : merge_request
+  end
+
+  before do
+    if klass == Issue
+      params.merge!(issue: { title: "any" })
+    else
+      params.merge!(merge_request: { title: "any" })
+    end
+  end
+
+  context 'when updating causes conflicts' do
+    before do
+      allow_any_instance_of(issuable.class).to receive(:save)
+        .and_raise(ActiveRecord::StaleObjectError.new(issuable, :save))
+    end
+
+    it 'renders edit when format is html' do
+      put :update, params
+
+      expect(response).to render_template(:edit)
+      expect(assigns[:conflict]).to be_truthy
+    end
+
+    it 'renders json error message when format is json' do
+      params[:format] = "json"
+
+      put :update, params
+
+      expect(response.status).to eq(409)
+      expect(JSON.parse(response.body)).to have_key('errors')
+    end
+  end
+
+  context 'when updating an invalid issuable' do
+    before do
+      key = klass == Issue ? :issue : :merge_request
+      params[key][:title] = ""
+    end
+
+    it 'renders edit when merge request is invalid' do
+      put :update, params
+
+      expect(response).to render_template(:edit)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/updating_mentions_shared_examples.rb b/spec/support/shared_examples/updating_mentions_shared_examples.rb
new file mode 100644
index 00000000000..5e3f19ba19e
--- /dev/null
+++ b/spec/support/shared_examples/updating_mentions_shared_examples.rb
@@ -0,0 +1,36 @@
+RSpec.shared_examples 'updating mentions' do |service_class|
+  let(:mentioned_user) { create(:user) }
+  let(:service_class) { service_class }
+
+  before do
+    project.add_developer(mentioned_user)
+  end
+
+  def update_mentionable(opts)
+    perform_enqueued_jobs do
+      service_class.new(project, user, opts).execute(mentionable)
+    end
+
+    mentionable.reload
+  end
+
+  context 'in title' do
+    before do
+      update_mentionable(title: mentioned_user.to_reference)
+    end
+
+    it 'emails only the newly-mentioned user' do
+      should_only_email(mentioned_user)
+    end
+  end
+
+  context 'in description' do
+    before do
+      update_mentionable(description: mentioned_user.to_reference)
+    end
+
+    it 'emails only the newly-mentioned user' do
+      should_only_email(mentioned_user)
+    end
+  end
+end
diff --git a/spec/support/slack_mattermost_notifications_shared_examples.rb b/spec/support/slack_mattermost_notifications_shared_examples.rb
deleted file mode 100644
index 07bc3a51fd8..00000000000
--- a/spec/support/slack_mattermost_notifications_shared_examples.rb
+++ /dev/null
@@ -1,429 +0,0 @@
-Dir[Rails.root.join("app/models/project_services/chat_message/*.rb")].each { |f| require f }
-
-RSpec.shared_examples 'slack or mattermost notifications' do
-  let(:chat_service) { described_class.new }
-  let(:webhook_url) { 'https://example.gitlab.com/' }
-
-  def execute_with_options(options)
-    receive(:new).with(webhook_url, options)
-     .and_return(double(:slack_service).as_null_object)
-  end
-
-  describe "Associations" do
-    it { is_expected.to belong_to :project }
-    it { is_expected.to have_one :service_hook }
-  end
-
-  describe 'Validations' do
-    context 'when service is active' do
-      before do
-        subject.active = true
-      end
-
-      it { is_expected.to validate_presence_of(:webhook) }
-      it_behaves_like 'issue tracker service URL attribute', :webhook
-    end
-
-    context 'when service is inactive' do
-      before do
-        subject.active = false
-      end
-
-      it { is_expected.not_to validate_presence_of(:webhook) }
-    end
-  end
-
-  describe "#execute" do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project, :repository) }
-    let(:username) { 'slack_username' }
-    let(:channel)  { 'slack_channel' }
-    let(:issue_service_options) { { title: 'Awesome issue', description: 'please fix' } }
-
-    let(:push_sample_data) do
-      Gitlab::DataBuilder::Push.build_sample(project, user)
-    end
-
-    before do
-      allow(chat_service).to receive_messages(
-        project: project,
-        project_id: project.id,
-        service_hook: true,
-        webhook: webhook_url
-      )
-
-      WebMock.stub_request(:post, webhook_url)
-
-      issue_service = Issues::CreateService.new(project, user, issue_service_options)
-      @issue = issue_service.execute
-      @issues_sample_data = issue_service.hook_data(@issue, 'open')
-
-      project.add_developer(user)
-      opts = {
-        title: 'Awesome merge_request',
-        description: 'please fix',
-        source_branch: 'feature',
-        target_branch: 'master'
-      }
-      merge_service = MergeRequests::CreateService.new(project,
-                                                       user, opts)
-      @merge_request = merge_service.execute
-      @merge_sample_data = merge_service.hook_data(@merge_request,
-                                                   'open')
-
-      opts = {
-        title: "Awesome wiki_page",
-        content: "Some text describing some thing or another",
-        format: "md",
-        message: "user created page: Awesome wiki_page"
-      }
-
-      @wiki_page = create(:wiki_page, wiki: project.wiki, attrs: opts)
-      @wiki_page_sample_data = Gitlab::DataBuilder::WikiPage.build(@wiki_page, user, 'create')
-    end
-
-    it "calls Slack/Mattermost API for push events" do
-      chat_service.execute(push_sample_data)
-
-      expect(WebMock).to have_requested(:post, webhook_url).once
-    end
-
-    it "calls Slack/Mattermost API for issue events" do
-      chat_service.execute(@issues_sample_data)
-
-      expect(WebMock).to have_requested(:post, webhook_url).once
-    end
-
-    it "calls Slack/Mattermost API for merge requests events" do
-      chat_service.execute(@merge_sample_data)
-
-      expect(WebMock).to have_requested(:post, webhook_url).once
-    end
-
-    it "calls Slack/Mattermost API for wiki page events" do
-      chat_service.execute(@wiki_page_sample_data)
-
-      expect(WebMock).to have_requested(:post, webhook_url).once
-    end
-
-    it 'uses the username as an option for slack when configured' do
-      allow(chat_service).to receive(:username).and_return(username)
-
-      expect(Slack::Notifier).to receive(:new)
-       .with(webhook_url, username: username)
-       .and_return(
-         double(:slack_service).as_null_object
-       )
-
-      chat_service.execute(push_sample_data)
-    end
-
-    it 'uses the channel as an option when it is configured' do
-      allow(chat_service).to receive(:channel).and_return(channel)
-      expect(Slack::Notifier).to receive(:new)
-        .with(webhook_url, channel: channel)
-        .and_return(
-          double(:slack_service).as_null_object
-        )
-      chat_service.execute(push_sample_data)
-    end
-
-    context "event channels" do
-      it "uses the right channel for push event" do
-        chat_service.update_attributes(push_channel: "random")
-
-        expect(Slack::Notifier).to receive(:new)
-         .with(webhook_url, channel: "random")
-         .and_return(
-           double(:slack_service).as_null_object
-         )
-
-        chat_service.execute(push_sample_data)
-      end
-
-      it "uses the right channel for merge request event" do
-        chat_service.update_attributes(merge_request_channel: "random")
-
-        expect(Slack::Notifier).to receive(:new)
-         .with(webhook_url, channel: "random")
-         .and_return(
-           double(:slack_service).as_null_object
-         )
-
-        chat_service.execute(@merge_sample_data)
-      end
-
-      it "uses the right channel for issue event" do
-        chat_service.update_attributes(issue_channel: "random")
-
-        expect(Slack::Notifier).to receive(:new)
-         .with(webhook_url, channel: "random")
-         .and_return(
-           double(:slack_service).as_null_object
-         )
-
-        chat_service.execute(@issues_sample_data)
-      end
-
-      context 'for confidential issues' do
-        let(:issue_service_options) { { title: 'Secret', confidential: true } }
-
-        it "uses confidential issue channel" do
-          chat_service.update_attributes(confidential_issue_channel: 'confidential')
-
-          expect(Slack::Notifier).to execute_with_options(channel: 'confidential')
-
-          chat_service.execute(@issues_sample_data)
-        end
-
-        it 'falls back to issue channel' do
-          chat_service.update_attributes(issue_channel: 'fallback_channel')
-
-          expect(Slack::Notifier).to execute_with_options(channel: 'fallback_channel')
-
-          chat_service.execute(@issues_sample_data)
-        end
-      end
-
-      it "uses the right channel for wiki event" do
-        chat_service.update_attributes(wiki_page_channel: "random")
-
-        expect(Slack::Notifier).to receive(:new)
-         .with(webhook_url, channel: "random")
-         .and_return(
-           double(:slack_service).as_null_object
-         )
-
-        chat_service.execute(@wiki_page_sample_data)
-      end
-
-      context "note event" do
-        let(:issue_note) do
-          create(:note_on_issue, project: project, note: "issue note")
-        end
-
-        it "uses the right channel" do
-          chat_service.update_attributes(note_channel: "random")
-
-          note_data = Gitlab::DataBuilder::Note.build(issue_note, user)
-
-          expect(Slack::Notifier).to receive(:new)
-           .with(webhook_url, channel: "random")
-           .and_return(
-             double(:slack_service).as_null_object
-           )
-
-          chat_service.execute(note_data)
-        end
-
-        context 'for confidential notes' do
-          before do
-            issue_note.noteable.update!(confidential: true)
-          end
-
-          it "uses confidential channel" do
-            chat_service.update_attributes(confidential_note_channel: "confidential")
-
-            note_data = Gitlab::DataBuilder::Note.build(issue_note, user)
-
-            expect(Slack::Notifier).to execute_with_options(channel: 'confidential')
-
-            chat_service.execute(note_data)
-          end
-
-          it 'falls back to note channel' do
-            chat_service.update_attributes(note_channel: "fallback_channel")
-
-            note_data = Gitlab::DataBuilder::Note.build(issue_note, user)
-
-            expect(Slack::Notifier).to execute_with_options(channel: 'fallback_channel')
-
-            chat_service.execute(note_data)
-          end
-        end
-      end
-    end
-  end
-
-  describe "Note events" do
-    let(:user) { create(:user) }
-    let(:project) { create(:project, :repository, creator: user) }
-
-    before do
-      allow(chat_service).to receive_messages(
-        project: project,
-        project_id: project.id,
-        service_hook: true,
-        webhook: webhook_url
-      )
-
-      WebMock.stub_request(:post, webhook_url)
-    end
-
-    context 'when commit comment event executed' do
-      let(:commit_note) do
-        create(:note_on_commit, author: user,
-                                project: project,
-                                commit_id: project.repository.commit.id,
-                                note: 'a comment on a commit')
-      end
-
-      it "calls Slack/Mattermost API for commit comment events" do
-        data = Gitlab::DataBuilder::Note.build(commit_note, user)
-        chat_service.execute(data)
-
-        expect(WebMock).to have_requested(:post, webhook_url).once
-      end
-    end
-
-    context 'when merge request comment event executed' do
-      let(:merge_request_note) do
-        create(:note_on_merge_request, project: project,
-                                       note: "merge request note")
-      end
-
-      it "calls Slack API for merge request comment events" do
-        data = Gitlab::DataBuilder::Note.build(merge_request_note, user)
-        chat_service.execute(data)
-
-        expect(WebMock).to have_requested(:post, webhook_url).once
-      end
-    end
-
-    context 'when issue comment event executed' do
-      let(:issue_note) do
-        create(:note_on_issue, project: project, note: "issue note")
-      end
-
-      let(:data) { Gitlab::DataBuilder::Note.build(issue_note, user) }
-
-      it "calls Slack API for issue comment events" do
-        chat_service.execute(data)
-
-        expect(WebMock).to have_requested(:post, webhook_url).once
-      end
-    end
-
-    context 'when snippet comment event executed' do
-      let(:snippet_note) do
-        create(:note_on_project_snippet, project: project,
-                                         note: "snippet note")
-      end
-
-      it "calls Slack API for snippet comment events" do
-        data = Gitlab::DataBuilder::Note.build(snippet_note, user)
-        chat_service.execute(data)
-
-        expect(WebMock).to have_requested(:post, webhook_url).once
-      end
-    end
-  end
-
-  describe 'Pipeline events' do
-    let(:user) { create(:user) }
-    let(:project) { create(:project, :repository) }
-
-    let(:pipeline) do
-      create(:ci_pipeline,
-             project: project, status: status,
-             sha: project.commit.sha, ref: project.default_branch)
-    end
-
-    before do
-      allow(chat_service).to receive_messages(
-        project: project,
-        service_hook: true,
-        webhook: webhook_url
-      )
-    end
-
-    shared_examples 'call Slack/Mattermost API' do
-      before do
-        WebMock.stub_request(:post, webhook_url)
-      end
-
-      it 'calls Slack/Mattermost API for pipeline events' do
-        data = Gitlab::DataBuilder::Pipeline.build(pipeline)
-        chat_service.execute(data)
-
-        expect(WebMock).to have_requested(:post, webhook_url).once
-      end
-    end
-
-    context 'with failed pipeline' do
-      let(:status) { 'failed' }
-
-      it_behaves_like 'call Slack/Mattermost API'
-    end
-
-    context 'with succeeded pipeline' do
-      let(:status) { 'success' }
-
-      context 'with default to notify_only_broken_pipelines' do
-        it 'does not call Slack/Mattermost API for pipeline events' do
-          data = Gitlab::DataBuilder::Pipeline.build(pipeline)
-          result = chat_service.execute(data)
-
-          expect(result).to be_falsy
-        end
-      end
-
-      context 'with setting notify_only_broken_pipelines to false' do
-        before do
-          chat_service.notify_only_broken_pipelines = false
-        end
-
-        it_behaves_like 'call Slack/Mattermost API'
-      end
-    end
-
-    context 'only notify for the default branch' do
-      context 'when enabled' do
-        let(:pipeline) do
-          create(:ci_pipeline, :failed, project: project, ref: 'not-the-default-branch')
-        end
-
-        before do
-          chat_service.notify_only_default_branch = true
-          WebMock.stub_request(:post, webhook_url)
-        end
-
-        it 'does not call the Slack/Mattermost API for pipeline events' do
-          data = Gitlab::DataBuilder::Pipeline.build(pipeline)
-          result = chat_service.execute(data)
-
-          expect(result).to be_falsy
-        end
-
-        it 'does not notify push events if they are not for the default branch' do
-          ref = "#{Gitlab::Git::BRANCH_REF_PREFIX}test"
-          push_sample_data = Gitlab::DataBuilder::Push.build(project, user, nil, nil, ref, [])
-
-          chat_service.execute(push_sample_data)
-
-          expect(WebMock).not_to have_requested(:post, webhook_url)
-        end
-
-        it 'notifies about push events for the default branch' do
-          push_sample_data = Gitlab::DataBuilder::Push.build_sample(project, user)
-
-          chat_service.execute(push_sample_data)
-
-          expect(WebMock).to have_requested(:post, webhook_url).once
-        end
-      end
-
-      context 'when disabled' do
-        let(:pipeline) do
-          create(:ci_pipeline, :failed, project: project, ref: 'not-the-default-branch')
-        end
-
-        before do
-          chat_service.notify_only_default_branch = false
-        end
-
-        it_behaves_like 'call Slack/Mattermost API'
-      end
-    end
-  end
-end
diff --git a/spec/support/snippet_visibility.rb b/spec/support/snippet_visibility.rb
deleted file mode 100644
index 3a7c69b7877..00000000000
--- a/spec/support/snippet_visibility.rb
+++ /dev/null
@@ -1,322 +0,0 @@
-RSpec.shared_examples 'snippet visibility' do
-  let!(:author) { create(:user) }
-  let!(:member) { create(:user) }
-  let!(:external) { create(:user, :external) }
-
-  let!(:snippet_type_visibilities) do
-    {
-      public: Snippet::PUBLIC,
-      internal: Snippet::INTERNAL,
-      private: Snippet::PRIVATE
-    }
-  end
-
-  context "For project snippets" do
-    let!(:users) do
-      {
-        unauthenticated: nil,
-        external: external,
-        non_member: create(:user),
-        member: member,
-        author: author
-      }
-    end
-
-    let!(:project_type_visibilities) do
-      {
-        public: Gitlab::VisibilityLevel::PUBLIC,
-        internal: Gitlab::VisibilityLevel::INTERNAL,
-        private: Gitlab::VisibilityLevel::PRIVATE
-      }
-    end
-
-    let(:project_feature_visibilities) do
-      {
-        enabled: ProjectFeature::ENABLED,
-        private: ProjectFeature::PRIVATE,
-        disabled: ProjectFeature::DISABLED
-      }
-    end
-
-    where(:project_type, :feature_visibility, :user_type, :snippet_type, :outcome) do
-      [
-        # Public projects
-        [:public, :enabled, :unauthenticated,    :public,   true],
-        [:public, :enabled, :unauthenticated,    :internal, false],
-        [:public, :enabled, :unauthenticated,    :private,  false],
-
-        [:public, :enabled, :external,           :public,   true],
-        [:public, :enabled, :external,           :internal, false],
-        [:public, :enabled, :external,           :private,  false],
-
-        [:public, :enabled, :non_member,         :public,   true],
-        [:public, :enabled, :non_member,         :internal, true],
-        [:public, :enabled, :non_member,         :private,  false],
-
-        [:public, :enabled, :member,             :public,   true],
-        [:public, :enabled, :member,             :internal, true],
-        [:public, :enabled, :member,             :private,  true],
-
-        [:public, :enabled, :author,             :public,   true],
-        [:public, :enabled, :author,             :internal, true],
-        [:public, :enabled, :author,             :private,  true],
-
-        [:public, :private, :unauthenticated,    :public,   false],
-        [:public, :private, :unauthenticated,    :internal, false],
-        [:public, :private, :unauthenticated,    :private,  false],
-
-        [:public, :private, :external,           :public,   false],
-        [:public, :private, :external,           :internal, false],
-        [:public, :private, :external,           :private,  false],
-
-        [:public, :private, :non_member,         :public,   false],
-        [:public, :private, :non_member,         :internal, false],
-        [:public, :private, :non_member,         :private,  false],
-
-        [:public, :private, :member,             :public,   true],
-        [:public, :private, :member,             :internal, true],
-        [:public, :private, :member,             :private,  true],
-
-        [:public, :private, :author,             :public,   true],
-        [:public, :private, :author,             :internal, true],
-        [:public, :private, :author,             :private,  true],
-
-        [:public, :disabled, :unauthenticated,   :public,   false],
-        [:public, :disabled, :unauthenticated,   :internal, false],
-        [:public, :disabled, :unauthenticated,   :private,  false],
-
-        [:public, :disabled, :external,          :public,   false],
-        [:public, :disabled, :external,          :internal, false],
-        [:public, :disabled, :external,          :private,  false],
-
-        [:public, :disabled, :non_member,        :public,   false],
-        [:public, :disabled, :non_member,        :internal, false],
-        [:public, :disabled, :non_member,        :private,  false],
-
-        [:public, :disabled, :member,            :public,   false],
-        [:public, :disabled, :member,            :internal, false],
-        [:public, :disabled, :member,            :private,  false],
-
-        [:public, :disabled, :author,            :public,   false],
-        [:public, :disabled, :author,            :internal, false],
-        [:public, :disabled, :author,            :private,  false],
-
-        # Internal projects
-        [:internal, :enabled, :unauthenticated,  :public,   false],
-        [:internal, :enabled, :unauthenticated,  :internal, false],
-        [:internal, :enabled, :unauthenticated,  :private,  false],
-
-        [:internal, :enabled, :external,         :public,   false],
-        [:internal, :enabled, :external,         :internal, false],
-        [:internal, :enabled, :external,         :private,  false],
-
-        [:internal, :enabled, :non_member,       :public,   true],
-        [:internal, :enabled, :non_member,       :internal, true],
-        [:internal, :enabled, :non_member,       :private,  false],
-
-        [:internal, :enabled, :member,           :public,   true],
-        [:internal, :enabled, :member,           :internal, true],
-        [:internal, :enabled, :member,           :private,  true],
-
-        [:internal, :enabled, :author,           :public,   true],
-        [:internal, :enabled, :author,           :internal, true],
-        [:internal, :enabled, :author,           :private,  true],
-
-        [:internal, :private, :unauthenticated,  :public,   false],
-        [:internal, :private, :unauthenticated,  :internal, false],
-        [:internal, :private, :unauthenticated,  :private,  false],
-
-        [:internal, :private, :external,         :public,   false],
-        [:internal, :private, :external,         :internal, false],
-        [:internal, :private, :external,         :private,  false],
-
-        [:internal, :private, :non_member,       :public,   false],
-        [:internal, :private, :non_member,       :internal, false],
-        [:internal, :private, :non_member,       :private,  false],
-
-        [:internal, :private, :member,           :public,   true],
-        [:internal, :private, :member,           :internal, true],
-        [:internal, :private, :member,           :private,  true],
-
-        [:internal, :private, :author,           :public,   true],
-        [:internal, :private, :author,           :internal, true],
-        [:internal, :private, :author,           :private,  true],
-
-        [:internal, :disabled, :unauthenticated, :public,   false],
-        [:internal, :disabled, :unauthenticated, :internal, false],
-        [:internal, :disabled, :unauthenticated, :private,  false],
-
-        [:internal, :disabled, :external,        :public,   false],
-        [:internal, :disabled, :external,        :internal, false],
-        [:internal, :disabled, :external,        :private,  false],
-
-        [:internal, :disabled, :non_member,      :public,   false],
-        [:internal, :disabled, :non_member,      :internal, false],
-        [:internal, :disabled, :non_member,      :private,  false],
-
-        [:internal, :disabled, :member,          :public,   false],
-        [:internal, :disabled, :member,          :internal, false],
-        [:internal, :disabled, :member,          :private,  false],
-
-        [:internal, :disabled, :author,          :public,   false],
-        [:internal, :disabled, :author,          :internal, false],
-        [:internal, :disabled, :author,          :private,  false],
-
-        # Private projects
-        [:private, :enabled, :unauthenticated,   :public,   false],
-        [:private, :enabled, :unauthenticated,   :internal, false],
-        [:private, :enabled, :unauthenticated,   :private,  false],
-
-        [:private, :enabled, :external,          :public,   true],
-        [:private, :enabled, :external,          :internal, true],
-        [:private, :enabled, :external,          :private,  true],
-
-        [:private, :enabled, :non_member,        :public,   false],
-        [:private, :enabled, :non_member,        :internal, false],
-        [:private, :enabled, :non_member,        :private,  false],
-
-        [:private, :enabled, :member,            :public,   true],
-        [:private, :enabled, :member,            :internal, true],
-        [:private, :enabled, :member,            :private,  true],
-
-        [:private, :enabled, :author,            :public,   true],
-        [:private, :enabled, :author,            :internal, true],
-        [:private, :enabled, :author,            :private,  true],
-
-        [:private, :private, :unauthenticated,   :public,   false],
-        [:private, :private, :unauthenticated,   :internal, false],
-        [:private, :private, :unauthenticated,   :private,  false],
-
-        [:private, :private, :external,          :public,   true],
-        [:private, :private, :external,          :internal, true],
-        [:private, :private, :external,          :private,  true],
-
-        [:private, :private, :non_member,        :public,   false],
-        [:private, :private, :non_member,        :internal, false],
-        [:private, :private, :non_member,        :private,  false],
-
-        [:private, :private, :member,            :public,   true],
-        [:private, :private, :member,            :internal, true],
-        [:private, :private, :member,            :private,  true],
-
-        [:private, :private, :author,            :public,   true],
-        [:private, :private, :author,            :internal, true],
-        [:private, :private, :author,            :private,  true],
-
-        [:private, :disabled, :unauthenticated,  :public,   false],
-        [:private, :disabled, :unauthenticated,  :internal, false],
-        [:private, :disabled, :unauthenticated,  :private,  false],
-
-        [:private, :disabled, :external,         :public,   false],
-        [:private, :disabled, :external,         :internal, false],
-        [:private, :disabled, :external,         :private,  false],
-
-        [:private, :disabled, :non_member,       :public,   false],
-        [:private, :disabled, :non_member,       :internal, false],
-        [:private, :disabled, :non_member,       :private,  false],
-
-        [:private, :disabled, :member,           :public,   false],
-        [:private, :disabled, :member,           :internal, false],
-        [:private, :disabled, :member,           :private,  false],
-
-        [:private, :disabled, :author,           :public,   false],
-        [:private, :disabled, :author,           :internal, false],
-        [:private, :disabled, :author,           :private,  false]
-      ]
-    end
-
-    with_them do
-      let!(:project) { create(:project, visibility_level: project_type_visibilities[project_type]) }
-      let!(:project_feature) { project.project_feature.update_column(:snippets_access_level, project_feature_visibilities[feature_visibility]) }
-      let!(:user) { users[user_type] }
-      let!(:snippet) { create(:project_snippet, visibility_level: snippet_type_visibilities[snippet_type], project: project, author: author) }
-      let!(:members) do
-        project.add_developer(author)
-        project.add_developer(member)
-        project.add_developer(external) if project.private?
-      end
-
-      context "For #{params[:project_type]} project and #{params[:user_type]} users" do
-        it 'should agree with the read_project_snippet policy' do
-          expect(can?(user, :read_project_snippet, snippet)).to eq(outcome)
-        end
-
-        it 'should return proper outcome' do
-          results = described_class.new(user, project: project).execute
-          expect(results.include?(snippet)).to eq(outcome)
-        end
-      end
-
-      context "Without a given project and #{params[:user_type]} users" do
-        it 'should return proper outcome' do
-          results = described_class.new(user).execute
-          expect(results.include?(snippet)).to eq(outcome)
-        end
-
-        it 'returns no snippets when the user cannot read cross project' do
-          allow(Ability).to receive(:allowed?).and_call_original
-          allow(Ability).to receive(:allowed?).with(user, :read_cross_project) { false }
-
-          snippets = described_class.new(user).execute
-
-          expect(snippets).to be_empty
-        end
-      end
-    end
-  end
-
-  context 'For personal snippets' do
-    let!(:users) do
-      {
-        unauthenticated: nil,
-        external: external,
-        non_member: create(:user),
-        author: author
-      }
-    end
-
-    where(:snippet_visibility, :user_type, :outcome) do
-      [
-        [:public,   :unauthenticated, true],
-        [:public,   :external,        true],
-        [:public,   :non_member,      true],
-        [:public,   :author,          true],
-
-        [:internal, :unauthenticated, false],
-        [:internal, :external,        false],
-        [:internal, :non_member,      true],
-        [:internal, :author,          true],
-
-        [:private,  :unauthenticated, false],
-        [:private,  :external,        false],
-        [:private,  :non_member,      false],
-        [:private,  :author,          true]
-      ]
-    end
-
-    with_them do
-      let!(:user) { users[user_type] }
-      let!(:snippet) { create(:personal_snippet, visibility_level: snippet_type_visibilities[snippet_visibility], author: author) }
-
-      context "For personal and #{params[:snippet_visibility]} snippets with #{params[:user_type]} user" do
-        it 'should agree with read_personal_snippet policy' do
-          expect(can?(user, :read_personal_snippet, snippet)).to eq(outcome)
-        end
-
-        it 'should return proper outcome' do
-          results = described_class.new(user).execute
-          expect(results.include?(snippet)).to eq(outcome)
-        end
-
-        it 'should return personal snippets when the user cannot read cross project' do
-          allow(Ability).to receive(:allowed?).and_call_original
-          allow(Ability).to receive(:allowed?).with(user, :read_cross_project) { false }
-
-          results = described_class.new(user).execute
-
-          expect(results.include?(snippet)).to eq(outcome)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/support/snippets_shared_examples.rb b/spec/support/snippets_shared_examples.rb
deleted file mode 100644
index 85f0facd5c3..00000000000
--- a/spec/support/snippets_shared_examples.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# These shared examples expect a `snippets` array of snippets
-RSpec.shared_examples 'paginated snippets' do |remote: false|
-  it "is limited to #{Snippet.default_per_page} items per page" do
-    expect(page.all('.snippets-list-holder .snippet-row').count).to eq(Snippet.default_per_page)
-  end
-
-  context 'clicking on the link to the second page' do
-    before do
-      click_link('2')
-      wait_for_requests if remote
-    end
-
-    it 'shows the remaining snippets' do
-      remaining_snippets_count = [snippets.size - Snippet.default_per_page, Snippet.default_per_page].min
-      expect(page).to have_selector('.snippets-list-holder .snippet-row', count: remaining_snippets_count)
-    end
-  end
-end
diff --git a/spec/support/stub_configuration.rb b/spec/support/stub_configuration.rb
deleted file mode 100644
index a75a3eaefcb..00000000000
--- a/spec/support/stub_configuration.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-module StubConfiguration
-  def stub_application_setting(messages)
-    add_predicates(messages)
-
-    # Stubbing both of these because we're not yet consistent with how we access
-    # current application settings
-    allow_any_instance_of(ApplicationSetting).to receive_messages(to_settings(messages))
-    allow(Gitlab::CurrentSettings.current_application_settings)
-      .to receive_messages(to_settings(messages))
-
-    # Ensure that we don't use the Markdown cache when stubbing these values
-    allow_any_instance_of(ApplicationSetting).to receive(:cached_html_up_to_date?).and_return(false)
-  end
-
-  def stub_not_protect_default_branch
-    stub_application_setting(
-      default_branch_protection: Gitlab::Access::PROTECTION_NONE)
-  end
-
-  def stub_config_setting(messages)
-    allow(Gitlab.config.gitlab).to receive_messages(to_settings(messages))
-  end
-
-  def stub_gravatar_setting(messages)
-    allow(Gitlab.config.gravatar).to receive_messages(to_settings(messages))
-  end
-
-  def stub_incoming_email_setting(messages)
-    allow(Gitlab.config.incoming_email).to receive_messages(to_settings(messages))
-  end
-
-  def stub_mattermost_setting(messages)
-    allow(Gitlab.config.mattermost).to receive_messages(to_settings(messages))
-  end
-
-  def stub_omniauth_setting(messages)
-    allow(Gitlab.config.omniauth).to receive_messages(to_settings(messages))
-  end
-
-  def stub_backup_setting(messages)
-    allow(Gitlab.config.backup).to receive_messages(to_settings(messages))
-  end
-
-  def stub_lfs_setting(messages)
-    allow(Gitlab.config.lfs).to receive_messages(to_settings(messages))
-  end
-
-  def stub_artifacts_setting(messages)
-    allow(Gitlab.config.artifacts).to receive_messages(to_settings(messages))
-  end
-
-  def stub_storage_settings(messages)
-    messages.deep_stringify_keys!
-
-    # Default storage is always required
-    messages['default'] ||= Gitlab.config.repositories.storages.default
-    messages.each do |storage_name, storage_hash|
-      if !storage_hash.key?('path') || storage_hash['path'] == Gitlab::GitalyClient::StorageSettings::Deprecated
-        storage_hash['path'] = TestEnv.repos_path
-      end
-
-      messages[storage_name] = Gitlab::GitalyClient::StorageSettings.new(storage_hash.to_h)
-    end
-
-    allow(Gitlab.config.repositories).to receive(:storages).and_return(Settingslogic.new(messages))
-  end
-
-  private
-
-  # Modifies stubbed messages to also stub possible predicate versions
-  #
-  # Examples:
-  #
-  #   add_predicates(foo: true)
-  #   # => {foo: true, foo?: true}
-  #
-  #   add_predicates(signup_enabled?: false)
-  #   # => {signup_enabled? false}
-  def add_predicates(messages)
-    # Only modify keys that aren't already predicates
-    keys = messages.keys.map(&:to_s).reject { |k| k.end_with?('?') }
-
-    keys.each do |key|
-      predicate = key + '?'
-      messages[predicate.to_sym] = messages[key.to_sym]
-    end
-  end
-
-  # Support nested hashes by converting all values into Settingslogic objects
-  def to_settings(hash)
-    hash.transform_values do |value|
-      if value.is_a? Hash
-        Settingslogic.new(value.deep_stringify_keys)
-      else
-        value
-      end
-    end
-  end
-end
diff --git a/spec/support/stub_env.rb b/spec/support/stub_env.rb
deleted file mode 100644
index 36b90fc68d6..00000000000
--- a/spec/support/stub_env.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Inspired by https://github.com/ljkbennett/stub_env/blob/master/lib/stub_env/helpers.rb
-module StubENV
-  def stub_env(key_or_hash, value = nil)
-    init_stub unless env_stubbed?
-
-    if key_or_hash.is_a? Hash
-      key_or_hash.each { |k, v| add_stubbed_value(k, v) }
-    else
-      add_stubbed_value key_or_hash, value
-    end
-  end
-
-  private
-
-  STUBBED_KEY = '__STUBBED__'.freeze
-
-  def add_stubbed_value(key, value)
-    allow(ENV).to receive(:[]).with(key).and_return(value)
-    allow(ENV).to receive(:key?).with(key).and_return(true)
-    allow(ENV).to receive(:fetch).with(key).and_return(value)
-    allow(ENV).to receive(:fetch).with(key, anything()) do |_, default_val|
-      value || default_val
-    end
-  end
-
-  def env_stubbed?
-    ENV[STUBBED_KEY]
-  end
-
-  def init_stub
-    allow(ENV).to receive(:[]).and_call_original
-    allow(ENV).to receive(:key?).and_call_original
-    allow(ENV).to receive(:fetch).and_call_original
-    add_stubbed_value(STUBBED_KEY, true)
-  end
-end
diff --git a/spec/support/stub_feature_flags.rb b/spec/support/stub_feature_flags.rb
deleted file mode 100644
index b96338bf548..00000000000
--- a/spec/support/stub_feature_flags.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module StubFeatureFlags
-  def stub_feature_flags(features)
-    features.each do |feature_name, enabled|
-      allow(Feature).to receive(:enabled?).with(feature_name) { enabled }
-      allow(Feature).to receive(:enabled?).with(feature_name.to_s) { enabled }
-    end
-  end
-end
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
deleted file mode 100644
index c1618f5086c..00000000000
--- a/spec/support/stub_gitlab_calls.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-module StubGitlabCalls
-  def stub_gitlab_calls
-    stub_session
-    stub_user
-    stub_project_8
-    stub_project_8_hooks
-    stub_projects
-    stub_projects_owned
-    stub_ci_enable
-  end
-
-  def stub_js_gitlab_calls
-    allow_any_instance_of(Network).to receive(:projects) { project_hash_array }
-  end
-
-  def stub_ci_pipeline_to_return_yaml_file
-    stub_ci_pipeline_yaml_file(gitlab_ci_yaml)
-  end
-
-  def stub_ci_pipeline_yaml_file(ci_yaml)
-    allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file) { ci_yaml }
-  end
-
-  def stub_repository_ci_yaml_file(sha:, path: '.gitlab-ci.yml')
-    allow_any_instance_of(Repository)
-      .to receive(:gitlab_ci_yml_for).with(sha, path)
-      .and_return(gitlab_ci_yaml)
-  end
-
-  def stub_ci_builds_disabled
-    allow_any_instance_of(Project).to receive(:builds_enabled?).and_return(false)
-  end
-
-  def stub_container_registry_config(registry_settings)
-    allow(Gitlab.config.registry).to receive_messages(registry_settings)
-    allow(Auth::ContainerRegistryAuthenticationService)
-      .to receive(:full_access_token).and_return('token')
-  end
-
-  def stub_container_registry_tags(repository: :any, tags:)
-    repository = any_args if repository == :any
-
-    allow_any_instance_of(ContainerRegistry::Client)
-      .to receive(:repository_tags).with(repository)
-      .and_return({ 'tags' => tags })
-
-    allow_any_instance_of(ContainerRegistry::Client)
-      .to receive(:repository_manifest).with(repository, anything)
-      .and_return(stub_container_registry_tag_manifest)
-
-    allow_any_instance_of(ContainerRegistry::Client)
-      .to receive(:blob).with(repository, anything, 'application/octet-stream')
-      .and_return(stub_container_registry_blob)
-  end
-
-  private
-
-  def stub_container_registry_tag_manifest
-    fixture_path = 'spec/fixtures/container_registry/tag_manifest.json'
-
-    JSON.parse(File.read(Rails.root + fixture_path))
-  end
-
-  def stub_container_registry_blob
-    fixture_path = 'spec/fixtures/container_registry/config_blob.json'
-
-    File.read(Rails.root + fixture_path)
-  end
-
-  def gitlab_url
-    Gitlab.config.gitlab.url
-  end
-
-  def stub_session
-    f = File.read(Rails.root.join('spec/support/gitlab_stubs/session.json'))
-
-    stub_request(:post, "#{gitlab_url}api/v3/session.json")
-      .with(body: "{\"email\":\"test@test.com\",\"password\":\"123456\"}",
-            headers: { 'Content-Type' => 'application/json' })
-      .to_return(status: 201, body: f, headers: { 'Content-Type' => 'application/json' })
-  end
-
-  def stub_user
-    f = File.read(Rails.root.join('spec/support/gitlab_stubs/user.json'))
-
-    stub_request(:get, "#{gitlab_url}api/v3/user?private_token=Wvjy2Krpb7y8xi93owUz")
-      .with(headers: { 'Content-Type' => 'application/json' })
-      .to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
-
-    stub_request(:get, "#{gitlab_url}api/v3/user?access_token=some_token")
-      .with(headers: { 'Content-Type' => 'application/json' })
-      .to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
-  end
-
-  def stub_project_8
-    data = File.read(Rails.root.join('spec/support/gitlab_stubs/project_8.json'))
-    allow_any_instance_of(Network).to receive(:project).and_return(JSON.parse(data))
-  end
-
-  def stub_project_8_hooks
-    data = File.read(Rails.root.join('spec/support/gitlab_stubs/project_8_hooks.json'))
-    allow_any_instance_of(Network).to receive(:project_hooks).and_return(JSON.parse(data))
-  end
-
-  def stub_projects
-    f = File.read(Rails.root.join('spec/support/gitlab_stubs/projects.json'))
-
-    stub_request(:get, "#{gitlab_url}api/v3/projects.json?archived=false&ci_enabled_first=true&private_token=Wvjy2Krpb7y8xi93owUz")
-      .with(headers: { 'Content-Type' => 'application/json' })
-      .to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
-  end
-
-  def stub_projects_owned
-    stub_request(:get, "#{gitlab_url}api/v3/projects/owned.json?archived=false&ci_enabled_first=true&private_token=Wvjy2Krpb7y8xi93owUz")
-      .with(headers: { 'Content-Type' => 'application/json' })
-      .to_return(status: 200, body: "", headers: {})
-  end
-
-  def stub_ci_enable
-    stub_request(:put, "#{gitlab_url}api/v3/projects/2/services/gitlab-ci.json?private_token=Wvjy2Krpb7y8xi93owUz")
-      .with(headers: { 'Content-Type' => 'application/json' })
-      .to_return(status: 200, body: "", headers: {})
-  end
-
-  def project_hash_array
-    f = File.read(Rails.root.join('spec/support/gitlab_stubs/projects.json'))
-    JSON.parse f
-  end
-end
diff --git a/spec/support/stub_gitlab_data.rb b/spec/support/stub_gitlab_data.rb
deleted file mode 100644
index fa402f35b95..00000000000
--- a/spec/support/stub_gitlab_data.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module StubGitlabData
-  def gitlab_ci_yaml
-    File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
-  end
-end
diff --git a/spec/support/stub_object_storage.rb b/spec/support/stub_object_storage.rb
deleted file mode 100644
index 6e88641da42..00000000000
--- a/spec/support/stub_object_storage.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-module StubConfiguration
-  def stub_object_storage_uploader(
-        config:,
-        uploader:,
-        remote_directory:,
-        enabled: true,
-        proxy_download: false,
-        background_upload: false,
-        direct_upload: false
-  )
-    allow(config).to receive(:enabled) { enabled }
-    allow(config).to receive(:proxy_download) { proxy_download }
-    allow(config).to receive(:background_upload) { background_upload }
-    allow(config).to receive(:direct_upload) { direct_upload }
-
-    return unless enabled
-
-    Fog.mock!
-
-    ::Fog::Storage.new(uploader.object_store_credentials).tap do |connection|
-      begin
-        connection.directories.create(key: remote_directory)
-      rescue Excon::Error::Conflict
-      end
-    end
-  end
-
-  def stub_artifacts_object_storage(**params)
-    stub_object_storage_uploader(config: Gitlab.config.artifacts.object_store,
-                                 uploader: JobArtifactUploader,
-                                 remote_directory: 'artifacts',
-                                 **params)
-  end
-
-  def stub_lfs_object_storage(**params)
-    stub_object_storage_uploader(config: Gitlab.config.lfs.object_store,
-                                 uploader: LfsObjectUploader,
-                                 remote_directory: 'lfs-objects',
-                                 **params)
-  end
-
-  def stub_uploads_object_storage(uploader = described_class, **params)
-    stub_object_storage_uploader(config: Gitlab.config.uploads.object_store,
-                                 uploader: uploader,
-                                 remote_directory: 'uploads',
-                                 **params)
-  end
-end
diff --git a/spec/support/taskable_shared_examples.rb b/spec/support/taskable_shared_examples.rb
deleted file mode 100644
index 4056ff06b84..00000000000
--- a/spec/support/taskable_shared_examples.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# Specs for task state functionality for issues and merge requests.
-#
-# Requires a context containing:
-#   subject { Issue or MergeRequest }
-shared_examples 'a Taskable' do
-  describe 'with multiple tasks' do
-    before do
-      subject.description = <<-EOT.strip_heredoc
-        * [ ] Task 1
-        * [x] Task 2
-        * [x] Task 3
-        * [ ] Task 4
-        * [ ] Task 5
-      EOT
-    end
-
-    it 'returns the correct task status' do
-      expect(subject.task_status).to match('2 of')
-      expect(subject.task_status).to match('5 tasks completed')
-      expect(subject.task_status_short).to match('2/')
-      expect(subject.task_status_short).to match('5 tasks')
-    end
-
-    describe '#tasks?' do
-      it 'returns true when object has tasks' do
-        expect(subject.tasks?).to eq true
-      end
-
-      it 'returns false when object has no tasks' do
-        subject.description = 'Now I have no tasks'
-        expect(subject.tasks?).to eq false
-      end
-    end
-  end
-
-  describe 'with nested tasks' do
-    before do
-      subject.description = <<-EOT.strip_heredoc
-        - [ ] Task a
-          - [x] Task a.1
-          - [ ] Task a.2
-        - [ ] Task b
-
-        1. [ ] Task 1
-          1. [ ] Task 1.1
-          1. [ ] Task 1.2
-        1. [x] Task 2
-          1. [x] Task 2.1
-      EOT
-    end
-
-    it 'returns the correct task status' do
-      expect(subject.task_status).to match('3 of')
-      expect(subject.task_status).to match('9 tasks completed')
-      expect(subject.task_status_short).to match('3/')
-      expect(subject.task_status_short).to match('9 tasks')
-    end
-  end
-
-  describe 'with an incomplete task' do
-    before do
-      subject.description = <<-EOT.strip_heredoc
-        * [ ] Task 1
-      EOT
-    end
-
-    it 'returns the correct task status' do
-      expect(subject.task_status).to match('0 of')
-      expect(subject.task_status).to match('1 task completed')
-      expect(subject.task_status_short).to match('0/')
-      expect(subject.task_status_short).to match('1 task')
-    end
-  end
-
-  describe 'with tasks that are not formatted correctly' do
-    before do
-      subject.description = <<-EOT.strip_heredoc
-        [ ] task 1
-        [ ] task 2
-
-        - [ ]task 1
-        -[ ] task 2
-      EOT
-    end
-
-    it 'returns the correct task status' do
-      expect(subject.task_status).to match('0 of')
-      expect(subject.task_status).to match('0 tasks completed')
-      expect(subject.task_status_short).to match('0/')
-      expect(subject.task_status_short).to match('0 task')
-    end
-  end
-
-  describe 'with a complete task' do
-    before do
-      subject.description = <<-EOT.strip_heredoc
-        * [x] Task 1
-      EOT
-    end
-
-    it 'returns the correct task status' do
-      expect(subject.task_status).to match('1 of')
-      expect(subject.task_status).to match('1 task completed')
-      expect(subject.task_status_short).to match('1/')
-      expect(subject.task_status_short).to match('1 task')
-    end
-  end
-end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
deleted file mode 100644
index d87f265cdf0..00000000000
--- a/spec/support/test_env.rb
+++ /dev/null
@@ -1,366 +0,0 @@
-require 'rspec/mocks'
-require 'toml-rb'
-
-module TestEnv
-  extend self
-
-  ComponentFailedToInstallError = Class.new(StandardError)
-
-  # When developing the seed repository, comment out the branch you will modify.
-  BRANCH_SHA = {
-    'signed-commits'                     => '2d1096e',
-    'not-merged-branch'                  => 'b83d6e3',
-    'branch-merged'                      => '498214d',
-    'empty-branch'                       => '7efb185',
-    'ends-with.json'                     => '98b0d8b',
-    'flatten-dir'                        => 'e56497b',
-    'feature'                            => '0b4bc9a',
-    'feature_conflict'                   => 'bb5206f',
-    'fix'                                => '48f0be4',
-    'improve/awesome'                    => '5937ac0',
-    'merged-target'                      => '21751bf',
-    'markdown'                           => '0ed8c6c',
-    'lfs'                                => '55bc176',
-    'master'                             => 'b83d6e3',
-    'merge-test'                         => '5937ac0',
-    "'test'"                             => 'e56497b',
-    'orphaned-branch'                    => '45127a9',
-    'binary-encoding'                    => '7b1cf43',
-    'gitattributes'                      => '5a62481',
-    'expand-collapse-diffs'              => '4842455',
-    'symlink-expand-diff'                => '81e6355',
-    'expand-collapse-files'              => '025db92',
-    'expand-collapse-lines'              => '238e82d',
-    'video'                              => '8879059',
-    'add-balsamiq-file'                  => 'b89b56d',
-    'crlf-diff'                          => '5938907',
-    'conflict-start'                     => '824be60',
-    'conflict-resolvable'                => '1450cd6',
-    'conflict-binary-file'               => '259a6fb',
-    'conflict-contains-conflict-markers' => '78a3086',
-    'conflict-missing-side'              => 'eb227b3',
-    'conflict-non-utf8'                  => 'd0a293c',
-    'conflict-too-large'                 => '39fa04f',
-    'deleted-image-test'                 => '6c17798',
-    'wip'                                => 'b9238ee',
-    'csv'                                => '3dd0896',
-    'v1.1.0'                             => 'b83d6e3',
-    'add-ipython-files'                  => '93ee732',
-    'add-pdf-file'                       => 'e774ebd',
-    'add-pdf-text-binary'                => '79faa7b',
-    'add_images_and_changes'             => '010d106'
-  }.freeze
-
-  # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
-  # need to keep all the branches in sync.
-  # We currently only need a subset of the branches
-  FORKED_BRANCH_SHA = {
-    'add-submodule-version-bump' => '3f547c0',
-    'master'                     => '5937ac0',
-    'remove-submodule'           => '2a33e0c',
-    'conflict-resolvable-fork'   => '404fa3f'
-  }.freeze
-
-  TMP_TEST_PATH = Rails.root.join('tmp', 'tests', '**')
-  REPOS_STORAGE = 'default'.freeze
-
-  # Test environment
-  #
-  # See gitlab.yml.example test section for paths
-  #
-  def init(opts = {})
-    unless Rails.env.test?
-      puts "\nTestEnv.init can only be run if `RAILS_ENV` is set to 'test' not '#{Rails.env}'!\n"
-      exit 1
-    end
-
-    # Disable mailer for spinach tests
-    disable_mailer if opts[:mailer] == false
-
-    clean_test_path
-
-    # Setup GitLab shell for test instance
-    setup_gitlab_shell
-
-    setup_gitaly
-
-    # Create repository for FactoryBot.create(:project)
-    setup_factory_repo
-
-    # Create repository for FactoryBot.create(:forked_project_with_submodules)
-    setup_forked_repo
-  end
-
-  def disable_mailer
-    allow_any_instance_of(NotificationService).to receive(:mailer)
-      .and_return(double.as_null_object)
-  end
-
-  def enable_mailer
-    allow_any_instance_of(NotificationService).to receive(:mailer)
-      .and_call_original
-  end
-
-  def disable_pre_receive
-    allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([true, nil])
-  end
-
-  # Clean /tmp/tests
-  #
-  # Keeps gitlab-shell and gitlab-test
-  def clean_test_path
-    Dir[TMP_TEST_PATH].each do |entry|
-      unless File.basename(entry) =~ /\A(gitaly|gitlab-(shell|test|test_bare|test-fork|test-fork_bare))\z/
-        FileUtils.rm_rf(entry)
-      end
-    end
-
-    FileUtils.mkdir_p(repos_path)
-    FileUtils.mkdir_p(backup_path)
-    FileUtils.mkdir_p(pages_path)
-    FileUtils.mkdir_p(artifacts_path)
-  end
-
-  def clean_gitlab_test_path
-    Dir[TMP_TEST_PATH].each do |entry|
-      if File.basename(entry) =~ /\A(gitlab-(test|test_bare|test-fork|test-fork_bare))\z/
-        FileUtils.rm_rf(entry)
-      end
-    end
-  end
-
-  def setup_gitlab_shell
-    component_timed_setup('GitLab Shell',
-      install_dir: Gitlab.config.gitlab_shell.path,
-      version: Gitlab::Shell.version_required,
-      task: 'gitlab:shell:install')
-  end
-
-  def setup_gitaly
-    socket_path = Gitlab::GitalyClient.address('default').sub(/\Aunix:/, '')
-    gitaly_dir = File.dirname(socket_path)
-
-    component_timed_setup('Gitaly',
-      install_dir: gitaly_dir,
-      version: Gitlab::GitalyClient.expected_server_version,
-      task: "gitlab:gitaly:install[#{gitaly_dir}]") do
-
-      # Always re-create config, in case it's outdated. This is fast anyway.
-      Gitlab::SetupHelper.create_gitaly_configuration(gitaly_dir, force: true)
-
-      start_gitaly(gitaly_dir)
-    end
-  end
-
-  def start_gitaly(gitaly_dir)
-    if ENV['CI'].present?
-      # Gitaly has been spawned outside this process already
-      return
-    end
-
-    spawn_script = Rails.root.join('scripts/gitaly-test-spawn').to_s
-    @gitaly_pid = Bundler.with_original_env { IO.popen([spawn_script], &:read).to_i }
-    Kernel.at_exit { stop_gitaly }
-
-    wait_gitaly
-  end
-
-  def wait_gitaly
-    sleep_time = 10
-    sleep_interval = 0.1
-    socket = Gitlab::GitalyClient.address('default').sub('unix:', '')
-
-    Integer(sleep_time / sleep_interval).times do
-      begin
-        Socket.unix(socket)
-        return
-      rescue
-        sleep sleep_interval
-      end
-    end
-
-    raise "could not connect to gitaly at #{socket.inspect} after #{sleep_time} seconds"
-  end
-
-  def stop_gitaly
-    return unless @gitaly_pid
-
-    Process.kill('KILL', @gitaly_pid)
-  rescue Errno::ESRCH
-    # The process can already be gone if the test run was INTerrupted.
-  end
-
-  def setup_factory_repo
-    setup_repo(factory_repo_path, factory_repo_path_bare, factory_repo_name,
-               BRANCH_SHA)
-  end
-
-  # This repo has a submodule commit that is not present in the main test
-  # repository.
-  def setup_forked_repo
-    setup_repo(forked_repo_path, forked_repo_path_bare, forked_repo_name,
-               FORKED_BRANCH_SHA)
-  end
-
-  def setup_repo(repo_path, repo_path_bare, repo_name, refs)
-    clone_url = "https://gitlab.com/gitlab-org/#{repo_name}.git"
-
-    unless File.directory?(repo_path)
-      system(*%W(#{Gitlab.config.git.bin_path} clone -q #{clone_url} #{repo_path}))
-    end
-
-    set_repo_refs(repo_path, refs)
-
-    unless File.directory?(repo_path_bare)
-      # We must copy bare repositories because we will push to them.
-      system(git_env, *%W(#{Gitlab.config.git.bin_path} clone -q --bare #{repo_path} #{repo_path_bare}))
-    end
-  end
-
-  def copy_repo(project, bare_repo:, refs:)
-    target_repo_path = File.expand_path(project.repository_storage_path + "/#{project.disk_path}.git")
-    FileUtils.mkdir_p(target_repo_path)
-    FileUtils.cp_r("#{File.expand_path(bare_repo)}/.", target_repo_path)
-    FileUtils.chmod_R 0755, target_repo_path
-    set_repo_refs(target_repo_path, refs)
-  end
-
-  def repos_path
-    Gitlab.config.repositories.storages[REPOS_STORAGE].legacy_disk_path
-  end
-
-  def backup_path
-    Gitlab.config.backup.path
-  end
-
-  def pages_path
-    Gitlab.config.pages.path
-  end
-
-  def artifacts_path
-    Gitlab.config.artifacts.storage_path
-  end
-
-  # When no cached assets exist, manually hit the root path to create them
-  #
-  # Otherwise they'd be created by the first test, often timing out and
-  # causing a transient test failure
-  def eager_load_driver_server
-    return unless defined?(Capybara)
-
-    puts "Starting the Capybara driver server..."
-    Capybara.current_session.visit '/'
-  end
-
-  def factory_repo_path_bare
-    "#{factory_repo_path}_bare"
-  end
-
-  def forked_repo_path_bare
-    "#{forked_repo_path}_bare"
-  end
-
-  def with_empty_bare_repository(name = nil)
-    path = Rails.root.join('tmp/tests', name || 'empty-bare-repository').to_s
-
-    yield(Rugged::Repository.init_at(path, :bare))
-  ensure
-    FileUtils.rm_rf(path)
-  end
-
-  private
-
-  def factory_repo_path
-    @factory_repo_path ||= Rails.root.join('tmp', 'tests', factory_repo_name)
-  end
-
-  def factory_repo_name
-    'gitlab-test'
-  end
-
-  def forked_repo_path
-    @forked_repo_path ||= Rails.root.join('tmp', 'tests', forked_repo_name)
-  end
-
-  def forked_repo_name
-    'gitlab-test-fork'
-  end
-
-  # Prevent developer git configurations from being persisted to test
-  # repositories
-  def git_env
-    { 'GIT_TEMPLATE_DIR' => '' }
-  end
-
-  def set_repo_refs(repo_path, branch_sha)
-    instructions = branch_sha.map { |branch, sha| "update refs/heads/#{branch}\x00#{sha}\x00" }.join("\x00") << "\x00"
-    update_refs = %W(#{Gitlab.config.git.bin_path} update-ref --stdin -z)
-    reset = proc do
-      Dir.chdir(repo_path) do
-        IO.popen(update_refs, "w") { |io| io.write(instructions) }
-        $?.success?
-      end
-    end
-
-    # Try to reset without fetching to avoid using the network.
-    unless reset.call
-      raise 'Could not fetch test seed repository.' unless system(*%W(#{Gitlab.config.git.bin_path} -C #{repo_path} fetch origin))
-
-      # Before we used Git clone's --mirror option, bare repos could end up
-      # with missing refs, clearing them and retrying should fix the issue.
-      clean_gitlab_test_path && init unless reset.call
-    end
-  end
-
-  def component_timed_setup(component, install_dir:, version:, task:)
-    puts "\n==> Setting up #{component}..."
-    start = Time.now
-
-    ensure_component_dir_name_is_correct!(component, install_dir)
-
-    # On CI, once installed, components never need update
-    return if File.exist?(install_dir) && ENV['CI']
-
-    if component_needs_update?(install_dir, version)
-      # Cleanup the component entirely to ensure we start fresh
-      FileUtils.rm_rf(install_dir)
-
-      unless system('rake', task)
-        raise ComponentFailedToInstallError
-      end
-    end
-
-    yield if block_given?
-
-  rescue ComponentFailedToInstallError
-    puts "\n#{component} failed to install, cleaning up #{install_dir}!\n"
-    FileUtils.rm_rf(install_dir)
-    exit 1
-  ensure
-    puts "    #{component} setup in #{Time.now - start} seconds...\n"
-  end
-
-  def ensure_component_dir_name_is_correct!(component, path)
-    actual_component_dir_name = File.basename(path)
-    expected_component_dir_name = component.parameterize
-
-    unless actual_component_dir_name == expected_component_dir_name
-      puts "    #{component} install dir should be named '#{expected_component_dir_name}', not '#{actual_component_dir_name}' (full install path given was '#{path}')!\n"
-      exit 1
-    end
-  end
-
-  def component_needs_update?(component_folder, expected_version)
-    # Allow local overrides of the component for tests during development
-    return false if Rails.env.test? && File.symlink?(component_folder)
-
-    version = File.read(File.join(component_folder, 'VERSION')).strip
-
-    # Notice that this will always yield true when using branch versions
-    # (`=branch_name`), but that actually makes sure the server is always based
-    # on the latest branch revision.
-    version != expected_version
-  rescue Errno::ENOENT
-    true
-  end
-end
diff --git a/spec/support/time_tracking_shared_examples.rb b/spec/support/time_tracking_shared_examples.rb
deleted file mode 100644
index 909d4e2ee8d..00000000000
--- a/spec/support/time_tracking_shared_examples.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-shared_examples 'issuable time tracker' do
-  it 'renders the sidebar component empty state' do
-    page.within '.time-tracking-no-tracking-pane' do
-      expect(page).to have_content 'No estimate or time spent'
-    end
-  end
-
-  it 'updates the sidebar component when estimate is added' do
-    submit_time('/estimate 3w 1d 1h')
-
-    wait_for_requests
-    page.within '.time-tracking-estimate-only-pane' do
-      expect(page).to have_content '3w 1d 1h'
-    end
-  end
-
-  it 'updates the sidebar component when spent is added' do
-    submit_time('/spend 3w 1d 1h')
-
-    wait_for_requests
-    page.within '.time-tracking-spend-only-pane' do
-      expect(page).to have_content '3w 1d 1h'
-    end
-  end
-
-  it 'shows the comparison when estimate and spent are added' do
-    submit_time('/estimate 3w 1d 1h')
-    submit_time('/spend 3w 1d 1h')
-
-    wait_for_requests
-    page.within '.time-tracking-comparison-pane' do
-      expect(page).to have_content '3w 1d 1h'
-    end
-  end
-
-  it 'updates the sidebar component when estimate is removed' do
-    submit_time('/estimate 3w 1d 1h')
-    submit_time('/remove_estimate')
-
-    page.within '.time-tracking-component-wrap' do
-      expect(page).to have_content 'No estimate or time spent'
-    end
-  end
-
-  it 'updates the sidebar component when spent is removed' do
-    submit_time('/spend 3w 1d 1h')
-    submit_time('/remove_time_spent')
-
-    page.within '.time-tracking-component-wrap' do
-      expect(page).to have_content 'No estimate or time spent'
-    end
-  end
-
-  it 'shows the help state when icon is clicked' do
-    page.within '.time-tracking-component-wrap' do
-      find('.help-button').click
-      expect(page).to have_content 'Track time with quick actions'
-      expect(page).to have_content 'Learn more'
-    end
-  end
-
-  it 'hides the help state when close icon is clicked' do
-    page.within '.time-tracking-component-wrap' do
-      find('.help-button').click
-      find('.close-help-button').click
-
-      expect(page).not_to have_content 'Track time with quick actions'
-      expect(page).not_to have_content 'Learn more'
-    end
-  end
-
-  it 'displays the correct help url' do
-    page.within '.time-tracking-component-wrap' do
-      find('.help-button').click
-
-      expect(find_link('Learn more')[:href]).to have_content('/help/workflow/time_tracking.md')
-    end
-  end
-end
-
-def submit_time(quick_action)
-  fill_in 'note[note]', with: quick_action
-  find('.js-comment-submit-button').click
-  wait_for_requests
-end
diff --git a/spec/support/unique_ip_check_shared_examples.rb b/spec/support/unique_ip_check_shared_examples.rb
deleted file mode 100644
index e5c8ac6a004..00000000000
--- a/spec/support/unique_ip_check_shared_examples.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-shared_context 'unique ips sign in limit' do
-  include StubENV
-  before do
-    Gitlab::Redis::Cache.with(&:flushall)
-    Gitlab::Redis::Queues.with(&:flushall)
-    Gitlab::Redis::SharedState.with(&:flushall)
-  end
-
-  before do
-    stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
-
-    Gitlab::CurrentSettings.update!(
-      unique_ips_limit_enabled: true,
-      unique_ips_limit_time_window: 10000
-    )
-  end
-
-  def change_ip(ip)
-    allow(Gitlab::RequestContext).to receive(:client_ip).and_return(ip)
-  end
-
-  def request_from_ip(ip)
-    change_ip(ip)
-    request
-    response
-  end
-
-  def operation_from_ip(ip)
-    change_ip(ip)
-    operation
-  end
-end
-
-shared_examples 'user login operation with unique ip limit' do
-  include_context 'unique ips sign in limit' do
-    before do
-      Gitlab::CurrentSettings.update!(unique_ips_limit_per_user: 1)
-    end
-
-    it 'allows user authenticating from the same ip' do
-      expect { operation_from_ip('ip') }.not_to raise_error
-      expect { operation_from_ip('ip') }.not_to raise_error
-    end
-
-    it 'blocks user authenticating from two distinct ips' do
-      expect { operation_from_ip('ip') }.not_to raise_error
-      expect { operation_from_ip('ip2') }.to raise_error(Gitlab::Auth::TooManyIps)
-    end
-  end
-end
-
-shared_examples 'user login request with unique ip limit' do |success_status = 200|
-  include_context 'unique ips sign in limit' do
-    before do
-      Gitlab::CurrentSettings.update!(unique_ips_limit_per_user: 1)
-    end
-
-    it 'allows user authenticating from the same ip' do
-      expect(request_from_ip('ip')).to have_gitlab_http_status(success_status)
-      expect(request_from_ip('ip')).to have_gitlab_http_status(success_status)
-    end
-
-    it 'blocks user authenticating from two distinct ips' do
-      expect(request_from_ip('ip')).to have_gitlab_http_status(success_status)
-      expect(request_from_ip('ip2')).to have_gitlab_http_status(403)
-    end
-  end
-end
diff --git a/spec/support/update_invalid_issuable.rb b/spec/support/update_invalid_issuable.rb
deleted file mode 100644
index 1490287681b..00000000000
--- a/spec/support/update_invalid_issuable.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-shared_examples 'update invalid issuable' do |klass|
-  let(:params) do
-    {
-      namespace_id: project.namespace.path,
-      project_id: project.path,
-      id: issuable.iid
-    }
-  end
-
-  let(:issuable) do
-    klass == Issue ? issue : merge_request
-  end
-
-  before do
-    if klass == Issue
-      params.merge!(issue: { title: "any" })
-    else
-      params.merge!(merge_request: { title: "any" })
-    end
-  end
-
-  context 'when updating causes conflicts' do
-    before do
-      allow_any_instance_of(issuable.class).to receive(:save)
-        .and_raise(ActiveRecord::StaleObjectError.new(issuable, :save))
-    end
-
-    it 'renders edit when format is html' do
-      put :update, params
-
-      expect(response).to render_template(:edit)
-      expect(assigns[:conflict]).to be_truthy
-    end
-
-    it 'renders json error message when format is json' do
-      params[:format] = "json"
-
-      put :update, params
-
-      expect(response.status).to eq(409)
-      expect(JSON.parse(response.body)).to have_key('errors')
-    end
-  end
-
-  context 'when updating an invalid issuable' do
-    before do
-      key = klass == Issue ? :issue : :merge_request
-      params[key][:title] = ""
-    end
-
-    it 'renders edit when merge request is invalid' do
-      put :update, params
-
-      expect(response).to render_template(:edit)
-    end
-  end
-end
diff --git a/spec/support/updating_mentions_shared_examples.rb b/spec/support/updating_mentions_shared_examples.rb
deleted file mode 100644
index 5e3f19ba19e..00000000000
--- a/spec/support/updating_mentions_shared_examples.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-RSpec.shared_examples 'updating mentions' do |service_class|
-  let(:mentioned_user) { create(:user) }
-  let(:service_class) { service_class }
-
-  before do
-    project.add_developer(mentioned_user)
-  end
-
-  def update_mentionable(opts)
-    perform_enqueued_jobs do
-      service_class.new(project, user, opts).execute(mentionable)
-    end
-
-    mentionable.reload
-  end
-
-  context 'in title' do
-    before do
-      update_mentionable(title: mentioned_user.to_reference)
-    end
-
-    it 'emails only the newly-mentioned user' do
-      should_only_email(mentioned_user)
-    end
-  end
-
-  context 'in description' do
-    before do
-      update_mentionable(description: mentioned_user.to_reference)
-    end
-
-    it 'emails only the newly-mentioned user' do
-      should_only_email(mentioned_user)
-    end
-  end
-end
diff --git a/spec/support/upload_helpers.rb b/spec/support/upload_helpers.rb
deleted file mode 100644
index 5eead80c935..00000000000
--- a/spec/support/upload_helpers.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'fileutils'
-
-module UploadHelpers
-  extend self
-
-  def uploaded_image_temp_path
-    basename = 'banana_sample.gif'
-    orig_path = File.join(Rails.root, 'spec', 'fixtures', basename)
-    tmp_path = File.join(Rails.root, 'tmp', 'tests', basename)
-    # Because we use 'move_to_store' on all uploaders, we create a new
-    # tempfile on each call: the file we return here will be renamed in most
-    # cases.
-    FileUtils.copy(orig_path, tmp_path)
-    tmp_path
-  end
-end
diff --git a/spec/support/user_activities_helpers.rb b/spec/support/user_activities_helpers.rb
deleted file mode 100644
index 44feb104644..00000000000
--- a/spec/support/user_activities_helpers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module UserActivitiesHelpers
-  def user_activity(user)
-    Gitlab::UserActivities.new
-      .find { |k, _| k == user.id.to_s }&.
-      second
-  end
-end
diff --git a/spec/support/wait_for_requests.rb b/spec/support/wait_for_requests.rb
deleted file mode 100644
index fda0e29f983..00000000000
--- a/spec/support/wait_for_requests.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-module WaitForRequests
-  extend self
-
-  # This is inspired by http://www.salsify.com/blog/engineering/tearing-capybara-ajax-tests
-  def block_and_wait_for_requests_complete
-    block_requests { wait_for_all_requests }
-  end
-
-  # Block all requests inside block with 503 response
-  def block_requests
-    Gitlab::Testing::RequestBlockerMiddleware.block_requests!
-    yield
-  ensure
-    Gitlab::Testing::RequestBlockerMiddleware.allow_requests!
-  end
-
-  # Slow down requests inside block by injecting `sleep 0.2` before each response
-  def slow_requests
-    Gitlab::Testing::RequestBlockerMiddleware.slow_requests!
-    yield
-  ensure
-    Gitlab::Testing::RequestBlockerMiddleware.allow_requests!
-  end
-
-  # Wait for client-side AJAX requests
-  def wait_for_requests
-    wait_for('JS requests complete') { finished_all_js_requests? }
-  end
-
-  # Wait for active Rack requests and client-side AJAX requests
-  def wait_for_all_requests
-    wait_for('pending requests complete') do
-      finished_all_rack_reqiests? &&
-        finished_all_js_requests?
-    end
-  end
-
-  private
-
-  def finished_all_rack_reqiests?
-    Gitlab::Testing::RequestBlockerMiddleware.num_active_requests.zero?
-  end
-
-  def finished_all_js_requests?
-    return true unless javascript_test?
-
-    finished_all_ajax_requests? &&
-      finished_all_vue_resource_requests?
-  end
-
-  # Waits until the passed block returns true
-  def wait_for(condition_name, max_wait_time: Capybara.default_max_wait_time, polling_interval: 0.01)
-    wait_until = Time.now + max_wait_time.seconds
-    loop do
-      break if yield
-
-      if Time.now > wait_until
-        raise "Condition not met: #{condition_name}"
-      else
-        sleep(polling_interval)
-      end
-    end
-  end
-
-  def finished_all_vue_resource_requests?
-    Capybara.page.evaluate_script('window.activeVueResources || 0').zero?
-  end
-
-  def finished_all_ajax_requests?
-    return true if Capybara.page.evaluate_script('typeof jQuery === "undefined"')
-
-    Capybara.page.evaluate_script('jQuery.active').zero?
-  end
-
-  def javascript_test?
-    Capybara.current_driver == Capybara.javascript_driver
-  end
-end
diff --git a/spec/support/workhorse_helpers.rb b/spec/support/workhorse_helpers.rb
deleted file mode 100644
index ef1f9f68671..00000000000
--- a/spec/support/workhorse_helpers.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module WorkhorseHelpers
-  extend self
-
-  def workhorse_send_data
-    @_workhorse_send_data ||= begin
-      header = response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]
-      split_header = header.split(':')
-      type = split_header.shift
-      header = split_header.join(':')
-      [
-        type,
-        JSON.parse(Base64.urlsafe_decode64(header))
-      ]
-    end
-  end
-
-  def workhorse_internal_api_request_header
-    jwt_token = JWT.encode({ 'iss' => 'gitlab-workhorse' }, Gitlab::Workhorse.secret, 'HS256')
-    { 'HTTP_' + Gitlab::Workhorse::INTERNAL_API_REQUEST_HEADER.upcase.tr('-', '_') => jwt_token }
-  end
-end
-- 
cgit v1.2.3


From d2aee809ed76ff2e7f57c820410b51898b3a226a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 29 Mar 2018 11:49:08 +0200
Subject: Introduce spec/fast_spec_helper.rb to run spec files that don't rely
 on the whole Rails env
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/initializers/2_app.rb |  2 ++
 lib/gitlab/git.rb            |  2 ++
 rubocop/spec_helpers.rb      |  2 +-
 spec/fast_spec_helper.rb     | 38 ++++++++++++++++++++++++++++++++++++++
 spec/lib/gitlab_spec.rb      |  4 +++-
 5 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 spec/fast_spec_helper.rb

diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb
index bd74f90e7d2..d6775d0a4ec 100644
--- a/config/initializers/2_app.rb
+++ b/config/initializers/2_app.rb
@@ -1,3 +1,5 @@
+require_dependency 'gitlab/popen'
+
 module Gitlab
   def self.config
     Settings
diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb
index c9abea90d21..e85e87a54af 100644
--- a/lib/gitlab/git.rb
+++ b/lib/gitlab/git.rb
@@ -1,3 +1,5 @@
+require_dependency 'gitlab/encoding_helper'
+
 module Gitlab
   module Git
     # The ID of empty tree.
diff --git a/rubocop/spec_helpers.rb b/rubocop/spec_helpers.rb
index 6c0f0193b1a..9bf5f1e3b18 100644
--- a/rubocop/spec_helpers.rb
+++ b/rubocop/spec_helpers.rb
@@ -1,6 +1,6 @@
 module RuboCop
   module SpecHelpers
-    SPEC_HELPERS = %w[spec_helper.rb rails_helper.rb].freeze
+    SPEC_HELPERS = %w[fast_spec_helper.rb rails_helper.rb spec_helper.rb].freeze
 
     # Returns true if the given node originated from the spec directory.
     def in_spec?(node)
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
new file mode 100644
index 00000000000..32eb8db0fa5
--- /dev/null
+++ b/spec/fast_spec_helper.rb
@@ -0,0 +1,38 @@
+require 'bundler/setup'
+
+require 'settingslogic'
+
+ENV["RAILS_ENV"] = 'test'
+ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true'
+
+unless Kernel.respond_to?(:require_dependency)
+  module Kernel
+    alias_method :require_dependency, :require
+  end
+end
+
+unless defined?(Rails)
+  module Rails
+    def self.root
+      Pathname.new(File.expand_path(''))
+    end
+
+    # Copied from https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails.rb#L59-L61
+    def self.env
+      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+    end
+  end
+end
+
+# Settings is used in config/initializers/2_app.rb
+class Settings < Settingslogic
+  source Rails.root.join('config/gitlab.yml')
+  namespace Rails.env
+end
+
+# Defines Gitlab and Gitlab.config
+unless defined?(Gitlab) && Gitlab.respond_to?(:config)
+  require_relative '../config/initializers/2_app'
+end
+
+require_relative 'support/rspec'
diff --git a/spec/lib/gitlab_spec.rb b/spec/lib/gitlab_spec.rb
index bd443a5d9e7..e734c12f6dd 100644
--- a/spec/lib/gitlab_spec.rb
+++ b/spec/lib/gitlab_spec.rb
@@ -1,4 +1,6 @@
-require 'rails_helper'
+require 'fast_spec_helper'
+
+require_dependency 'gitlab'
 
 describe Gitlab do
   describe '.com?' do
-- 
cgit v1.2.3


From fe919f95b140f95ffcefc6f7fbfd0e7b1da43016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 29 Mar 2018 12:28:10 +0200
Subject: Document the new 'spec/fast_spec_helper.rb' file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 doc/development/testing_guide/best_practices.md | 36 +++++++++++++++++++++----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index df80cd9f584..bf5144d6d1a 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -90,6 +90,25 @@ Finished in 34.51 seconds (files took 0.76702 seconds to load)
 
 Note: `live_debug` only works on javascript enabled specs.
 
+### Fast unit tests
+
+Some classes are well-isolated from Rails and you should be able to test them
+without the overhead added by the Rails environment and Bundler's `:default`
+group's gem loading. In these cases, you can `require 'fast_spec_helper'`
+instead of `require 'spec_helper'` in your test file, and your test should run
+really fast since:
+
+- Gems loading is skipped
+- Rails app boot is skipped
+- Gitlab::Shell and Gitaly setup are skipped
+- Test repositories setup are skipped
+
+Note that in some cases, you might have to add some `require_dependency 'foo'`
+in your file under test since Rails autoloading is not available in these cases.
+
+This shouldn't be a problem since explicitely listing dependencies should be
+considered a good practice anyway.
+
 ### `let` variables
 
 GitLab's RSpec suite has made extensive use of `let` variables to reduce
@@ -281,14 +300,13 @@ All fixtures should be be placed under `spec/fixtures/`.
 
 RSpec config files are files that change the RSpec config (i.e.
 `RSpec.configure do |config|` blocks). They should be placed under
-`spec/support/config/`.
+`spec/support/`.
 
 Each file should be related to a specific domain, e.g.
-`spec/support/config/capybara.rb`, `spec/support/config/carrierwave.rb`, etc.
+`spec/support/capybara.rb`, `spec/support/carrierwave.rb`, etc.
 
-Helpers can be included in the `spec/support/config/rspec.rb` file. If a
-helpers module applies only to a certain kind of specs, it should add modifiers
-to the `config.include` call. For instance if
+If a helpers module applies only to a certain kind of specs, it should add
+modifiers to the `config.include` call. For instance if
 `spec/support/helpers/cycle_analytics_helpers.rb` applies to `:lib` and
 `type: :model` specs only, you would write the following:
 
@@ -299,6 +317,14 @@ RSpec.configure do |config|
 end
 ```
 
+If a config file only consists of `config.include`, you can add these
+`config.include` directly in `spec/spec_helper.rb`.
+
+For very generic helpers, consider including them in the `spec/support/rspec.rb`
+file which is used by the `spec/fast_spec_helper.rb` file. See
+[Fast unit tests](#fast-unit-tests) for more details about the
+`spec/fast_spec_helper.rb` file.
+
 ---
 
 [Return to Testing documentation](index.md)
-- 
cgit v1.2.3


From c286c66f57e4fd716fe1746363f8c7cf4205cee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 10 Apr 2018 16:07:47 +0200
Subject: Move Settings to its own file, isolate it from Rails and introduce
 Gitlab.root
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/initializers/1_settings.rb | 130 +-------------------------------------
 config/initializers/2_app.rb      |   2 +-
 lib/gitlab.rb                     |   4 ++
 lib/settings.rb                   | 126 ++++++++++++++++++++++++++++++++++++
 spec/fast_spec_helper.rb          |  27 ++------
 spec/lib/gitlab_spec.rb           |   6 ++
 6 files changed, 144 insertions(+), 151 deletions(-)
 create mode 100644 lib/settings.rb

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index dc7999ac556..53e3c50df5f 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -1,131 +1,5 @@
-# rubocop:disable GitlabSecurity/PublicSend
-
-require_dependency Rails.root.join('lib/gitlab') # Load Gitlab as soon as possible
-
-class Settings < Settingslogic
-  source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" }
-  namespace Rails.env
-
-  class << self
-    def gitlab_on_standard_port?
-      on_standard_port?(gitlab)
-    end
-
-    def host_without_www(url)
-      host(url).sub('www.', '')
-    end
-
-    def build_gitlab_ci_url
-      custom_port =
-        if on_standard_port?(gitlab)
-          nil
-        else
-          ":#{gitlab.port}"
-        end
-
-      [
-        gitlab.protocol,
-        "://",
-        gitlab.host,
-        custom_port,
-        gitlab.relative_url_root
-      ].join('')
-    end
-
-    def build_pages_url
-      base_url(pages).join('')
-    end
-
-    def build_gitlab_shell_ssh_path_prefix
-      user_host = "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}"
-
-      if gitlab_shell.ssh_port != 22
-        "ssh://#{user_host}:#{gitlab_shell.ssh_port}/"
-      else
-        if gitlab_shell.ssh_host.include? ':'
-          "[#{user_host}]:"
-        else
-          "#{user_host}:"
-        end
-      end
-    end
-
-    def build_base_gitlab_url
-      base_url(gitlab).join('')
-    end
-
-    def build_gitlab_url
-      (base_url(gitlab) + [gitlab.relative_url_root]).join('')
-    end
-
-    # check that values in `current` (string or integer) is a contant in `modul`.
-    def verify_constant_array(modul, current, default)
-      values = default || []
-      unless current.nil?
-        values = []
-        current.each do |constant|
-          values.push(verify_constant(modul, constant, nil))
-        end
-        values.delete_if { |value| value.nil? }
-      end
-
-      values
-    end
-
-    # check that `current` (string or integer) is a contant in `modul`.
-    def verify_constant(modul, current, default)
-      constant = modul.constants.find { |name| modul.const_get(name) == current }
-      value = constant.nil? ? default : modul.const_get(constant)
-      if current.is_a? String
-        value = modul.const_get(current.upcase) rescue default
-      end
-
-      value
-    end
-
-    def absolute(path)
-      File.expand_path(path, Rails.root)
-    end
-
-    private
-
-    def base_url(config)
-      custom_port = on_standard_port?(config) ? nil : ":#{config.port}"
-
-      [
-        config.protocol,
-        "://",
-        config.host,
-        custom_port
-      ]
-    end
-
-    def on_standard_port?(config)
-      config.port.to_i == (config.https ? 443 : 80)
-    end
-
-    # Extract the host part of the given +url+.
-    def host(url)
-      url = url.downcase
-      url = "http://#{url}" unless url.start_with?('http')
-
-      # Get rid of the path so that we don't even have to encode it
-      url_without_path = url.sub(%r{(https?://[^/]+)/?.*}, '\1')
-
-      URI.parse(url_without_path).host
-    end
-
-    # Runs every minute in a random ten-minute period on Sundays, to balance the
-    # load on the server receiving these pings. The usage ping is safe to run
-    # multiple times because of a 24 hour exclusive lock.
-    def cron_for_usage_ping
-      hour = rand(24)
-      minute = rand(6)
-
-      "#{minute}0-#{minute}9 #{hour} * * 0"
-    end
-  end
-end
+require_dependency File.expand_path('../../lib/gitlab', __dir__) # Load Gitlab as soon as possible
+require_dependency File.expand_path('../../lib/settings', __dir__) # Load Settings as soon as possible
 
 # Default settings
 Settings['ldap'] ||= Settingslogic.new({})
diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb
index d6775d0a4ec..9d43239f7d3 100644
--- a/config/initializers/2_app.rb
+++ b/config/initializers/2_app.rb
@@ -5,6 +5,6 @@ module Gitlab
     Settings
   end
 
-  VERSION  = File.read(Rails.root.join("VERSION")).strip.freeze
+  VERSION  = File.read(Gitlab.root.join("VERSION")).strip.freeze
   REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
 end
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index f6629982512..a51ea0afbd9 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -5,6 +5,10 @@ module Gitlab
   APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
   SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
 
+  def self.root
+    Pathname.new(File.expand_path('..', __dir__))
+  end
+
   def self.com?
     # Check `gl_subdomain?` as well to keep parity with gitlab.com
     Gitlab.config.gitlab.url == COM_URL || gl_subdomain?
diff --git a/lib/settings.rb b/lib/settings.rb
new file mode 100644
index 00000000000..bc688eaf121
--- /dev/null
+++ b/lib/settings.rb
@@ -0,0 +1,126 @@
+require_dependency 'gitlab'
+
+class Settings < Settingslogic
+  source ENV.fetch('GITLAB_CONFIG') { Gitlab.root.join('config/gitlab.yml') }
+  namespace ENV.fetch('GITLAB_ENV') { Rails.env }
+
+  class << self
+    def gitlab_on_standard_port?
+      on_standard_port?(gitlab)
+    end
+
+    def host_without_www(url)
+      host(url).sub('www.', '')
+    end
+
+    def build_gitlab_ci_url
+      custom_port =
+        if on_standard_port?(gitlab)
+          nil
+        else
+          ":#{gitlab.port}"
+        end
+
+      [
+        gitlab.protocol,
+        "://",
+        gitlab.host,
+        custom_port,
+        gitlab.relative_url_root
+      ].join('')
+    end
+
+    def build_pages_url
+      base_url(pages).join('')
+    end
+
+    def build_gitlab_shell_ssh_path_prefix
+      user_host = "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}"
+
+      if gitlab_shell.ssh_port != 22
+        "ssh://#{user_host}:#{gitlab_shell.ssh_port}/"
+      else
+        if gitlab_shell.ssh_host.include? ':'
+          "[#{user_host}]:"
+        else
+          "#{user_host}:"
+        end
+      end
+    end
+
+    def build_base_gitlab_url
+      base_url(gitlab).join('')
+    end
+
+    def build_gitlab_url
+      (base_url(gitlab) + [gitlab.relative_url_root]).join('')
+    end
+
+    # check that values in `current` (string or integer) is a contant in `modul`.
+    def verify_constant_array(modul, current, default)
+      values = default || []
+      unless current.nil?
+        values = []
+        current.each do |constant|
+          values.push(verify_constant(modul, constant, nil))
+        end
+        values.delete_if { |value| value.nil? }
+      end
+
+      values
+    end
+
+    # check that `current` (string or integer) is a contant in `modul`.
+    def verify_constant(modul, current, default)
+      constant = modul.constants.find { |name| modul.const_get(name) == current }
+      value = constant.nil? ? default : modul.const_get(constant)
+      if current.is_a? String
+        value = modul.const_get(current.upcase) rescue default
+      end
+
+      value
+    end
+
+    def absolute(path)
+      File.expand_path(path, Rails.root)
+    end
+
+    private
+
+    def base_url(config)
+      custom_port = on_standard_port?(config) ? nil : ":#{config.port}"
+
+      [
+        config.protocol,
+        "://",
+        config.host,
+        custom_port
+      ]
+    end
+
+    def on_standard_port?(config)
+      config.port.to_i == (config.https ? 443 : 80)
+    end
+
+    # Extract the host part of the given +url+.
+    def host(url)
+      url = url.downcase
+      url = "http://#{url}" unless url.start_with?('http')
+
+      # Get rid of the path so that we don't even have to encode it
+      url_without_path = url.sub(%r{(https?://[^/]+)/?.*}, '\1')
+
+      URI.parse(url_without_path).host
+    end
+
+    # Runs every minute in a random ten-minute period on Sundays, to balance the
+    # load on the server receiving these pings. The usage ping is safe to run
+    # multiple times because of a 24 hour exclusive lock.
+    def cron_for_usage_ping
+      hour = rand(24)
+      minute = rand(6)
+
+      "#{minute}0-#{minute}9 #{hour} * * 0"
+    end
+  end
+end
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index 32eb8db0fa5..b3fe76fb150 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -2,8 +2,9 @@ require 'bundler/setup'
 
 require 'settingslogic'
 
-ENV["RAILS_ENV"] = 'test'
-ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true'
+ENV['GITLAB_ENV'] = 'test'
+ENV['RAILS_ENV'] = 'test'
+ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
 
 unless Kernel.respond_to?(:require_dependency)
   module Kernel
@@ -11,27 +12,9 @@ unless Kernel.respond_to?(:require_dependency)
   end
 end
 
-unless defined?(Rails)
-  module Rails
-    def self.root
-      Pathname.new(File.expand_path(''))
-    end
-
-    # Copied from https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails.rb#L59-L61
-    def self.env
-      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
-    end
-  end
-end
-
-# Settings is used in config/initializers/2_app.rb
-class Settings < Settingslogic
-  source Rails.root.join('config/gitlab.yml')
-  namespace Rails.env
-end
-
-# Defines Gitlab and Gitlab.config
+# Defines Gitlab and Gitlab.config which are at the center of the app
 unless defined?(Gitlab) && Gitlab.respond_to?(:config)
+  require_relative '../lib/settings'
   require_relative '../config/initializers/2_app'
 end
 
diff --git a/spec/lib/gitlab_spec.rb b/spec/lib/gitlab_spec.rb
index e734c12f6dd..da146e24893 100644
--- a/spec/lib/gitlab_spec.rb
+++ b/spec/lib/gitlab_spec.rb
@@ -3,6 +3,12 @@ require 'fast_spec_helper'
 require_dependency 'gitlab'
 
 describe Gitlab do
+  describe '.root' do
+    it 'returns the root path of the app' do
+      expect(described_class.root).to eq(Pathname.new(File.expand_path('../..', __dir__)))
+    end
+  end
+
   describe '.com?' do
     it 'is true when on GitLab.com' do
       stub_config_setting(url: 'https://gitlab.com')
-- 
cgit v1.2.3


From a527c9b915ac7c690c03f8b2cd16edf1777f1f32 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 20 Apr 2018 15:43:58 +0100
Subject: Fix disabled state while making a request

Provide props down instead of an event
---
 .../components/graph/action_component.vue          |  25 +++-
 .../components/graph/dropdown_job_component.vue    | 135 +++++++++++----------
 .../pipelines/components/graph/graph_component.vue |   7 +-
 .../pipelines/components/graph/job_component.vue   |  10 +-
 .../components/graph/stage_column_component.vue    |   7 +-
 .../pipelines/pipeline_details_bundle.js           |  17 +--
 .../33697-remove-ujs-action-big-graph.yml          |   5 +
 .../pipelines/graph/action_component_spec.js       |  47 ++++++-
 8 files changed, 159 insertions(+), 94 deletions(-)
 create mode 100644 changelogs/unreleased/33697-remove-ujs-action-big-graph.yml

diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue
index 558bf812fef..29ee73a2a6f 100644
--- a/app/assets/javascripts/pipelines/components/graph/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue
@@ -32,26 +32,38 @@ export default {
       required: true,
     },
 
-    buttonDisabled: {
+    requestFinishedFor: {
       type: String,
       required: false,
-      default: null,
+      default: '',
     },
   },
+  data() {
+    return {
+      isDisabled: false,
+      linkRequested: '',
+    };
+  },
+
   computed: {
     cssClass() {
       const actionIconDash = dasherize(this.actionIcon);
       return `${actionIconDash} js-icon-${actionIconDash}`;
     },
-    isDisabled() {
-      return this.buttonDisabled === this.link;
+  },
+  watch: {
+    requestFinishedFor() {
+      if (this.requestFinishedFor === this.linkRequested) {
+        this.isDisabled = false;
+      }
     },
   },
-
   methods: {
     onClickAction() {
       $(this.$el).tooltip('hide');
       eventHub.$emit('graphAction', this.link);
+      this.linkRequested = this.link;
+      this.isDisabled = true;
     },
   },
 };
@@ -62,7 +74,8 @@ export default {
     @click="onClickAction"
     v-tooltip
     :title="tooltipText"
-    class="js-ci-action btn btn-blank btn-transparent ci-action-icon-container ci-action-icon-wrapper"
+    class="js-ci-action btn btn-blank
+btn-transparent ci-action-icon-container ci-action-icon-wrapper"
     :class="cssClass"
     data-container="body"
     :disabled="isDisabled"
diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
index 30e40259146..9adc8881831 100644
--- a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
@@ -1,77 +1,83 @@
 <script>
-  import $ from 'jquery';
-  import JobNameComponent from './job_name_component.vue';
-  import JobComponent from './job_component.vue';
-  import tooltip from '../../../vue_shared/directives/tooltip';
+import $ from 'jquery';
+import JobNameComponent from './job_name_component.vue';
+import JobComponent from './job_component.vue';
+import tooltip from '../../../vue_shared/directives/tooltip';
 
-  /**
-   * Renders the dropdown for the pipeline graph.
-   *
-   * The following object should be provided as `job`:
-   *
-   * {
-   *   "id": 4256,
-   *   "name": "test",
-   *   "status": {
-   *     "icon": "icon_status_success",
-   *     "text": "passed",
-   *     "label": "passed",
-   *     "group": "success",
-   *     "details_path": "/root/ci-mock/builds/4256",
-   *     "action": {
-   *       "icon": "retry",
-   *       "title": "Retry",
-   *       "path": "/root/ci-mock/builds/4256/retry",
-   *       "method": "post"
-   *     }
-   *   }
-   * }
-   */
-  export default {
-    directives: {
-      tooltip,
-    },
+/**
+ * Renders the dropdown for the pipeline graph.
+ *
+ * The following object should be provided as `job`:
+ *
+ * {
+ *   "id": 4256,
+ *   "name": "test",
+ *   "status": {
+ *     "icon": "icon_status_success",
+ *     "text": "passed",
+ *     "label": "passed",
+ *     "group": "success",
+ *     "details_path": "/root/ci-mock/builds/4256",
+ *     "action": {
+ *       "icon": "retry",
+ *       "title": "Retry",
+ *       "path": "/root/ci-mock/builds/4256/retry",
+ *       "method": "post"
+ *     }
+ *   }
+ * }
+ */
+export default {
+  directives: {
+    tooltip,
+  },
 
-    components: {
-      JobComponent,
-      JobNameComponent,
-    },
+  components: {
+    JobComponent,
+    JobNameComponent,
+  },
 
-    props: {
-      job: {
-        type: Object,
-        required: true,
-      },
+  props: {
+    job: {
+      type: Object,
+      required: true,
     },
-
-    computed: {
-      tooltipText() {
-        return `${this.job.name} - ${this.job.status.label}`;
-      },
+    requestFinishedFor: {
+      type: String,
+      required: false,
+      default: '',
     },
+  },
 
-    mounted() {
-      this.stopDropdownClickPropagation();
+  computed: {
+    tooltipText() {
+      return `${this.job.name} - ${this.job.status.label}`;
     },
+  },
+
+  mounted() {
+    this.stopDropdownClickPropagation();
+  },
 
-    methods: {
-      /**
-       * When the user right clicks or cmd/ctrl + click in the job name or the action icon
-       * the dropdown should not be closed so we stop propagation of the click event inside the dropdown.
-       *
-       * Since this component is rendered multiple times per page we need to guarantee we only
-       * target the click event of this component.
-       */
-      stopDropdownClickPropagation() {
-        $(
-          '.js-grouped-pipeline-dropdown button, .js-grouped-pipeline-dropdown a.mini-pipeline-graph-dropdown-item',
-          this.$el,
-        ).on('click', (e) => {
-            e.stopPropagation();
-          });
-      },
+  methods: {
+    /**
+     * When the user right clicks or cmd/ctrl + click in the job name or the action icon
+     * the dropdown should not be closed so we stop propagation
+     * of the click event inside the dropdown.
+     *
+     * Since this component is rendered multiple times per page we need to guarantee we only
+     * target the click event of this component.
+     */
+    stopDropdownClickPropagation() {
+      $(
+        '.js-grouped-pipeline-dropdown button, .js-grouped-pipeline-dropdown a.mini-pipeline-graph-dropdown-item',
+        this.$el
+      ).on('click', e => {
+        e.stopPropagation();
+      });
     },
-  };
+  },
+};
 </script>
 <template>
   <div class="ci-job-dropdown-container">
@@ -102,6 +108,7 @@
             <job-component
               :job="item"
               css-class-job-name="mini-pipeline-graph-dropdown-item"
+              :request-finished-for="requestFinishedFor"
             />
           </li>
         </ul>
diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
index ac9ce7e47d6..7b8a5edcbff 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@@ -7,7 +7,6 @@ export default {
     StageColumnComponent,
     LoadingIcon,
   },
-
   props: {
     isLoading: {
       type: Boolean,
@@ -17,10 +16,10 @@ export default {
       type: Object,
       required: true,
     },
-    actionDisabled: {
+    requestFinishedFor: {
       type: String,
       required: false,
-      default: null,
+      default: '',
     },
   },
 
@@ -75,7 +74,7 @@ export default {
           :key="stage.name"
           :stage-connector-class="stageConnectorClass(index, stage)"
           :is-first-column="isFirstColumn(index)"
-          :action-disabled="actionDisabled"
+          :request-finished-for="requestFinishedFor"
         />
       </ul>
     </div>
diff --git a/app/assets/javascripts/pipelines/components/graph/job_component.vue b/app/assets/javascripts/pipelines/components/graph/job_component.vue
index 29680235a9e..4fcd4b79f4a 100644
--- a/app/assets/javascripts/pipelines/components/graph/job_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/job_component.vue
@@ -33,7 +33,6 @@ export default {
     ActionComponent,
     JobNameComponent,
   },
-
   directives: {
     tooltip,
   },
@@ -42,20 +41,17 @@ export default {
       type: Object,
       required: true,
     },
-
     cssClassJobName: {
       type: String,
       required: false,
       default: '',
     },
-
-    actionDisabled: {
+    requestFinishedFor: {
       type: String,
       required: false,
-      default: null,
+      default: '',
     },
   },
-
   computed: {
     status() {
       return this.job && this.job.status ? this.job.status : {};
@@ -130,7 +126,7 @@ export default {
       :tooltip-text="status.action.title"
       :link="status.action.path"
       :action-icon="status.action.icon"
-      :button-disabled="actionDisabled"
+      :request-finished-for="requestFinishedFor"
     />
   </div>
 </template>
diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
index f6e6569e15b..5461fdbbadd 100644
--- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
@@ -29,10 +29,11 @@ export default {
       required: false,
       default: '',
     },
-    actionDisabled: {
+
+    requestFinishedFor: {
       type: String,
       required: false,
-      default: null,
+      default: '',
     },
   },
 
@@ -74,12 +75,12 @@ export default {
             v-if="job.size === 1"
             :job="job"
             css-class-job-name="build-content"
-            :action-disabled="actionDisabled"
           />
 
           <dropdown-job-component
             v-if="job.size > 1"
             :job="job"
+            :request-finished-for="requestFinishedFor"
           />
 
         </li>
diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
index 900eb7855f4..6584f96130b 100644
--- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js
+++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
@@ -25,7 +25,7 @@ export default () => {
     data() {
       return {
         mediator,
-        actionDisabled: null,
+        requestFinishedFor: null,
       };
     },
     created() {
@@ -36,15 +36,17 @@ export default () => {
     },
     methods: {
       postAction(action) {
-        this.actionDisabled = action;
+        // Click was made, reset this variable
+        this.requestFinishedFor = null;
 
-        this.mediator.service.postAction(action)
+        this.mediator.service
+          .postAction(action)
           .then(() => {
             this.mediator.refreshPipeline();
-            this.actionDisabled = null;
+            this.requestFinishedFor = action;
           })
           .catch(() => {
-            this.actionDisabled = null;
+            this.requestFinishedFor = action;
             Flash(__('An error occurred while making the request.'));
           });
       },
@@ -54,7 +56,7 @@ export default () => {
         props: {
           isLoading: this.mediator.state.isLoading,
           pipeline: this.mediator.store.state.pipeline,
-          actionDisabled: this.actionDisabled,
+          requestFinishedFor: this.requestFinishedFor,
         },
       });
     },
@@ -79,7 +81,8 @@ export default () => {
     },
     methods: {
       postAction(action) {
-        this.mediator.service.postAction(action.path)
+        this.mediator.service
+          .postAction(action.path)
           .then(() => this.mediator.refreshPipeline())
           .catch(() => Flash(__('An error occurred while making the request.')));
       },
diff --git a/changelogs/unreleased/33697-remove-ujs-action-big-graph.yml b/changelogs/unreleased/33697-remove-ujs-action-big-graph.yml
new file mode 100644
index 00000000000..43ce52c1209
--- /dev/null
+++ b/changelogs/unreleased/33697-remove-ujs-action-big-graph.yml
@@ -0,0 +1,5 @@
+---
+title: Prevent pipeline actions in dropdown to redirct to a new page
+merge_request:
+author:
+type: fixed
diff --git a/spec/javascripts/pipelines/graph/action_component_spec.js b/spec/javascripts/pipelines/graph/action_component_spec.js
index 581209f215d..3de10392472 100644
--- a/spec/javascripts/pipelines/graph/action_component_spec.js
+++ b/spec/javascripts/pipelines/graph/action_component_spec.js
@@ -6,7 +6,7 @@ import mountComponent from '../../helpers/vue_mount_component_helper';
 describe('pipeline graph action component', () => {
   let component;
 
-  beforeEach((done) => {
+  beforeEach(done => {
     const ActionComponent = Vue.extend(actionComponent);
     component = mountComponent(ActionComponent, {
       tooltipText: 'bar',
@@ -22,7 +22,7 @@ describe('pipeline graph action component', () => {
   });
 
   it('should emit an event with the provided link', () => {
-    eventHub.$on('graphAction', (link) => {
+    eventHub.$on('graphAction', link => {
       expect(link).toEqual('foo');
     });
   });
@@ -31,7 +31,7 @@ describe('pipeline graph action component', () => {
     expect(component.$el.getAttribute('data-original-title')).toEqual('bar');
   });
 
-  it('should update bootstrap tooltip when title changes', (done) => {
+  it('should update bootstrap tooltip when title changes', done => {
     component.tooltipText = 'changed';
 
     setTimeout(() => {
@@ -44,4 +44,45 @@ describe('pipeline graph action component', () => {
     expect(component.$el.querySelector('.ci-action-icon-wrapper')).toBeDefined();
     expect(component.$el.querySelector('svg')).toBeDefined();
   });
+
+  it('disables the button when clicked', done => {
+    component.$el.click();
+
+    component.$nextTick(() => {
+      expect(component.$el.getAttribute('disabled')).toEqual('disabled');
+      done();
+    });
+  });
+
+  it('re-enabled the button when `requestFinishedFor` matches `linkRequested`', done => {
+    component.$el.click();
+
+    component
+      .$nextTick()
+      .then(() => {
+        expect(component.$el.getAttribute('disabled')).toEqual('disabled');
+        component.requestFinishedFor = 'foo';
+      })
+      .then(() => {
+        expect(component.$el.getAttribute('disabled')).toBeNull();
+      })
+      .then(done)
+      .catch(done.fail);
+  });
+
+  it('does not re-enable the button when `requestFinishedFor` does not matches `linkRequested`', done => {
+    component.$el.click();
+
+    component
+      .$nextTick()
+      .then(() => {
+        expect(component.$el.getAttribute('disabled')).toEqual('disabled');
+        component.requestFinishedFor = 'bar';
+      })
+      .then(() => {
+        expect(component.$el.getAttribute('disabled')).toEqual('disabled');
+      })
+      .then(done)
+      .catch(done.fail);
+  });
 });
-- 
cgit v1.2.3


From 8a1af9f058f63be023fc79d002e193247820e23e Mon Sep 17 00:00:00 2001
From: James Ramsay <james@jramsay.com.au>
Date: Mon, 23 Apr 2018 12:29:53 +0200
Subject: Fix minor typos

---
 doc/api/project_import_export.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md
index d8f61852b11..085437c801a 100644
--- a/doc/api/project_import_export.md
+++ b/doc/api/project_import_export.md
@@ -112,13 +112,13 @@ POST /projects/import
 | `file` | string | yes | The file to be uploaded |
 | `path` | string | yes | Name and path for new project |
 | `overwrite` | boolean | no | If there is a project with the same path the import will overwrite it. Default to false |
-| `override_params` | Hash | no | Supports all fields defined in the [Project API](projects.md)] |
+| `override_params` | Hash | no | Supports all fields defined in the [Project API](projects.md) |
 
-The override params passed will take precendence over all values defined inside the export file.
+The override params passed will take precedence over all values defined inside the export file.
 
-To upload a file from your filesystem, use the `--form` argument. This causes
+To upload a file from your file system, use the `--form` argument. This causes
 cURL to post data using the header `Content-Type: multipart/form-data`.
-The `file=` parameter must point to a file on your filesystem and be preceded
+The `file=` parameter must point to a file on your file system and be preceded
 by `@`. For example:
 
 ```console
-- 
cgit v1.2.3


From c921e686b84f966a30e5db877b01a1ab97de61a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Javier=20L=C3=B3pez?= <fjlopez@gitlab.com>
Date: Mon, 23 Apr 2018 10:56:46 +0000
Subject: Moved committer and spec. Added some extra code to run hooks or not
 depending on the options

---
 lib/gitlab/git/committer_with_hooks.rb            |  47 +++++++
 lib/gitlab/git/wiki.rb                            |   2 +-
 lib/gitlab/wiki/committer_with_hooks.rb           |  39 ------
 spec/lib/gitlab/git/committer_with_hooks_spec.rb  | 154 ++++++++++++++++++++++
 spec/lib/gitlab/wiki/committer_with_hooks_spec.rb | 154 ----------------------
 5 files changed, 202 insertions(+), 194 deletions(-)
 create mode 100644 lib/gitlab/git/committer_with_hooks.rb
 delete mode 100644 lib/gitlab/wiki/committer_with_hooks.rb
 create mode 100644 spec/lib/gitlab/git/committer_with_hooks_spec.rb
 delete mode 100644 spec/lib/gitlab/wiki/committer_with_hooks_spec.rb

diff --git a/lib/gitlab/git/committer_with_hooks.rb b/lib/gitlab/git/committer_with_hooks.rb
new file mode 100644
index 00000000000..a8a59f998cd
--- /dev/null
+++ b/lib/gitlab/git/committer_with_hooks.rb
@@ -0,0 +1,47 @@
+module Gitlab
+  module Git
+    class CommitterWithHooks < Gollum::Committer
+      attr_reader :gl_wiki
+
+      def initialize(gl_wiki, options = {})
+        @gl_wiki = gl_wiki
+        super(gl_wiki.gollum_wiki, options)
+      end
+
+      def commit
+        # TODO: Remove after 10.8
+        return super unless allowed_to_run_hooks?
+
+        result = Gitlab::Git::OperationService.new(git_user, gl_wiki.repository).with_branch(
+          @wiki.ref,
+          start_branch_name: @wiki.ref
+        ) do |start_commit|
+          super(false)
+        end
+
+        result[:newrev]
+      rescue Gitlab::Git::HooksService::PreReceiveError => e
+        message = "Custom Hook failed: #{e.message}"
+        raise Gitlab::Git::Wiki::OperationError, message
+      end
+
+      private
+
+      # TODO: Remove after 10.8
+      def allowed_to_run_hooks?
+        @options[:user_id] != 0 && @options[:username].present?
+      end
+
+      def git_user
+        @git_user ||= Gitlab::Git::User.new(@options[:username],
+                                            @options[:name],
+                                            @options[:email],
+                                            gitlab_id)
+      end
+
+      def gitlab_id
+        Gitlab::GlId.gl_id_from_id_value(@options[:user_id])
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/git/wiki.rb b/lib/gitlab/git/wiki.rb
index 821436911ab..84a26fe4a6f 100644
--- a/lib/gitlab/git/wiki.rb
+++ b/lib/gitlab/git/wiki.rb
@@ -290,7 +290,7 @@ module Gitlab
       end
 
       def committer_with_hooks(commit_details)
-        Gitlab::Wiki::CommitterWithHooks.new(self, commit_details.to_h)
+        Gitlab::Git::CommitterWithHooks.new(self, commit_details.to_h)
       end
 
       def with_committer_with_hooks(commit_details, &block)
diff --git a/lib/gitlab/wiki/committer_with_hooks.rb b/lib/gitlab/wiki/committer_with_hooks.rb
deleted file mode 100644
index 19f0b3814fd..00000000000
--- a/lib/gitlab/wiki/committer_with_hooks.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module Gitlab
-  module Wiki
-    class CommitterWithHooks < Gollum::Committer
-      attr_reader :gl_wiki
-
-      def initialize(gl_wiki, options = {})
-        @gl_wiki = gl_wiki
-        super(gl_wiki.gollum_wiki, options)
-      end
-
-      def commit
-        result = Gitlab::Git::OperationService.new(git_user, gl_wiki.repository).with_branch(
-          @wiki.ref,
-          start_branch_name: @wiki.ref
-        ) do |start_commit|
-          super(false)
-        end
-
-        result[:newrev]
-      rescue Gitlab::Git::HooksService::PreReceiveError => e
-        message = "Custom Hook failed: #{e.message}"
-        raise Gitlab::Git::Wiki::OperationError, message
-      end
-
-      private
-
-      def git_user
-        @git_user ||= Gitlab::Git::User.new(@options[:username],
-                                            @options[:name],
-                                            @options[:email],
-                                            gitlab_id)
-      end
-
-      def gitlab_id
-        Gitlab::GlId.gl_id_from_id_value(@options[:user_id])
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/git/committer_with_hooks_spec.rb b/spec/lib/gitlab/git/committer_with_hooks_spec.rb
new file mode 100644
index 00000000000..267056b96e6
--- /dev/null
+++ b/spec/lib/gitlab/git/committer_with_hooks_spec.rb
@@ -0,0 +1,154 @@
+require 'spec_helper'
+
+describe Gitlab::Git::CommitterWithHooks, seed_helper: true do
+  shared_examples 'calling wiki hooks' do
+    let(:project) { create(:project) }
+    let(:user) { project.owner }
+    let(:project_wiki) { ProjectWiki.new(project, user) }
+    let(:wiki) { project_wiki.wiki }
+    let(:options) do
+      {
+        id: user.id,
+        username: user.username,
+        name: user.name,
+        email: user.email,
+        message: 'commit message'
+      }
+    end
+
+    subject { described_class.new(wiki, options) }
+
+    before do
+      project_wiki.create_page('home', 'test content')
+    end
+
+    shared_examples 'failing pre-receive hook' do
+      before do
+        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([false, ''])
+        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('update')
+        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('post-receive')
+      end
+
+      it 'raises exception' do
+        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
+      end
+
+      it 'does not create a new commit inside the repository' do
+        current_rev = find_current_rev
+
+        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
+
+        expect(current_rev).to eq find_current_rev
+      end
+    end
+
+    shared_examples 'failing update hook' do
+      before do
+        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([true, ''])
+        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('update').and_return([false, ''])
+        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('post-receive')
+      end
+
+      it 'raises exception' do
+        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
+      end
+
+      it 'does not create a new commit inside the repository' do
+        current_rev = find_current_rev
+
+        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
+
+        expect(current_rev).to eq find_current_rev
+      end
+    end
+
+    shared_examples 'failing post-receive hook' do
+      before do
+        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([true, ''])
+        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('update').and_return([true, ''])
+        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('post-receive').and_return([false, ''])
+      end
+
+      it 'does not raise exception' do
+        expect { subject.commit }.not_to raise_error
+      end
+
+      it 'creates the commit' do
+        current_rev = find_current_rev
+
+        subject.commit
+
+        expect(current_rev).not_to eq find_current_rev
+      end
+    end
+
+    shared_examples 'when hooks call succceeds' do
+      let(:hook) { double(:hook) }
+
+      it 'calls the three hooks' do
+        expect(Gitlab::Git::Hook).to receive(:new).exactly(3).times.and_return(hook)
+        expect(hook).to receive(:trigger).exactly(3).times.and_return([true, nil])
+
+        subject.commit
+      end
+
+      it 'creates the commit' do
+        current_rev = find_current_rev
+
+        subject.commit
+
+        expect(current_rev).not_to eq find_current_rev
+      end
+    end
+
+    context 'when creating a page' do
+      before do
+        project_wiki.create_page('index', 'test content')
+      end
+
+      it_behaves_like 'failing pre-receive hook'
+      it_behaves_like 'failing update hook'
+      it_behaves_like 'failing post-receive hook'
+      it_behaves_like 'when hooks call succceeds'
+    end
+
+    context 'when updating a page' do
+      before do
+        project_wiki.update_page(find_page('home'), content: 'some other content', format: :markdown)
+      end
+
+      it_behaves_like 'failing pre-receive hook'
+      it_behaves_like 'failing update hook'
+      it_behaves_like 'failing post-receive hook'
+      it_behaves_like 'when hooks call succceeds'
+    end
+
+    context 'when deleting a page' do
+      before do
+        project_wiki.delete_page(find_page('home'))
+      end
+
+      it_behaves_like 'failing pre-receive hook'
+      it_behaves_like 'failing update hook'
+      it_behaves_like 'failing post-receive hook'
+      it_behaves_like 'when hooks call succceeds'
+    end
+
+    def find_current_rev
+      wiki.gollum_wiki.repo.commits.first&.sha
+    end
+
+    def find_page(name)
+      wiki.page(title: name)
+    end
+  end
+
+  # TODO: Uncomment once Gitaly updates the ruby vendor code
+  # context 'when Gitaly is enabled' do
+  #   it_behaves_like 'calling wiki hooks'
+  # end
+
+  context 'when Gitaly is disabled', :skip_gitaly_mock do
+    it_behaves_like 'calling wiki hooks'
+  end
+end
diff --git a/spec/lib/gitlab/wiki/committer_with_hooks_spec.rb b/spec/lib/gitlab/wiki/committer_with_hooks_spec.rb
deleted file mode 100644
index 830fb8a8598..00000000000
--- a/spec/lib/gitlab/wiki/committer_with_hooks_spec.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Wiki::CommitterWithHooks, seed_helper: true do
-  shared_examples 'calling wiki hooks' do
-    let(:project) { create(:project) }
-    let(:user) { project.owner }
-    let(:project_wiki) { ProjectWiki.new(project, user) }
-    let(:wiki) { project_wiki.wiki }
-    let(:options) do
-      {
-        id: user.id,
-        username: user.username,
-        name: user.name,
-        email: user.email,
-        message: 'commit message'
-      }
-    end
-
-    subject { described_class.new(wiki, options) }
-
-    before do
-      project_wiki.create_page('home', 'test content')
-    end
-
-    shared_examples 'failing pre-receive hook' do
-      before do
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([false, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('update')
-        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('post-receive')
-      end
-
-      it 'raises exception' do
-        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
-      end
-
-      it 'does not create a new commit inside the repository' do
-        current_rev = find_current_rev
-
-        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
-
-        expect(current_rev).to eq find_current_rev
-      end
-    end
-
-    shared_examples 'failing update hook' do
-      before do
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([true, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('update').and_return([false, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).not_to receive(:run_hook).with('post-receive')
-      end
-
-      it 'raises exception' do
-        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
-      end
-
-      it 'does not create a new commit inside the repository' do
-        current_rev = find_current_rev
-
-        expect { subject.commit }.to raise_error(Gitlab::Git::Wiki::OperationError)
-
-        expect(current_rev).to eq find_current_rev
-      end
-    end
-
-    shared_examples 'failing post-receive hook' do
-      before do
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('pre-receive').and_return([true, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('update').and_return([true, ''])
-        expect_any_instance_of(Gitlab::Git::HooksService).to receive(:run_hook).with('post-receive').and_return([false, ''])
-      end
-
-      it 'does not raise exception' do
-        expect { subject.commit }.not_to raise_error
-      end
-
-      it 'creates the commit' do
-        current_rev = find_current_rev
-
-        subject.commit
-
-        expect(current_rev).not_to eq find_current_rev
-      end
-    end
-
-    shared_examples 'when hooks call succceeds' do
-      let(:hook) { double(:hook) }
-
-      it 'calls the three hooks' do
-        expect(Gitlab::Git::Hook).to receive(:new).exactly(3).times.and_return(hook)
-        expect(hook).to receive(:trigger).exactly(3).times.and_return([true, nil])
-
-        subject.commit
-      end
-
-      it 'creates the commit' do
-        current_rev = find_current_rev
-
-        subject.commit
-
-        expect(current_rev).not_to eq find_current_rev
-      end
-    end
-
-    context 'when creating a page' do
-      before do
-        project_wiki.create_page('index', 'test content')
-      end
-
-      it_behaves_like 'failing pre-receive hook'
-      it_behaves_like 'failing update hook'
-      it_behaves_like 'failing post-receive hook'
-      it_behaves_like 'when hooks call succceeds'
-    end
-
-    context 'when updating a page' do
-      before do
-        project_wiki.update_page(find_page('home'), content: 'some other content', format: :markdown)
-      end
-
-      it_behaves_like 'failing pre-receive hook'
-      it_behaves_like 'failing update hook'
-      it_behaves_like 'failing post-receive hook'
-      it_behaves_like 'when hooks call succceeds'
-    end
-
-    context 'when deleting a page' do
-      before do
-        project_wiki.delete_page(find_page('home'))
-      end
-
-      it_behaves_like 'failing pre-receive hook'
-      it_behaves_like 'failing update hook'
-      it_behaves_like 'failing post-receive hook'
-      it_behaves_like 'when hooks call succceeds'
-    end
-
-    def find_current_rev
-      wiki.gollum_wiki.repo.commits.first&.sha
-    end
-
-    def find_page(name)
-      wiki.page(title: name)
-    end
-  end
-
-  # TODO: Uncomment once Gitaly updates the ruby vendor code
-  # context 'when Gitaly is enabled' do
-  #   it_behaves_like 'calling wiki hooks'
-  # end
-
-  context 'when Gitaly is disabled', :skip_gitaly_mock do
-    it_behaves_like 'calling wiki hooks'
-  end
-end
-- 
cgit v1.2.3


From 5b44097cf7a20a6bcdc38ac9ed43aac0ec33415e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 23 Apr 2018 13:02:07 +0200
Subject: Address latest feedback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/initializers/2_app.rb                    | 1 -
 doc/development/testing_guide/best_practices.md | 2 +-
 lib/gitlab.rb                                   | 9 +++++----
 lib/settings.rb                                 | 2 ++
 spec/fast_spec_helper.rb                        | 8 +++-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb
index 9d43239f7d3..a560e9d0471 100644
--- a/config/initializers/2_app.rb
+++ b/config/initializers/2_app.rb
@@ -5,6 +5,5 @@ module Gitlab
     Settings
   end
 
-  VERSION  = File.read(Gitlab.root.join("VERSION")).strip.freeze
   REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
 end
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index bf5144d6d1a..b77e9b7ff63 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -100,7 +100,7 @@ really fast since:
 
 - Gems loading is skipped
 - Rails app boot is skipped
-- Gitlab::Shell and Gitaly setup are skipped
+- gitlab-shell and Gitaly setup are skipped
 - Test repositories setup are skipped
 
 Note that in some cases, you might have to add some `require_dependency 'foo'`
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index a51ea0afbd9..7aff4e590bf 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -1,14 +1,15 @@
 require_dependency 'gitlab/git'
 
 module Gitlab
-  COM_URL = 'https://gitlab.com'.freeze
-  APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
-  SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
-
   def self.root
     Pathname.new(File.expand_path('..', __dir__))
   end
 
+  COM_URL = 'https://gitlab.com'.freeze
+  APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
+  SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
+  VERSION = File.read(root.join("VERSION")).strip.freeze
+
   def self.com?
     # Check `gl_subdomain?` as well to keep parity with gitlab.com
     Gitlab.config.gitlab.url == COM_URL || gl_subdomain?
diff --git a/lib/settings.rb b/lib/settings.rb
index bc688eaf121..8bf087c76c3 100644
--- a/lib/settings.rb
+++ b/lib/settings.rb
@@ -1,3 +1,5 @@
+require 'settingslogic'
+
 require_dependency 'gitlab'
 
 class Settings < Settingslogic
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index b3fe76fb150..105f70246c9 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -1,19 +1,17 @@
 require 'bundler/setup'
 
-require 'settingslogic'
-
 ENV['GITLAB_ENV'] = 'test'
 ENV['RAILS_ENV'] = 'test'
 ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
 
-unless Kernel.respond_to?(:require_dependency)
-  module Kernel
+unless Object.respond_to?(:require_dependency)
+  class Object
     alias_method :require_dependency, :require
   end
 end
 
 # Defines Gitlab and Gitlab.config which are at the center of the app
-unless defined?(Gitlab) && Gitlab.respond_to?(:config)
+unless defined?(Gitlab.config)
   require_relative '../lib/settings'
   require_relative '../config/initializers/2_app'
 end
-- 
cgit v1.2.3


From 6673934d0e487baf447f2a99b50dd721e0c635ac Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 23 Apr 2018 12:08:11 +0100
Subject: Fix eslint

---
 .../javascripts/pipelines/components/graph/dropdown_job_component.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
index 9adc8881831..43121dd38f3 100644
--- a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
@@ -71,7 +71,7 @@ export default {
     stopDropdownClickPropagation() {
       $(
         '.js-grouped-pipeline-dropdown button, .js-grouped-pipeline-dropdown a.mini-pipeline-graph-dropdown-item',
-        this.$el
+        this.$el,
       ).on('click', e => {
         e.stopPropagation();
       });
-- 
cgit v1.2.3


From d7642137fb4268e38b2b5c68cefd5c7cd4654144 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 23 Apr 2018 12:34:05 +0100
Subject: Fix eslint

---
 spec/javascripts/vue_shared/components/commit_spec.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/javascripts/vue_shared/components/commit_spec.js b/spec/javascripts/vue_shared/components/commit_spec.js
index 74c6fbba7ee..7189e8cfcfa 100644
--- a/spec/javascripts/vue_shared/components/commit_spec.js
+++ b/spec/javascripts/vue_shared/components/commit_spec.js
@@ -66,7 +66,7 @@ describe('Commit component', () => {
 
     it('should render a link to the ref url', () => {
       expect(component.$el.querySelector('.ref-name').getAttribute('href')).toEqual(
-        props.commitRef.ref_url
+        props.commitRef.ref_url,
       );
     });
 
@@ -76,21 +76,21 @@ describe('Commit component', () => {
 
     it('should render the commit short sha with a link to the commit url', () => {
       expect(component.$el.querySelector('.commit-sha').getAttribute('href')).toEqual(
-        props.commitUrl
+        props.commitUrl,
       );
       expect(component.$el.querySelector('.commit-sha').textContent).toContain(props.shortSha);
     });
 
     it('should render icon for commit', () => {
       expect(
-        component.$el.querySelector('.js-commit-icon use').getAttribute('xlink:href')
+        component.$el.querySelector('.js-commit-icon use').getAttribute('xlink:href'),
       ).toContain('commit');
     });
 
     describe('Given commit title and author props', () => {
       it('should render a link to the author profile', () => {
         expect(
-          component.$el.querySelector('.commit-title .avatar-image-container').getAttribute('href')
+          component.$el.querySelector('.commit-title .avatar-image-container').getAttribute('href'),
         ).toEqual(props.author.path);
       });
 
@@ -98,22 +98,22 @@ describe('Commit component', () => {
         expect(
           component.$el
             .querySelector('.commit-title .avatar-image-container img')
-            .getAttribute('data-original-title')
+            .getAttribute('data-original-title'),
         ).toContain(props.author.username);
         expect(
           component.$el
             .querySelector('.commit-title .avatar-image-container img')
-            .getAttribute('alt')
+            .getAttribute('alt'),
         ).toContain(`${props.author.username}'s avatar`);
       });
     });
 
     it('should render the commit title', () => {
       expect(component.$el.querySelector('a.commit-row-message').getAttribute('href')).toEqual(
-        props.commitUrl
+        props.commitUrl,
       );
       expect(component.$el.querySelector('a.commit-row-message').textContent).toContain(
-        props.title
+        props.title,
       );
     });
   });
@@ -136,7 +136,7 @@ describe('Commit component', () => {
       component = mountComponent(CommitComponent, props);
 
       expect(component.$el.querySelector('.commit-title span').textContent).toContain(
-        "Can't find HEAD commit for this branch"
+        "Can't find HEAD commit for this branch",
       );
     });
   });
-- 
cgit v1.2.3


From 2afe3a1210e6c444f9b92d59a02fcb3f474ae614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 23 Apr 2018 16:12:19 +0200
Subject: Get rid of config/initializers/2_app.rb and define Gitlab in
 lib/gitlab.rb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/initializers/1_settings.rb | 1 -
 config/initializers/2_app.rb      | 9 ---------
 lib/gitlab.rb                     | 8 +++++++-
 lib/settings.rb                   | 4 +---
 spec/fast_spec_helper.rb          | 6 +-----
 5 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 config/initializers/2_app.rb

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 53e3c50df5f..9b00ae459a3 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -1,5 +1,4 @@
 require_dependency File.expand_path('../../lib/gitlab', __dir__) # Load Gitlab as soon as possible
-require_dependency File.expand_path('../../lib/settings', __dir__) # Load Settings as soon as possible
 
 # Default settings
 Settings['ldap'] ||= Settingslogic.new({})
diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb
deleted file mode 100644
index a560e9d0471..00000000000
--- a/config/initializers/2_app.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require_dependency 'gitlab/popen'
-
-module Gitlab
-  def self.config
-    Settings
-  end
-
-  REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
-end
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 7aff4e590bf..0a167104bf4 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -1,14 +1,20 @@
-require_dependency 'gitlab/git'
+require_dependency 'settings'
+require_dependency 'gitlab/popen'
 
 module Gitlab
   def self.root
     Pathname.new(File.expand_path('..', __dir__))
   end
 
+  def self.config
+    Settings
+  end
+
   COM_URL = 'https://gitlab.com'.freeze
   APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
   SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
   VERSION = File.read(root.join("VERSION")).strip.freeze
+  REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
 
   def self.com?
     # Check `gl_subdomain?` as well to keep parity with gitlab.com
diff --git a/lib/settings.rb b/lib/settings.rb
index 8bf087c76c3..69d637761ea 100644
--- a/lib/settings.rb
+++ b/lib/settings.rb
@@ -1,9 +1,7 @@
 require 'settingslogic'
 
-require_dependency 'gitlab'
-
 class Settings < Settingslogic
-  source ENV.fetch('GITLAB_CONFIG') { Gitlab.root.join('config/gitlab.yml') }
+  source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') }
   namespace ENV.fetch('GITLAB_ENV') { Rails.env }
 
   class << self
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index 105f70246c9..f28268b0754 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -1,7 +1,6 @@
 require 'bundler/setup'
 
 ENV['GITLAB_ENV'] = 'test'
-ENV['RAILS_ENV'] = 'test'
 ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
 
 unless Object.respond_to?(:require_dependency)
@@ -11,9 +10,6 @@ unless Object.respond_to?(:require_dependency)
 end
 
 # Defines Gitlab and Gitlab.config which are at the center of the app
-unless defined?(Gitlab.config)
-  require_relative '../lib/settings'
-  require_relative '../config/initializers/2_app'
-end
+require_relative '../lib/gitlab' unless defined?(Gitlab.config)
 
 require_relative 'support/rspec'
-- 
cgit v1.2.3