Merge remote-tracking branch 'upstream/master' into use-git-branch-mergeduse-git-branch-merged

* upstream/master: (56 commits)
  Resolve "Remove overzealous tooltips in projects page tabs"
  Remove filter icon from search bar
  Don't rename groups/projects that aren't reserved anymore
  Memoize GitLab logger to reduce open file descriptors
  Update groups API documentation
  Changing the smallest of typos
  Remove `<script>` and `<template>` from CHANGELOG.md
  Support `Gitaly::User`'s gl_username field
  Fix icon color and btn-group alignment of discussion buttons
  Simple docs fixes
  Fix button type
  Changes after review
  fixed karma tests
  Removes group_avatar & group_label_subscription from global namespace
  Fix CSS in load more participants
  Fix the description of the new branch created by an issue's new branch button
  Fix a small typo in the delete merged branches documentation
  spec fixes
  Remove Sherlock usage from the performance bar
  moved to eventHub to manage creating new files removed an ID from the CSS
  ...

304 files changed, 4910 insertions, 3195 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 578651639c5..6bca9944bb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,7 +100,7 @@ entry.
 - [CHANGED] Added defaults for protected branches dropdowns on the repository settings. !14278
 - [CHANGED] Show confirmation modal before deleting account. !14360
 - [CHANGED] Allow creating merge requests across a fork network. !14422
-- [CHANGED] Re-arrange <script> tags before <template> tags in .vue files. !14671
+- [CHANGED] Re-arrange script HTML tags before template HTML tags in .vue files. !14671
 - [CHANGED] Create idea of read-only database. !14688
 - [CHANGED] Add active states to nav bar counters.
 - [CHANGED] Add view replaced file link for image diffs.
diff --git a/Gemfile b/Gemfile
index f64cdca31c0..5adba4d58df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -398,7 +398,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.45.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.48.0', require: 'gitaly'
 
 gem 'toml-rb', '~> 0.3.15', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 601d5ca16e2..53efb1c76c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-    gitaly-proto (0.45.0)
+    gitaly-proto (0.48.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -1030,7 +1030,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.2.0)
-  gitaly-proto (~> 0.45.0)
+  gitaly-proto (~> 0.48.0)
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.6.2)
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.vue b/app/assets/javascripts/commit/pipelines/pipelines_table.vue
index 0661087a1ba..e9a0dbaa59d 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue
+++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue
@@ -25,6 +25,11 @@
         type: String,
         required: true,
       },
+      viewType: {
+        type: String,
+        required: false,
+        default: 'child',
+      },
     },
     mixins: [
       pipelinesMixin,
@@ -110,6 +115,7 @@
         :pipelines="state.pipelines"
         :update-graph-dropdown="updateGraphDropdown"
         :auto-devops-help-path="autoDevopsHelpPath"
+        :view-type="viewType"
         />
     </div>
   </div>
diff --git a/app/assets/javascripts/new_sidebar.js b/app/assets/javascripts/contextual_sidebar.js
index 997550b37fb..46b68ebe158 100644
--- a/app/assets/javascripts/new_sidebar.js
+++ b/app/assets/javascripts/contextual_sidebar.js
@@ -2,7 +2,7 @@ import Cookies from 'js-cookie';
 import _ from 'underscore';
 import bp from './breakpoints';
 
-export default class NewNavSidebar {
+export default class ContextualSidebar {
   constructor() {
     this.initDomElements();
     this.render();
@@ -55,7 +55,7 @@ export default class NewNavSidebar {
       this.$sidebar.toggleClass('sidebar-icons-only', collapsed);
       this.$page.toggleClass('page-with-icon-sidebar', breakpoint === 'sm' ? true : collapsed);
     }
-    NewNavSidebar.setCollapsedCookie(collapsed);
+    ContextualSidebar.setCollapsedCookie(collapsed);
 
     this.toggleSidebarOverflow();
   }
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 5ca1708f1b3..f20162c48e9 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -8,7 +8,8 @@
 /* global NewBranchForm */
 /* global NotificationsForm */
 /* global NotificationsDropdown */
-/* global GroupAvatar */
+import groupAvatar from './group_avatar';
+import GroupLabelSubscription from './group_label_subscription';
 /* global LineHighlighter */
 import BuildArtifacts from './build_artifacts';
 import CILintEditor from './ci_lint_editor';
@@ -239,7 +240,8 @@ import Diff from './diff';
           break;
         case 'projects:compare:show':
           new Diff();
-          initChangesDropdown();
+          const paddingTop = 16;
+          initChangesDropdown(document.querySelector('.navbar-gitlab').offsetHeight - paddingTop);
           break;
         case 'projects:branches:new':
         case 'projects:branches:create':
@@ -423,11 +425,11 @@ import Diff from './diff';
         case 'admin:groups:create':
           BindInOut.initAll();
           new Group();
-          new GroupAvatar();
+          groupAvatar();
           break;
         case 'groups:edit':
         case 'admin:groups:edit':
-          new GroupAvatar();
+          groupAvatar();
           break;
         case 'projects:tree:show':
           shortcut_handler = new ShortcutsNavigation();
@@ -474,7 +476,7 @@ import Diff from './diff';
             const $el = $(el);
 
             if ($el.find('.dropdown-group-label').length) {
-              new gl.GroupLabelSubscription($el);
+              new GroupLabelSubscription($el);
             } else {
               new gl.ProjectLabelSubscription($el);
             }
diff --git a/app/assets/javascripts/group_avatar.js b/app/assets/javascripts/group_avatar.js
index f03b47b1c1d..2168ff3a8ba 100644
--- a/app/assets/javascripts/group_avatar.js
+++ b/app/assets/javascripts/group_avatar.js
@@ -1,19 +1,12 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, quotes, no-var, one-var, one-var-declaration-per-line, no-useless-escape, max-len */
-
-window.GroupAvatar = (function() {
-  function GroupAvatar() {
-    $('.js-choose-group-avatar-button').on("click", function() {
-      var form;
-      form = $(this).closest("form");
-      return form.find(".js-group-avatar-input").click();
-    });
-    $('.js-group-avatar-input').on("change", function() {
-      var filename, form;
-      form = $(this).closest("form");
-      filename = $(this).val().replace(/^.*[\\\/]/, '');
-      return form.find(".js-avatar-filename").text(filename);
-    });
-  }
-
-  return GroupAvatar;
-})();
+export default function groupAvatar() {
+  $('.js-choose-group-avatar-button').on('click', function onClickGroupAvatar() {
+    const form = $(this).closest('form');
+    return form.find('.js-group-avatar-input').click();
+  });
+  $('.js-group-avatar-input').on('change', function onChangeAvatarInput() {
+    const form = $(this).closest('form');
+    // eslint-disable-next-line no-useless-escape
+    const filename = $(this).val().replace(/^.*[\\\/]/, '');
+    return form.find('.js-avatar-filename').text(filename);
+  });
+}
diff --git a/app/assets/javascripts/group_label_subscription.js b/app/assets/javascripts/group_label_subscription.js
index 7dc9ce898e8..befaebb635e 100644
--- a/app/assets/javascripts/group_label_subscription.js
+++ b/app/assets/javascripts/group_label_subscription.js
@@ -1,6 +1,4 @@
-/* eslint-disable func-names, object-shorthand, comma-dangle, wrap-iife, space-before-function-paren, no-param-reassign, max-len */
-
-class GroupLabelSubscription {
+export default class GroupLabelSubscription {
   constructor(container) {
     const $container = $(container);
     this.$dropdown = $container.find('.dropdown');
@@ -18,7 +16,7 @@ class GroupLabelSubscription {
 
     $.ajax({
       type: 'POST',
-      url: url
+      url,
     }).done(() => {
       this.toggleSubscriptionButtons();
       this.$unsubscribeButtons.removeAttr('data-url');
@@ -35,7 +33,7 @@ class GroupLabelSubscription {
 
     $.ajax({
       type: 'POST',
-      url: url
+      url,
     }).done(() => {
       this.toggleSubscriptionButtons();
     });
@@ -47,6 +45,3 @@ class GroupLabelSubscription {
     this.$unsubscribeButtons.toggleClass('hidden');
   }
 }
-
-window.gl = window.gl || {};
-window.gl.GroupLabelSubscription = GroupLabelSubscription;
diff --git a/app/assets/javascripts/init_changes_dropdown.js b/app/assets/javascripts/init_changes_dropdown.js
index f785ed29e6c..1bab7965c19 100644
--- a/app/assets/javascripts/init_changes_dropdown.js
+++ b/app/assets/javascripts/init_changes_dropdown.js
@@ -1,7 +1,7 @@
 import stickyMonitor from './lib/utils/sticky';
 
-export default () => {
-  stickyMonitor(document.querySelector('.js-diff-files-changed'));
+export default (stickyTop) => {
+  stickyMonitor(document.querySelector('.js-diff-files-changed'), stickyTop);
 
   $('.js-diff-stats-dropdown').glDropdown({
     filterable: true,
diff --git a/app/assets/javascripts/issuable_context.js b/app/assets/javascripts/issuable_context.js
index 1d305f1eb2f..73791edaebb 100644
--- a/app/assets/javascripts/issuable_context.js
+++ b/app/assets/javascripts/issuable_context.js
@@ -51,20 +51,19 @@ const PARTICIPANTS_ROW_COUNT = 7;
     }
 
     IssuableContext.prototype.initParticipants = function() {
-      $(document).on("click", ".js-participants-more", this.toggleHiddenParticipants);
-      return $(".js-participants-author").each(function(i) {
+      $(document).on('click', '.js-participants-more', this.toggleHiddenParticipants);
+      return $('.js-participants-author').each(function(i) {
         if (i >= PARTICIPANTS_ROW_COUNT) {
-          return $(this).addClass("js-participants-hidden").hide();
+          return $(this).addClass('js-participants-hidden').hide();
         }
       });
     };
 
-    IssuableContext.prototype.toggleHiddenParticipants = function(e) {
-      var currentText, lessText, originalText;
-      e.preventDefault();
-      currentText = $(this).text().trim();
-      lessText = $(this).data("less-text");
-      originalText = $(this).data("original-text");
+    IssuableContext.prototype.toggleHiddenParticipants = function() {
+      const currentText = $(this).text().trim();
+      const lessText = $(this).data('less-text');
+      const originalText = $(this).data('original-text');
+
       if (currentText === originalText) {
         $(this).text(lessText);
 
@@ -73,7 +72,7 @@ const PARTICIPANTS_ROW_COUNT = 7;
         $(this).text(originalText);
       }
 
-      $(".js-participants-hidden").toggle();
+      $('.js-participants-hidden').toggle();
     };
 
     return IssuableContext;
diff --git a/app/assets/javascripts/layout_nav.js b/app/assets/javascripts/layout_nav.js
index d064a2c0024..a6f82b247e2 100644
--- a/app/assets/javascripts/layout_nav.js
+++ b/app/assets/javascripts/layout_nav.js
@@ -1,7 +1,7 @@
 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, no-unused-vars, one-var, one-var-declaration-per-line, vars-on-top, max-len */
 import _ from 'underscore';
 import Cookies from 'js-cookie';
-import NewNavSidebar from './new_sidebar';
+import ContextualSidebar from './contextual_sidebar';
 import initFlyOutNav from './fly_out_nav';
 
 (function() {
@@ -51,8 +51,8 @@ import initFlyOutNav from './fly_out_nav';
   });
 
   $(() => {
-    const newNavSidebar = new NewNavSidebar();
-    newNavSidebar.bindEvents();
+    const contextualSidebar = new ContextualSidebar();
+    contextualSidebar.bindEvents();
 
     initFlyOutNav();
   });
diff --git a/app/assets/javascripts/lib/utils/sticky.js b/app/assets/javascripts/lib/utils/sticky.js
index 64db42701ce..098afcfa1b4 100644
--- a/app/assets/javascripts/lib/utils/sticky.js
+++ b/app/assets/javascripts/lib/utils/sticky.js
@@ -28,14 +28,10 @@ export const isSticky = (el, scrollY, stickyTop, insertPlaceholder) => {
   }
 };
 
-export default (el, insertPlaceholder = true) => {
+export default (el, stickyTop, insertPlaceholder = true) => {
   if (!el) return;
 
-  const computedStyle = window.getComputedStyle(el);
-
-  if (!/sticky/.test(computedStyle.position)) return;
-
-  const stickyTop = parseInt(computedStyle.top, 10);
+  if (typeof CSS === 'undefined' || !(CSS.supports('(position: -webkit-sticky) or (position: sticky)'))) return;
 
   document.addEventListener('scroll', () => isSticky(el, window.scrollY, stickyTop, insertPlaceholder), {
     passive: true,
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 6b13fda0d44..52715fba43f 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -55,8 +55,6 @@ import './gl_dropdown';
 import './gl_field_error';
 import './gl_field_errors';
 import './gl_form';
-import './group_avatar';
-import './group_label_subscription';
 import './groups_select';
 import './header';
 import './importer_status';
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 789ccf48190..54c1b7a268e 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -67,6 +67,10 @@ import Diff from './diff';
   class MergeRequestTabs {
 
     constructor({ action, setUrl, stubLocation } = {}) {
+      const mergeRequestTabs = document.querySelector('.js-tabs-affix');
+      const navbar = document.querySelector('.navbar-gitlab');
+      const paddingTop = 16;
+
       this.diffsLoaded = false;
       this.pipelinesLoaded = false;
       this.commitsLoaded = false;
@@ -76,6 +80,11 @@ import Diff from './diff';
       this.setCurrentAction = this.setCurrentAction.bind(this);
       this.tabShown = this.tabShown.bind(this);
       this.showTab = this.showTab.bind(this);
+      this.stickyTop = navbar ? navbar.offsetHeight - paddingTop : 0;
+
+      if (mergeRequestTabs) {
+        this.stickyTop += mergeRequestTabs.offsetHeight;
+      }
 
       if (stubLocation) {
         location = stubLocation;
@@ -278,7 +287,7 @@ import Diff from './diff';
           const $container = $('#diffs');
           $container.html(data.html);
 
-          initChangesDropdown();
+          initChangesDropdown(this.stickyTop);
 
           if (typeof gl.diffNotesCompileComponents !== 'undefined') {
             gl.diffNotesCompileComponents();
diff --git a/app/assets/javascripts/pipelines/components/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines.vue
index 085bd20cefe..3da60e88474 100644
--- a/app/assets/javascripts/pipelines/components/pipelines.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines.vue
@@ -12,6 +12,15 @@
         type: Object,
         required: true,
       },
+      // Can be rendered in 3 different places, with some visual differences
+      // Accepts root | child
+      // `root` -> main view
+      // `child` -> rendered inside MR or Commit View
+      viewType: {
+        type: String,
+        required: false,
+        default: 'root',
+      },
     },
     components: {
       tablePagination,
@@ -187,7 +196,7 @@
         :empty-state-svg-path="emptyStateSvgPath"
         />
 
-      <error-state 
+      <error-state
         v-if="shouldRenderErrorState"
         :error-state-svg-path="errorStateSvgPath"
         />
@@ -206,6 +215,7 @@
           :pipelines="state.pipelines"
           :update-graph-dropdown="updateGraphDropdown"
           :auto-devops-help-path="autoDevopsPath"
+          :view-type="viewType"
           />
       </div>
 
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_table.vue
index 7aa0c0e8a7f..16a705cbaff 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_table.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table.vue
@@ -21,6 +21,10 @@
         type: String,
         required: true,
       },
+      viewType: {
+        type: String,
+        required: true,
+      },
     },
     components: {
       pipelinesTableRowComponent,
@@ -59,6 +63,7 @@
       :pipeline="model"
       :update-graph-dropdown="updateGraphDropdown"
       :auto-devops-help-path="autoDevopsHelpPath"
+      :view-type="viewType"
     />
   </div>
 </template>
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
index 5b9bb6c3750..33fbce993b2 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
@@ -29,6 +29,10 @@ export default {
       type: String,
       required: true,
     },
+    viewType: {
+      type: String,
+      required: true,
+    },
   },
   components: {
     asyncButtonComponent,
@@ -203,9 +207,13 @@ export default {
 
     displayPipelineActions() {
       return this.pipeline.flags.retryable ||
-             this.pipeline.flags.cancelable ||
-             this.pipeline.details.manual_actions.length ||
-             this.pipeline.details.artifacts.length;
+        this.pipeline.flags.cancelable ||
+        this.pipeline.details.manual_actions.length ||
+        this.pipeline.details.artifacts.length;
+    },
+
+    isChildView() {
+      return this.viewType === 'child';
     },
   },
 };
@@ -218,7 +226,10 @@ export default {
         Status
       </div>
       <div class="table-mobile-content">
-        <ci-badge :status="pipelineStatus"/>
+        <ci-badge
+          :status="pipelineStatus"
+          :show-text="!isChildView"
+          />
       </div>
     </div>
 
@@ -240,7 +251,9 @@ export default {
           :commit-url="commitUrl"
           :short-sha="commitShortSha"
           :title="commitTitle"
-          :author="commitAuthor"/>
+          :author="commitAuthor"
+          :show-branch="!isChildView"
+          />
       </div>
     </div>
 
diff --git a/app/assets/javascripts/repo/components/new_dropdown/index.vue b/app/assets/javascripts/repo/components/new_dropdown/index.vue
new file mode 100644
index 00000000000..3ccb50213ab
--- /dev/null
+++ b/app/assets/javascripts/repo/components/new_dropdown/index.vue
@@ -0,0 +1,86 @@
+<script>
+  import RepoStore from '../../stores/repo_store';
+  import RepoHelper from '../../helpers/repo_helper';
+  import eventHub from '../../event_hub';
+  import newModal from './modal.vue';
+
+  export default {
+    components: {
+      newModal,
+    },
+    data() {
+      return {
+        openModal: false,
+        modalType: '',
+        currentPath: RepoStore.path,
+      };
+    },
+    methods: {
+      createNewItem(type) {
+        this.modalType = type;
+        this.toggleModalOpen();
+      },
+      toggleModalOpen() {
+        this.openModal = !this.openModal;
+      },
+      createNewEntryInStore(name, type) {
+        RepoHelper.createNewEntry(name, type);
+
+        this.toggleModalOpen();
+      },
+    },
+    created() {
+      eventHub.$on('createNewEntry', this.createNewEntryInStore);
+    },
+    beforeDestroy() {
+      eventHub.$off('createNewEntry', this.createNewEntryInStore);
+    },
+  };
+</script>
+
+<template>
+  <div>
+    <ul class="breadcrumb repo-breadcrumb">
+      <li class="dropdown">
+        <button
+          type="button"
+          class="btn btn-default dropdown-toggle add-to-tree"
+          data-toggle="dropdown"
+          aria-label="Create new file or directory"
+        >
+          <i
+            class="fa fa-plus"
+            aria-hidden="true"
+          >
+          </i>
+        </button>
+        <ul class="dropdown-menu">
+          <li>
+            <a
+              href="#"
+              role="button"
+              @click.prevent="createNewItem('blob')"
+            >
+              {{ __('New file') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="#"
+              role="button"
+              @click.prevent="createNewItem('tree')"
+            >
+              {{ __('New directory') }}
+            </a>
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <new-modal
+      v-if="openModal"
+      :type="modalType"
+      :current-path="currentPath"
+      @toggle="toggleModalOpen"
+    />
+  </div>
+</template>
diff --git a/app/assets/javascripts/repo/components/new_dropdown/modal.vue b/app/assets/javascripts/repo/components/new_dropdown/modal.vue
new file mode 100644
index 00000000000..5ef629e0dde
--- /dev/null
+++ b/app/assets/javascripts/repo/components/new_dropdown/modal.vue
@@ -0,0 +1,90 @@
+<script>
+  import { __ } from '../../../locale';
+  import popupDialog from '../../../vue_shared/components/popup_dialog.vue';
+  import eventHub from '../../event_hub';
+
+  export default {
+    props: {
+      currentPath: {
+        type: String,
+        required: true,
+      },
+      type: {
+        type: String,
+        required: true,
+      },
+    },
+    data() {
+      return {
+        entryName: this.currentPath !== '' ? `${this.currentPath}/` : '',
+      };
+    },
+    components: {
+      popupDialog,
+    },
+    methods: {
+      createEntryInStore() {
+        eventHub.$emit('createNewEntry', this.entryName, this.type);
+      },
+      toggleModalOpen() {
+        this.$emit('toggle');
+      },
+    },
+    computed: {
+      modalTitle() {
+        if (this.type === 'tree') {
+          return __('Create new directory');
+        }
+
+        return __('Create new file');
+      },
+      buttonLabel() {
+        if (this.type === 'tree') {
+          return __('Create directory');
+        }
+
+        return __('Create file');
+      },
+      formLabelName() {
+        if (this.type === 'tree') {
+          return __('Directory name');
+        }
+
+        return __('File name');
+      },
+    },
+    mounted() {
+      this.$refs.fieldName.focus();
+    },
+  };
+</script>
+
+<template>
+  <popup-dialog
+    :title="modalTitle"
+    :primary-button-label="buttonLabel"
+    kind="success"
+    @toggle="toggleModalOpen"
+    @submit="createEntryInStore"
+  >
+    <form
+      class="form-horizontal"
+      slot="body"
+      @submit.prevent="createEntryInStore"
+    >
+      <fieldset class="form-group append-bottom-0">
+        <label class="label-light col-sm-3">
+          {{ formLabelName }}
+        </label>
+        <div class="col-sm-9">
+          <input
+            type="text"
+            class="form-control"
+            v-model="entryName"
+            ref="fieldName"
+          />
+        </div>
+      </fieldset>
+    </form>
+  </popup-dialog>
+</template>
diff --git a/app/assets/javascripts/repo/components/repo.vue b/app/assets/javascripts/repo/components/repo.vue
index 6310bdb3270..788976a9804 100644
--- a/app/assets/javascripts/repo/components/repo.vue
+++ b/app/assets/javascripts/repo/components/repo.vue
@@ -46,6 +46,10 @@ export default {
     dialogSubmitted(status) {
       this.toggleDialogOpen(false);
       this.dialog.status = status;
+
+      // remove tmp files
+      Helper.removeAllTmpFiles('openedFiles');
+      Helper.removeAllTmpFiles('files');
     },
     toggleBlobView: Store.toggleBlobView,
     createNewBranch(branch) {
diff --git a/app/assets/javascripts/repo/components/repo_commit_section.vue b/app/assets/javascripts/repo/components/repo_commit_section.vue
index 185cd90ac06..0d6259a37a8 100644
--- a/app/assets/javascripts/repo/components/repo_commit_section.vue
+++ b/app/assets/javascripts/repo/components/repo_commit_section.vue
@@ -49,7 +49,7 @@ export default {
       // see https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions
       const commitMessage = this.commitMessage;
       const actions = this.changedFiles.map(f => ({
-        action: 'update',
+        action: f.tempFile ? 'create' : 'update',
         file_path: f.path,
         content: f.newContent,
       }));
@@ -62,7 +62,6 @@ export default {
       if (newBranch) {
         payload.start_branch = this.currentBranch;
       }
-      this.submitCommitsLoading = true;
       Service.commitFiles(payload)
         .then(() => {
           this.resetCommitState();
@@ -78,6 +77,8 @@ export default {
     },
 
     tryCommit(e, skipBranchCheck = false, newBranch = false) {
+      this.submitCommitsLoading = true;
+
       if (skipBranchCheck) {
         this.makeCommit(newBranch);
       } else {
@@ -90,6 +91,7 @@ export default {
             this.makeCommit(newBranch);
           })
           .catch(() => {
+            this.submitCommitsLoading = false;
             Flash('An error occurred while committing your changes');
           });
       }
diff --git a/app/assets/javascripts/repo/components/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue
index 4639bee6d66..df4caba51d8 100644
--- a/app/assets/javascripts/repo/components/repo_editor.vue
+++ b/app/assets/javascripts/repo/components/repo_editor.vue
@@ -16,7 +16,7 @@ const RepoEditor = {
   },
 
   mounted() {
-    Service.getRaw(this.activeFile.raw_path)
+    Service.getRaw(this.activeFile)
       .then((rawResponse) => {
         Store.blobRaw = rawResponse.data;
         Store.activeFile.plain = rawResponse.data;
diff --git a/app/assets/javascripts/repo/components/repo_file_buttons.vue b/app/assets/javascripts/repo/components/repo_file_buttons.vue
index 03cd219e718..c98f641c853 100644
--- a/app/assets/javascripts/repo/components/repo_file_buttons.vue
+++ b/app/assets/javascripts/repo/components/repo_file_buttons.vue
@@ -11,7 +11,12 @@ const RepoFileButtons = {
   mixins: [RepoMixin],
 
   computed: {
-
+    showButtons() {
+      return this.activeFile.raw_path ||
+        this.activeFile.blame_path ||
+        this.activeFile.commits_path ||
+        this.activeFile.permalink;
+    },
     rawDownloadButtonLabel() {
       return this.binary ? 'Download' : 'Raw';
     },
@@ -30,7 +35,10 @@ export default RepoFileButtons;
 </script>
 
 <template>
-  <div id="repo-file-buttons">
+  <div
+    v-if="showButtons"
+    class="repo-file-buttons"
+  >
     <a
       :href="activeFile.raw_path"
       target="_blank"
diff --git a/app/assets/javascripts/repo/components/repo_tab.vue b/app/assets/javascripts/repo/components/repo_tab.vue
index 098715915b0..405d7b4cf86 100644
--- a/app/assets/javascripts/repo/components/repo_tab.vue
+++ b/app/assets/javascripts/repo/components/repo_tab.vue
@@ -18,8 +18,8 @@ const RepoTab = {
     },
     changedClass() {
       const tabChangedObj = {
-        'fa-times close-icon': !this.tab.changed,
-        'fa-circle unsaved-icon': this.tab.changed,
+        'fa-times close-icon': !this.tab.changed && !this.tab.tempFile,
+        'fa-circle unsaved-icon': this.tab.changed || this.tab.tempFile,
       };
       return tabChangedObj;
     },
@@ -30,7 +30,7 @@ const RepoTab = {
       Store.setActiveFiles(file);
     },
     closeTab(file) {
-      if (file.changed) return;
+      if (file.changed || file.tempFile) return;
 
       Store.removeFromOpenedFiles(file);
     },
diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js
index f7b7f93e4b8..fb26f3b7380 100644
--- a/app/assets/javascripts/repo/helpers/repo_helper.js
+++ b/app/assets/javascripts/repo/helpers/repo_helper.js
@@ -1,4 +1,3 @@
-import { convertPermissionToBoolean } from '../../lib/utils/common_utils';
 import Service from '../services/repo_service';
 import Store from '../stores/repo_store';
 import Flash from '../../flash';
@@ -8,6 +7,7 @@ const RepoHelper = {
 
   getDefaultActiveFile() {
     return {
+      id: '',
       active: true,
       binary: false,
       extension: '',
@@ -62,6 +62,7 @@ const RepoHelper = {
     });
 
     RepoHelper.updateHistoryEntry(tree.url, title);
+    Store.path = tree.path;
   },
 
   setDirectoryToClosed(entry) {
@@ -96,8 +97,8 @@ const RepoHelper = {
     .then((response) => {
       const data = response.data;
       if (response.headers && response.headers['page-title']) data.pageTitle = decodeURI(response.headers['page-title']);
-      if (response.headers && response.headers['is-root'] && !Store.isInitialRoot) {
-        Store.isRoot = convertPermissionToBoolean(response.headers['is-root']);
+      if (data.path && !Store.isInitialRoot) {
+        Store.isRoot = data.path === '/';
         Store.isInitialRoot = Store.isRoot;
       }
 
@@ -110,7 +111,7 @@ const RepoHelper = {
           RepoHelper.setBinaryDataAsBase64(data);
           Store.setViewToPreview();
         } else if (!Store.isPreviewView() && !data.render_error) {
-          Service.getRaw(data.raw_path)
+          Service.getRaw(data)
           .then((rawResponse) => {
             Store.blobRaw = rawResponse.data;
             data.plain = rawResponse.data;
@@ -138,6 +139,10 @@ const RepoHelper = {
 
   addToDirectory(file, data) {
     const tree = file || Store;
+
+    // TODO: Figure out why `popstate` is being trigger in the specs
+    if (!tree.files) return;
+
     const files = tree.files.concat(this.dataToListOfFiles(data, file ? file.level + 1 : 0));
 
     tree.files = files;
@@ -157,7 +162,18 @@ const RepoHelper = {
   },
 
   serializeRepoEntity(type, entity, level = 0) {
-    const { id, url, name, icon, last_commit, tree_url } = entity;
+    const {
+      id,
+      url,
+      name,
+      icon,
+      last_commit,
+      tree_url,
+      path,
+      tempFile,
+      active,
+      opened,
+    } = entity;
 
     return {
       id,
@@ -165,11 +181,14 @@ const RepoHelper = {
       name,
       url,
       tree_url,
+      path,
       level,
+      tempFile,
       icon: `fa-${icon}`,
       files: [],
       loading: false,
-      opened: false,
+      opened,
+      active,
       // eslint-disable-next-line camelcase
       lastCommit: last_commit ? {
         url: `${Store.projectUrl}/commit/${last_commit.id}`,
@@ -213,7 +232,7 @@ const RepoHelper = {
   },
 
   findOpenedFileFromActive() {
-    return Store.openedFiles.find(openedFile => Store.activeFile.url === openedFile.url);
+    return Store.openedFiles.find(openedFile => Store.activeFile.id === openedFile.id);
   },
 
   getFileFromPath(path) {
@@ -223,6 +242,76 @@ const RepoHelper = {
   loadingError() {
     Flash('Unable to load this content at this time.');
   },
+  openEditMode() {
+    Store.editMode = true;
+    Store.currentBlobView = 'repo-editor';
+  },
+  updateStorePath(path) {
+    Store.path = path;
+  },
+  findOrCreateEntry(type, tree, name) {
+    let exists = true;
+    let foundEntry = tree.files.find(dir => dir.type === type && dir.name === name);
+
+    if (!foundEntry) {
+      foundEntry = RepoHelper.serializeRepoEntity(type, {
+        id: name,
+        name,
+        path: tree.path ? `${tree.path}/${name}` : name,
+        icon: type === 'tree' ? 'folder' : 'file-text-o',
+        tempFile: true,
+        opened: true,
+        active: true,
+      }, tree.level !== undefined ? tree.level + 1 : 0);
+
+      exists = false;
+      tree.files.push(foundEntry);
+    }
+
+    return {
+      entry: foundEntry,
+      exists,
+    };
+  },
+  removeAllTmpFiles(storeFilesKey) {
+    Store[storeFilesKey] = Store[storeFilesKey].filter(f => !f.tempFile);
+  },
+  createNewEntry(name, type) {
+    const originalPath = Store.path;
+    let entryName = name;
+
+    if (entryName.indexOf(`${originalPath}/`) !== 0) {
+      this.updateStorePath('');
+    } else {
+      entryName = entryName.replace(`${originalPath}/`, '');
+    }
+
+    if (entryName === '') return;
+
+    const fileName = type === 'tree' ? '.gitkeep' : entryName;
+    let tree = Store;
+
+    if (type === 'tree') {
+      const dirNames = entryName.split('/');
+
+      dirNames.forEach((dirName) => {
+        if (dirName === '') return;
+
+        tree = this.findOrCreateEntry('tree', tree, dirName).entry;
+      });
+    }
+
+    if ((type === 'tree' && tree.tempFile) || type === 'blob') {
+      const file = this.findOrCreateEntry('blob', tree, fileName);
+
+      if (!file.exists) {
+        this.setFile(file.entry, file.entry);
+        this.openEditMode();
+      }
+    }
+
+    this.updateStorePath(originalPath);
+  },
 };
 
 export default RepoHelper;
diff --git a/app/assets/javascripts/repo/index.js b/app/assets/javascripts/repo/index.js
index 85e960df497..72fc5a70648 100644
--- a/app/assets/javascripts/repo/index.js
+++ b/app/assets/javascripts/repo/index.js
@@ -6,6 +6,7 @@ import Store from './stores/repo_store';
 import Repo from './components/repo.vue';
 import RepoEditButton from './components/repo_edit_button.vue';
 import newBranchForm from './components/new_branch_form.vue';
+import newDropdown from './components/new_dropdown/index.vue';
 import Translate from '../vue_shared/translate';
 
 function initDropdowns() {
@@ -28,6 +29,7 @@ function setInitialStore(data) {
   Store.service = Service;
   Store.service.url = data.url;
   Store.service.refsUrl = data.refsUrl;
+  Store.path = data.currentPath;
   Store.projectId = data.projectId;
   Store.projectName = data.projectName;
   Store.projectUrl = data.projectUrl;
@@ -63,6 +65,18 @@ function initRepoEditButton(el) {
   });
 }
 
+function initNewDropdown(el) {
+  return new Vue({
+    el,
+    components: {
+      newDropdown,
+    },
+    render(createElement) {
+      return createElement('new-dropdown');
+    },
+  });
+}
+
 function initNewBranchForm() {
   const el = document.querySelector('.js-new-branch-dropdown');
 
@@ -86,6 +100,7 @@ function initNewBranchForm() {
 function initRepoBundle() {
   const repo = document.getElementById('repo');
   const editButton = document.querySelector('.editable-mode');
+  const newDropdownHolder = document.querySelector('.js-new-dropdown');
   setInitialStore(repo.dataset);
   addEventsForNonVueEls();
   initDropdowns();
@@ -95,6 +110,7 @@ function initRepoBundle() {
   initRepo(repo);
   initRepoEditButton(editButton);
   initNewBranchForm();
+  initNewDropdown(newDropdownHolder);
 }
 
 $(initRepoBundle);
diff --git a/app/assets/javascripts/repo/mixins/repo_mixin.js b/app/assets/javascripts/repo/mixins/repo_mixin.js
index c8e8238a0d3..efeda426b96 100644
--- a/app/assets/javascripts/repo/mixins/repo_mixin.js
+++ b/app/assets/javascripts/repo/mixins/repo_mixin.js
@@ -8,7 +8,7 @@ const RepoMixin = {
 
     changedFiles() {
       const changedFileList = this.openedFiles
-      .filter(file => file.changed);
+        .filter(file => file.changed || file.tempFile);
       return changedFileList;
     },
   },
diff --git a/app/assets/javascripts/repo/services/repo_service.js b/app/assets/javascripts/repo/services/repo_service.js
index 786b5637493..c9fa5cc8bf8 100644
--- a/app/assets/javascripts/repo/services/repo_service.js
+++ b/app/assets/javascripts/repo/services/repo_service.js
@@ -16,8 +16,14 @@ const RepoService = {
   createBranchPath: '/api/:version/projects/:id/repository/branches',
   richExtensionRegExp: /md/,
 
-  getRaw(url) {
-    return axios.get(url, {
+  getRaw(file) {
+    if (file.tempFile) {
+      return Promise.resolve({
+        data: '',
+      });
+    }
+
+    return axios.get(file.raw_path, {
       // Stop Axios from parsing a JSON file into a JS object
       transformResponse: [res => res],
     });
diff --git a/app/assets/javascripts/repo/stores/repo_store.js b/app/assets/javascripts/repo/stores/repo_store.js
index 39e1b4e5849..38df1e3e0d2 100644
--- a/app/assets/javascripts/repo/stores/repo_store.js
+++ b/app/assets/javascripts/repo/stores/repo_store.js
@@ -39,6 +39,7 @@ const RepoStore = {
   newMrTemplateUrl: '',
   branchChanged: false,
   commitMessage: '',
+  path: '',
   loading: {
     tree: false,
     blob: false,
@@ -77,21 +78,23 @@ const RepoStore = {
     } else if (file.newContent || file.plain) {
       RepoStore.blobRaw = file.newContent || file.plain;
     } else {
-      Service.getRaw(file.raw_path)
+      Service.getRaw(file)
         .then((rawResponse) => {
           RepoStore.blobRaw = rawResponse.data;
           Helper.findOpenedFileFromActive().plain = rawResponse.data;
         }).catch(Helper.loadingError);
     }
 
-    if (!file.loading) Helper.updateHistoryEntry(file.url, file.pageTitle || file.name);
+    if (!file.loading && !file.tempFile) {
+      Helper.updateHistoryEntry(file.url, file.pageTitle || file.name);
+    }
     RepoStore.binary = file.binary;
     RepoStore.setActiveLine(-1);
   },
 
   setFileActivity(file, openedFile, i) {
     const activeFile = openedFile;
-    activeFile.active = file.url === activeFile.url;
+    activeFile.active = file.id === activeFile.id;
 
     if (activeFile.active) RepoStore.setActiveFile(activeFile, i);
 
@@ -99,7 +102,7 @@ const RepoStore = {
   },
 
   setActiveFile(activeFile, i) {
-    RepoStore.activeFile = Object.assign({}, RepoStore.activeFile, activeFile);
+    RepoStore.activeFile = Object.assign({}, Helper.getDefaultActiveFile(), activeFile);
     RepoStore.activeFileIndex = i;
   },
 
@@ -121,6 +124,11 @@ const RepoStore = {
       return openedFile.path !== file.path;
     });
 
+    // remove the file from the sidebar if it is a tempFile
+    if (file.tempFile) {
+      RepoStore.files = RepoStore.files.filter(f => !(f.tempFile && f.path === file.path));
+    }
+
     // now activate the right tab based on what you closed.
     if (RepoStore.openedFiles.length === 0) {
       RepoStore.activeFile = {};
@@ -170,7 +178,7 @@ const RepoStore = {
   // getters
 
   isActiveFile(file) {
-    return file && file.url === RepoStore.activeFile.url;
+    return file && file.id === RepoStore.activeFile.id;
   },
 
   isPreviewView() {
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 caa28bff6db..5b6c6e8d0b9 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,64 @@
 <script>
-import ciIcon from './ci_icon.vue';
-/**
- * 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 {
-  props: {
-    status: {
-      type: Object,
-      required: true,
+  export default {
+    props: {
+      status: {
+        type: Object,
+        required: true,
+      },
+      showText: {
+        type: Boolean,
+        required: false,
+        default: true,
+      },
     },
-  },
-
-  components: {
-    ciIcon,
-  },
-
-  computed: {
-    cssClass() {
-      const className = this.status.group;
+    components: {
+      ciIcon,
+    },
+    directives: {
+      tooltip,
+    },
+    computed: {
+      cssClass() {
+        const className = this.status.group;
 
-      return className ? `ci-status ci-${this.status.group}` : 'ci-status';
+        return className ? `ci-status ci-${className}` : 'ci-status';
+      },
     },
-  },
-};
+  };
 </script>
 <template>
   <a
     :href="status.details_path"
-    :class="cssClass">
+    :class="cssClass"
+    v-tooltip
+    :title="!showText ? status.text : ''">
     <ci-icon :status="status" />
-    {{status.text}}
+
+    <template v-if="showText">
+      {{status.text}}
+    </template>
   </a>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue
index 50d14282cad..52814de8b2d 100644
--- a/app/assets/javascripts/vue_shared/components/commit.vue
+++ b/app/assets/javascripts/vue_shared/components/commit.vue
@@ -63,14 +63,17 @@
         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.
        *
-       * TODO: Improve this! Use lodash _.has when we have it.
-       *
        * @returns {Boolean}
        */
       hasCommitRef() {
@@ -80,8 +83,6 @@
        * Used to verify if all the properties needed to render the commit
        * author section were provided.
        *
-       * TODO: Improve this! Use lodash _.has when we have it.
-       *
        * @returns {Boolean}
        */
       hasAuthor() {
@@ -114,31 +115,30 @@
 </script>
 <template>
   <div class="branch-commit">
-    <div
-      v-if="hasCommitRef"
-      class="icon-container hidden-xs">
-      <i
-        v-if="tag"
-        class="fa fa-tag"
-        aria-hidden="true">
-      </i>
-      <i
-        v-if="!tag"
-        class="fa fa-code-fork"
-        aria-hidden="true">
-      </i>
-    </div>
-
-    <a
-      v-if="hasCommitRef"
-      class="ref-name hidden-xs"
-      :href="commitRef.ref_url"
-      v-tooltip
-      data-container="body"
-      :title="commitRef.name">
-      {{commitRef.name}}
-    </a>
+    <template v-if="hasCommitRef && showBranch">
+      <div
+        class="icon-container hidden-xs">
+        <i
+          v-if="tag"
+          class="fa fa-tag"
+          aria-hidden="true">
+        </i>
+        <i
+          v-if="!tag"
+          class="fa fa-code-fork"
+          aria-hidden="true">
+        </i>
+      </div>
 
+      <a
+        class="ref-name hidden-xs"
+        :href="commitRef.ref_url"
+        v-tooltip
+        data-container="body"
+        :title="commitRef.name">
+        {{commitRef.name}}
+      </a>
+    </template>
     <div
       v-html="commitIconSvg"
       class="commit-icon js-commit-icon">
diff --git a/app/assets/javascripts/vue_shared/components/popup_dialog.vue b/app/assets/javascripts/vue_shared/components/popup_dialog.vue
index 7d8c5936b7d..9e8c10bdc1a 100644
--- a/app/assets/javascripts/vue_shared/components/popup_dialog.vue
+++ b/app/assets/javascripts/vue_shared/components/popup_dialog.vue
@@ -9,7 +9,7 @@ export default {
     },
     text: {
       type: String,
-      required: true,
+      required: false,
     },
     kind: {
       type: String,
@@ -82,14 +82,15 @@ export default {
           type="button"
           class="btn"
           :class="btnCancelKindClass"
-          @click="emitSubmit(false)">
-            {{closeButtonLabel}}
+          @click="close">
+          {{ closeButtonLabel }}
         </button>
-        <button type="button"
+        <button
+          type="button"
           class="btn"
           :class="btnKindClass"
           @click="emitSubmit(true)">
-            {{primaryButtonLabel}}
+          {{ primaryButtonLabel }}
         </button>
       </div>
     </div>
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index a0bb9e61436..7b1ef003bb2 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -37,7 +37,7 @@
 @import "framework/secondary-navigation-elements";
 @import "framework/selects";
 @import "framework/sidebar";
-@import "framework/new-sidebar";
+@import "framework/contextual-sidebar";
 @import "framework/tables";
 @import "framework/notes";
 @import "framework/tabs";
diff --git a/app/assets/stylesheets/framework/new-sidebar.scss b/app/assets/stylesheets/framework/contextual-sidebar.scss
index 7a309f2c8a1..fa5d3833f3e 100644
--- a/app/assets/stylesheets/framework/new-sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual-sidebar.scss
@@ -1,24 +1,10 @@
-@import "framework/variables";
-@import 'framework/tw_bootstrap_variables';
-@import "bootstrap/variables";
-
-$active-background: rgba(0, 0, 0, .04);
-$active-hover-background: $active-background;
-$active-hover-color: $gl-text-color;
-$inactive-badge-background: rgba(0, 0, 0, .08);
-$hover-background: rgba(0, 0, 0, .06);
-$hover-color: $gl-text-color;
-$inactive-color: $gl-text-color-secondary;
-$new-sidebar-width: 220px;
-$new-sidebar-collapsed-width: 50px;
-
-.page-with-new-sidebar {
+.page-with-contextual-sidebar {
   @media (min-width: $screen-md-min) {
-    padding-left: $new-sidebar-collapsed-width;
+    padding-left: $contextual-sidebar-collapsed-width;
   }
 
   @media (min-width: $screen-lg-min) {
-    padding-left: $new-sidebar-width;
+    padding-left: $contextual-sidebar-width;
   }
 
   // Override position: absolute
@@ -34,7 +20,7 @@ $new-sidebar-collapsed-width: 50px;
 
 .page-with-icon-sidebar {
   @media (min-width: $screen-sm-min) {
-    padding-left: $new-sidebar-collapsed-width;
+    padding-left: $contextual-sidebar-collapsed-width;
   }
 }
 
@@ -52,12 +38,12 @@ $new-sidebar-collapsed-width: 50px;
 
   &:hover,
   a:hover {
-    background-color: $hover-background;
-    color: $hover-color;
+    background-color: $link-hover-background;
+    color: $gl-text-color;
 
     .settings-avatar {
       svg {
-        fill: $hover-color;
+        fill: $gl-text-color;
       }
     }
   }
@@ -85,7 +71,7 @@ $new-sidebar-collapsed-width: 50px;
 .nav-sidebar {
   position: fixed;
   z-index: 400;
-  width: $new-sidebar-width;
+  width: $contextual-sidebar-width;
   transition: left $sidebar-transition-duration;
   top: $header-height;
   bottom: 0;
@@ -103,7 +89,7 @@ $new-sidebar-collapsed-width: 50px;
 
   &.sidebar-icons-only {
     width: auto;
-    min-width: $new-sidebar-collapsed-width;
+    min-width: $contextual-sidebar-collapsed-width;
 
     .nav-sidebar-inner-scroll {
       overflow-x: hidden;
@@ -149,11 +135,11 @@ $new-sidebar-collapsed-width: 50px;
       display: flex;
       align-items: center;
       padding: 12px 16px;
-      color: $inactive-color;
+      color: $gl-text-color-secondary;
     }
 
     svg {
-      fill: $inactive-color;
+      fill: $gl-text-color-secondary;
     }
   }
 
@@ -168,7 +154,7 @@ $new-sidebar-collapsed-width: 50px;
   }
 
   @media (max-width: $screen-xs-max) {
-    left: (-$new-sidebar-width);
+    left: (-$contextual-sidebar-width);
   }
 
   .nav-icon-container {
@@ -210,8 +196,8 @@ $new-sidebar-collapsed-width: 50px;
 
       &:hover,
       &:focus {
-        background: $active-hover-background;
-        color: $active-hover-color;
+        background: $link-active-background;
+        color: $gl-text-color;
       }
     }
 
@@ -220,7 +206,7 @@ $new-sidebar-collapsed-width: 50px;
         &,
         &:hover,
         &:focus {
-          background: $active-background;
+          background: $link-active-background;
         }
       }
     }
@@ -308,11 +294,11 @@ $new-sidebar-collapsed-width: 50px;
 
     .badge {
       background-color: $inactive-badge-background;
-      color: $inactive-color;
+      color: $gl-text-color-secondary;
     }
 
     &.active {
-      background: $active-background;
+      background: $link-active-background;
 
       > a {
         margin-left: 4px;
@@ -330,7 +316,7 @@ $new-sidebar-collapsed-width: 50px;
 
     &.active > a:hover,
     &.is-over > a {
-      background-color: $hover-background;
+      background-color: $link-hover-background;
     }
   }
 }
@@ -340,7 +326,7 @@ $new-sidebar-collapsed-width: 50px;
 
 .toggle-sidebar-button,
 .close-nav-button {
-  width: $new-sidebar-width - 2px;
+  width: $contextual-sidebar-width - 2px;
   position: fixed;
   bottom: 0;
   padding: 16px;
@@ -407,7 +393,7 @@ $new-sidebar-collapsed-width: 50px;
   }
 
   .toggle-sidebar-button {
-    width: $new-sidebar-collapsed-width - 2px;
+    width: $contextual-sidebar-collapsed-width - 2px;
     padding: 16px;
 
     .collapse-text,
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index b2847c348eb..0d80a85d521 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -65,7 +65,7 @@
     display: flex;
     flex: 1;
     -webkit-flex: 1;
-    padding-left: 30px;
+    padding-left: 12px;
     position: relative;
     margin-bottom: 0;
   }
@@ -221,10 +221,6 @@
     box-shadow: 0 0 4px $search-input-focus-shadow-color;
   }
 
-  &.focus .fa-filter {
-    color: $common-gray-dark;
-  }
-
   gl-emoji {
     display: inline-block;
     font-family: inherit;
@@ -251,13 +247,6 @@
     }
   }
 
-  .fa-filter {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-    color: $gray-darkest;
-  }
-
   .fa-times {
     right: 10px;
     color: $gray-darkest;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index d5ca23ff870..8ab48e4844f 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -9,6 +9,8 @@ $sidebar-transition-duration: .15s;
 $sidebar-breakpoint: 1024px;
 $default-transition-duration: .15s;
 $right-sidebar-transition-duration: .3s;
+$contextual-sidebar-width: 220px;
+$contextual-sidebar-collapsed-width: 50px;
 
 /*
  * Color schema
@@ -359,6 +361,13 @@ $filtered-search-term-shadow-color: rgba(0, 0, 0, 0.09);
 $dropdown-hover-color: $blue-400;
 
 /*
+* Contextual Sidebar
+*/
+$link-active-background: rgba(0, 0, 0, .04);
+$link-hover-background: rgba(0, 0, 0, .06);
+$inactive-badge-background: rgba(0, 0, 0, .08);
+
+/*
 * Buttons
 */
 $btn-active-gray: #ececec;
@@ -404,7 +413,6 @@ $note-targe3-inside: #ffffd3;
 $note-line2-border: #ddd;
 $note-icon-gutter-width: 55px;
 
-
 /*
 * Zen
 */
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index ca61f7a30c3..91296b354a7 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -414,7 +414,7 @@
   margin: 5px;
 }
 
-.page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar {
+.page-with-contextual-sidebar.page-with-sidebar .issue-boards-sidebar {
   .issuable-sidebar-header {
     position: relative;
   }
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 04b132415eb..f0cad30f4f3 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -249,13 +249,12 @@
       width: 100%;
       padding-right: 5px;
     }
-
   }
 
   .discussion-actions {
     display: table;
 
-    .new-issue-for-discussion path {
+    .btn-default path {
       fill: $gray-darkest;
     }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index ebad429c2ba..3bd0e3ad535 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -466,6 +466,10 @@ ul.notes {
   float: right;
   margin-left: 10px;
   color: $gray-darkest;
+
+  .btn-group > .discussion-next-btn {
+    margin-left: -1px;
+  }
 }
 
 .note-actions {
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 97ca01f0f54..6a363b1710e 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -201,7 +201,7 @@
       }
     }
 
-    #repo-file-buttons {
+    .repo-file-buttons {
       background-color: $white-light;
       padding: 5px 10px;
       border-top: 1px solid $white-normal;
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 183a6f88a6a..770381472c5 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -205,6 +205,7 @@ class Projects::BlobController < Projects::ApplicationController
     tree_path = path_segments.join('/')
 
     render json: json.merge(
+      id: @blob.id,
       path: blob.path,
       name: blob.name,
       extension: blob.extension,
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index 756f7e5df8c..f3719059f88 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -36,7 +36,6 @@ class Projects::TreeController < Projects::ApplicationController
 
       format.json do
         page_title @path.presence || _("Files"), @ref, @project.name_with_namespace
-        response.header['is-root'] = @path.empty?
 
         # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
         Gitlab::GitalyClient.allow_n_plus_1_calls do
diff --git a/app/finders/branches_finder.rb b/app/finders/branches_finder.rb
index 533076585c0..852eac3647d 100644
--- a/app/finders/branches_finder.rb
+++ b/app/finders/branches_finder.rb
@@ -23,7 +23,7 @@ class BranchesFinder
 
   def filter_by_name(branches)
     if search
-      branches.select { |branch| branch.name.include?(search) }
+      branches.select { |branch| branch.name.upcase.include?(search.upcase) }
     else
       branches
     end
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 1ee8911bb1a..cd1ecaadb85 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -120,6 +120,15 @@ module ApplicationSettingsHelper
     message.html_safe
   end
 
+  def circuitbreaker_access_retries_help_text
+    _('The number of attempts GitLab will make to access a storage.')
+  end
+
+  def circuitbreaker_backoff_threshold_help_text
+    _("The number of failures after which GitLab will start temporarily "\
+      "disabling access to a storage shard on a host")
+  end
+
   def circuitbreaker_failure_wait_time_help_text
     _("When access to a storage fails. GitLab will prevent access to the "\
       "storage for the time specified here. This allows the filesystem to "\
@@ -144,6 +153,8 @@ module ApplicationSettingsHelper
       :akismet_api_key,
       :akismet_enabled,
       :auto_devops_enabled,
+      :circuitbreaker_access_retries,
+      :circuitbreaker_backoff_threshold,
       :circuitbreaker_failure_count_threshold,
       :circuitbreaker_failure_reset_time,
       :circuitbreaker_failure_wait_time,
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index a23a43c9f43..5a74511afa7 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -1,7 +1,7 @@
 module NavHelper
   def page_with_sidebar_class
     class_name = page_gutter_class
-    class_name << 'page-with-new-sidebar' if defined?(@left_sidebar) && @left_sidebar
+    class_name << 'page-with-contextual-sidebar' if defined?(@left_sidebar) && @left_sidebar
     class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar
 
     class_name
diff --git a/app/helpers/storage_health_helper.rb b/app/helpers/storage_health_helper.rb
index 544c9efb845..4d2180f7eee 100644
--- a/app/helpers/storage_health_helper.rb
+++ b/app/helpers/storage_health_helper.rb
@@ -16,17 +16,16 @@ module StorageHealthHelper
   def message_for_circuit_breaker(circuit_breaker)
     maximum_failures = circuit_breaker.failure_count_threshold
     current_failures = circuit_breaker.failure_count
-    permanently_broken = circuit_breaker.circuit_broken? && current_failures >= maximum_failures
 
     translation_params = { number_of_failures: current_failures,
                            maximum_failures: maximum_failures,
                            number_of_seconds: circuit_breaker.failure_wait_time }
 
-    if permanently_broken
+    if circuit_breaker.circuit_broken?
       s_("%{number_of_failures} of %{maximum_failures} failures. GitLab will not "\
          "retry automatically. Reset storage information when the problem is "\
          "resolved.") % translation_params
-    elsif circuit_breaker.circuit_broken?
+    elsif circuit_breaker.backing_off?
       _("%{number_of_failures} of %{maximum_failures} failures. GitLab will "\
         "block access for %{number_of_seconds} seconds.") % translation_params
     else
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 4dda276bb41..f266e7db6da 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -153,13 +153,25 @@ class ApplicationSetting < ActiveRecord::Base
             presence: true,
             numericality: { greater_than_or_equal_to: 0 }
 
-  validates :circuitbreaker_failure_count_threshold,
+  validates :circuitbreaker_backoff_threshold,
+            :circuitbreaker_failure_count_threshold,
             :circuitbreaker_failure_wait_time,
             :circuitbreaker_failure_reset_time,
             :circuitbreaker_storage_timeout,
             presence: true,
             numericality: { only_integer: true, greater_than_or_equal_to: 0 }
 
+  validates :circuitbreaker_access_retries,
+            presence: true,
+            numericality: { only_integer: true, greater_than_or_equal_to: 1 }
+
+  validates_each :circuitbreaker_backoff_threshold do |record, attr, value|
+    if value.to_i >= record.circuitbreaker_failure_count_threshold
+      record.errors.add(attr, _("The circuitbreaker backoff threshold should be "\
+                                "lower than the failure count threshold"))
+    end
+  end
+
   SUPPORTED_KEY_TYPES.each do |type|
     validates :"#{type}_key_restriction", presence: true, key_restriction: { type: type }
   end
diff --git a/app/models/environment.rb b/app/models/environment.rb
index b6868ccbe8f..e613d21add6 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -110,7 +110,7 @@ class Environment < ActiveRecord::Base
   end
 
   def ref_path
-    "refs/#{Repository::REF_ENVIRONMENTS}/#{Shellwords.shellescape(name)}"
+    "refs/#{Repository::REF_ENVIRONMENTS}/#{generate_slug}"
   end
 
   def formatted_external_url
diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb
index 5d798247863..2e824cda525 100644
--- a/app/models/pages_domain.rb
+++ b/app/models/pages_domain.rb
@@ -16,9 +16,9 @@ class PagesDomain < ActiveRecord::Base
     key: Gitlab::Application.secrets.db_key_base,
     algorithm: 'aes-256-cbc'
 
-  after_create :update
-  after_save :update
-  after_destroy :update
+  after_create :update_daemon
+  after_save :update_daemon
+  after_destroy :update_daemon
 
   def to_param
     domain
@@ -80,7 +80,7 @@ class PagesDomain < ActiveRecord::Base
 
   private
 
-  def update
+  def update_daemon
     ::Projects::UpdatePagesConfigurationService.new(project).execute
   end
 
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 2b23af9212e..3a4d5ce0b5c 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -533,11 +533,23 @@
   %fieldset
     %legend Git Storage Circuitbreaker settings
     .form-group
-      = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'control-label col-sm-2'
+      = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'control-label col-sm-2'
       .col-sm-10
-        = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
+        = f.number_field :circuitbreaker_access_retries, class: 'form-control'
         .help-block
-          = circuitbreaker_failure_count_help_text
+          = circuitbreaker_access_retries_help_text
+    .form-group
+      = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
+        .help-block
+          = circuitbreaker_storage_timeout_help_text
+    .form-group
+      = f.label :circuitbreaker_backoff_threshold, _('Number of failures before backing off'), class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.number_field :circuitbreaker_backoff_threshold, class: 'form-control'
+        .help-block
+          = circuitbreaker_backoff_threshold_help_text
     .form-group
       = f.label :circuitbreaker_failure_wait_time, _('Seconds to wait after a storage failure'), class: 'control-label col-sm-2'
       .col-sm-10
@@ -545,17 +557,17 @@
         .help-block
           = circuitbreaker_failure_wait_time_help_text
     .form-group
-      = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'control-label col-sm-2'
+      = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'control-label col-sm-2'
       .col-sm-10
-        = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'
+        = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
         .help-block
-          = circuitbreaker_failure_reset_time_help_text
+          = circuitbreaker_failure_count_help_text
     .form-group
-      = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'control-label col-sm-2'
+      = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'control-label col-sm-2'
       .col-sm-10
-        = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
+        = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'
         .help-block
-          = circuitbreaker_storage_timeout_help_text
+          = circuitbreaker_failure_reset_time_help_text
 
   %fieldset
     %legend Repository Checks
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index fd2ba9ac1ca..9038c4fbebd 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -6,13 +6,13 @@
   .fade-right= icon('angle-right')
   %ul.nav-links.scrolling-tabs
     = nav_link(page: [dashboard_projects_path, root_path]) do
-      = link_to dashboard_projects_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
+      = link_to dashboard_projects_path, class: 'shortcuts-activity', data: {placement: 'right'} do
         Your projects
     = nav_link(page: starred_dashboard_projects_path) do
-      = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
+      = link_to starred_dashboard_projects_path, data: {placement: 'right'} do
         Starred projects
     = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path]) do
-      = link_to explore_root_path, title: 'Explore', data: {placement: 'right'} do
+      = link_to explore_root_path, data: {placement: 'right'} do
         Explore projects
 
   .nav-controls
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index ff76abc3553..b127e06030e 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -47,7 +47,7 @@
 
         - if can?(current_user, :update_cluster, @cluster)
           .form-group
-            = field.submit s_('ClusterIntegration|Save'), class: 'btn btn-success'
+            = field.submit _('Save'), class: 'btn btn-success'
 
   %section.settings#js-cluster-details
     .settings-header
@@ -68,7 +68,7 @@
 
   %section.settings#js-cluster-advanced-settings
     .settings-header
-      %h4= s_('ClusterIntegration|Advanced settings')
+      %h4= _('Advanced settings')
       %button.btn.js-settings-toggle
         = expanded ? 'Collapse' : 'Expand'
       %p= s_('ClusterIntegration|Manage Cluster integration on your GitLab project')
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 09bcd187e59..ff17372fdd9 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -77,5 +77,6 @@
         #{ n_(s_('Pipeline|with stage'), s_('Pipeline|with stages'), last_pipeline.stages_count) }
         .mr-widget-pipeline-graph
           = render 'shared/mini_pipeline_graph', pipeline: last_pipeline, klass: 'js-commit-pipeline-graph'
-      in
-      = time_interval_in_words last_pipeline.duration
+      - if last_pipeline.duration
+        in
+        = time_interval_in_words last_pipeline.duration
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index c9956183e12..af564b93dc3 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -72,6 +72,7 @@
           %pre.light-well
             :preserve
               cd existing_repo
+              git remote rename origin old-origin
               git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
               git push -u origin --all
               git push -u origin --tags
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml
index 47f3f2b459a..7ea19e6c828 100644
--- a/app/views/projects/tree/_tree_header.html.haml
+++ b/app/views/projects/tree/_tree_header.html.haml
@@ -2,7 +2,9 @@
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'tree', path: @path, show_create: true
 
-  - unless show_new_repo?
+  - if show_new_repo?
+    .js-new-dropdown
+  - else
     = render 'projects/tree/old_tree_header'
 
 .tree-controls
diff --git a/app/views/shared/issuable/_participants.html.haml b/app/views/shared/issuable/_participants.html.haml
index d2b62557e03..3f553c9fede 100644
--- a/app/views/shared/issuable/_participants.html.haml
+++ b/app/views/shared/issuable/_participants.html.haml
@@ -14,5 +14,5 @@
         = link_to_member(@project, participant, name: false, size: 24, lazy_load: true)
   - if participants_extra > 0
     .hide-collapsed.participants-more
-      %a.js-participants-more{ href: "#", data: { original_text: "+ #{participants_size - 7} more", less_text: "- show less" } }
+      %button.btn-transparent.btn-blank.js-participants-more{ type: 'button', data: { original_text: "+ #{participants_size - 7} more", less_text: "- show less" } }
         + #{participants_extra} more
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index 161b1c9fd72..fabb17c7340 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -25,7 +25,6 @@
               %ul.tokens-container.list-unstyled
                 %li.input-token
                   %input.form-control.filtered-search{ search_filter_input_options(type) }
-              = icon('filter')
             #js-dropdown-hint.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown
               %ul{ data: { dropdown: true } }
                 %li.filter-dropdown-item{ data: { action: 'submit' } }
diff --git a/app/views/shared/repo/_repo.html.haml b/app/views/shared/repo/_repo.html.haml
index 7185f5bcc5b..7861f92b33f 100644
--- a/app/views/shared/repo/_repo.html.haml
+++ b/app/views/shared/repo/_repo.html.haml
@@ -7,4 +7,5 @@
                blob_url: namespace_project_blob_path(project.namespace, project, '{{branch}}'),
                new_mr_template_url: namespace_project_new_merge_request_path(project.namespace, project, merge_request: { source_branch: '{{source_branch}}' }),
                can_commit: (!!can_push_branch?(project, @ref)).to_s,
-               on_top_of_branch: (!!on_top_of_branch?(project, @ref)).to_s } }
+               on_top_of_branch: (!!on_top_of_branch?(project, @ref)).to_s,
+               current_path: @path } }
diff --git a/changelogs/unreleased/14970-suggest-rename-remote.yml b/changelogs/unreleased/14970-suggest-rename-remote.yml
new file mode 100644
index 00000000000..68a77eb446d
--- /dev/null
+++ b/changelogs/unreleased/14970-suggest-rename-remote.yml
@@ -0,0 +1,5 @@
+---
+title: Suggest to rename the remote for existing repository instructions
+merge_request: 14970
+author: helmo42
+type: added
diff --git a/changelogs/unreleased/23000-pages-api.yml b/changelogs/unreleased/23000-pages-api.yml
new file mode 100644
index 00000000000..9f6fa13dd07
--- /dev/null
+++ b/changelogs/unreleased/23000-pages-api.yml
@@ -0,0 +1,5 @@
+---
+title: Add API endpoints for Pages Domains
+merge_request: 13917
+author: Travis Miller
+type: added
diff --git a/changelogs/unreleased/32318-filter-icon.yml b/changelogs/unreleased/32318-filter-icon.yml
new file mode 100644
index 00000000000..71e7c2c4dac
--- /dev/null
+++ b/changelogs/unreleased/32318-filter-icon.yml
@@ -0,0 +1,5 @@
+---
+title: Remove filter icon from search bar
+merge_request:
+author:
+type: other
diff --git a/changelogs/unreleased/35199-case-insensitive-branches-search.yml b/changelogs/unreleased/35199-case-insensitive-branches-search.yml
new file mode 100644
index 00000000000..da2729e9e55
--- /dev/null
+++ b/changelogs/unreleased/35199-case-insensitive-branches-search.yml
@@ -0,0 +1,5 @@
+---
+title: Case insensitive search for branches
+merge_request: 14995
+author: George Andrinopoulos
+type: fixed
diff --git a/changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml b/changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml
new file mode 100644
index 00000000000..b03baab4950
--- /dev/null
+++ b/changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml
@@ -0,0 +1,5 @@
+---
+title: Refactor have_http_status into have_gitlab_http_status
+merge_request: 14958
+author: Jacopo Beschi @jacopo-beschi
+type: added
diff --git a/changelogs/unreleased/39419-remove-overzealous-tooltips.yml b/changelogs/unreleased/39419-remove-overzealous-tooltips.yml
new file mode 100644
index 00000000000..d6cf60bebfa
--- /dev/null
+++ b/changelogs/unreleased/39419-remove-overzealous-tooltips.yml
@@ -0,0 +1,5 @@
+---
+title: Remove overzealous tooltips in projects page tabs
+merge_request: 15017
+author:
+type: removed
diff --git a/changelogs/unreleased/api-doc-group-statistics.yml b/changelogs/unreleased/api-doc-group-statistics.yml
new file mode 100644
index 00000000000..385ff978024
--- /dev/null
+++ b/changelogs/unreleased/api-doc-group-statistics.yml
@@ -0,0 +1,5 @@
+---
+title: Update the groups API documentation
+merge_request: 15024
+author: Robert Schilling
+type: fixed
diff --git a/changelogs/unreleased/bvl-circuitbreaker-backoff.yml b/changelogs/unreleased/bvl-circuitbreaker-backoff.yml
new file mode 100644
index 00000000000..5cb90e7c085
--- /dev/null
+++ b/changelogs/unreleased/bvl-circuitbreaker-backoff.yml
@@ -0,0 +1,6 @@
+---
+title: Make the circuitbreaker more robust by adding higher thresholds, and multiple
+  access attempts.
+merge_request: 14933
+author:
+type: fixed
diff --git a/changelogs/unreleased/bvl-dont-rename-free-names.yml b/changelogs/unreleased/bvl-dont-rename-free-names.yml
new file mode 100644
index 00000000000..60a4ec8afbe
--- /dev/null
+++ b/changelogs/unreleased/bvl-dont-rename-free-names.yml
@@ -0,0 +1,5 @@
+---
+title: Don't rename paths that were freed up when upgrading
+merge_request: 15029
+author:
+type: fixed
diff --git a/changelogs/unreleased/hide-pipeline-zero-duration.yml b/changelogs/unreleased/hide-pipeline-zero-duration.yml
new file mode 100644
index 00000000000..5d7a0983537
--- /dev/null
+++ b/changelogs/unreleased/hide-pipeline-zero-duration.yml
@@ -0,0 +1,5 @@
+---
+title: Hides pipeline duration in commit box when it is zero (nil)
+merge_request: 14979
+author: gvieira37
+type: fixed
diff --git a/changelogs/unreleased/sh-fix-environment-write-ref.yml b/changelogs/unreleased/sh-fix-environment-write-ref.yml
new file mode 100644
index 00000000000..8f291843ebe
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-environment-write-ref.yml
@@ -0,0 +1,5 @@
+---
+title: Fix the writing of invalid environment refs
+merge_request:
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-memoize-logger.yml b/changelogs/unreleased/sh-memoize-logger.yml
new file mode 100644
index 00000000000..1b6567ce72f
--- /dev/null
+++ b/changelogs/unreleased/sh-memoize-logger.yml
@@ -0,0 +1,5 @@
+---
+title: Memoize GitLab logger to reduce open file descriptors
+merge_request:
+author:
+type: fixed
diff --git a/db/migrate/20171017145932_add_new_circuitbreaker_settings_to_application_settings.rb b/db/migrate/20171017145932_add_new_circuitbreaker_settings_to_application_settings.rb
new file mode 100644
index 00000000000..07eb25c0b0f
--- /dev/null
+++ b/db/migrate/20171017145932_add_new_circuitbreaker_settings_to_application_settings.rb
@@ -0,0 +1,16 @@
+class AddNewCircuitbreakerSettingsToApplicationSettings < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    add_column :application_settings,
+               :circuitbreaker_access_retries,
+               :integer,
+               default: 3
+    add_column :application_settings,
+               :circuitbreaker_backoff_threshold,
+               :integer,
+               default: 80
+  end
+end
diff --git a/db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb b/db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb
index 9441b236c8d..2125cc046e5 100644
--- a/db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb
+++ b/db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb
@@ -13,7 +13,6 @@ class RenameAllReservedPathsAgain < ActiveRecord::Migration
       .well-known
       abuse_reports
       admin
-      all
       api
       assets
       autocomplete
@@ -24,29 +23,20 @@ class RenameAllReservedPathsAgain < ActiveRecord::Migration
       groups
       health_check
       help
-      hooks
       import
       invites
-      issues
       jwt
       koding
-      member
-      merge_requests
-      new
-      notes
       notification_settings
       oauth
       profile
       projects
       public
-      repository
       robots.txt
       s
       search
       sent_notifications
-      services
       snippets
-      teams
       u
       unicorn_test
       unsubscribes
@@ -94,7 +84,6 @@ class RenameAllReservedPathsAgain < ActiveRecord::Migration
       notification_setting
       pipeline_quota
       projects
-      subgroups
   ].freeze
 
   def up
diff --git a/db/schema.rb b/db/schema.rb
index c2c04873d4d..530f08022be 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171012101043) do
+ActiveRecord::Schema.define(version: 20171017145932) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -138,6 +138,8 @@ ActiveRecord::Schema.define(version: 20171012101043) do
     t.integer "circuitbreaker_failure_wait_time", default: 30
     t.integer "circuitbreaker_failure_reset_time", default: 1800
     t.integer "circuitbreaker_storage_timeout", default: 30
+    t.integer "circuitbreaker_access_retries", default: 3
+    t.integer "circuitbreaker_backoff_threshold", default: 80
   end
 
   create_table "audit_events", force: :cascade do |t|
diff --git a/doc/README.md b/doc/README.md
index c6500a37aa9..5eabc126b95 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -85,7 +85,7 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i
 
 ### Issues and Merge Requests (MRs)
 
-- [Discussions](user/discussions/index.md) Threads, comments, and resolvable discussions in issues, commits, and  merge requests.
+- [Discussions](user/discussions/index.md): Threads, comments, and resolvable discussions in issues, commits, and  merge requests.
 - [Issues](user/project/issues/index.md)
 - [Project issue Board](user/project/issue_board.md)
 - [Issues and merge requests templates](user/project/description_templates.md): Create templates for submitting new issues and merge requests.
@@ -155,7 +155,7 @@ have access to GitLab administration tools and settings.
 - [Git LFS configuration](workflow/lfs/lfs_administration.md): Learn how to use LFS under GitLab.
 - [GitLab Pages configuration](administration/pages/index.md): Configure GitLab Pages.
 - [High Availability](administration/high_availability/README.md): Configure multiple servers for scaling or high availability.
-- [User cohorts](user/admin_area/user_cohorts.md) View user activity over time.
+- [User cohorts](user/admin_area/user_cohorts.md): View user activity over time.
 - [Web terminals](administration/integration/terminal.md): Provide terminal access to environments from within GitLab.
 - GitLab CI
     - [CI admin settings](user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration time.
diff --git a/doc/administration/img/circuitbreaker_config.png b/doc/administration/img/circuitbreaker_config.png
index 9250d38297c..e811d173634 100644
--- a/doc/administration/img/circuitbreaker_config.png
+++ b/doc/administration/img/circuitbreaker_config.png
diff --git a/doc/administration/repository_storage_paths.md b/doc/administration/repository_storage_paths.md
index efcabd69822..96f436fa7c3 100644
--- a/doc/administration/repository_storage_paths.md
+++ b/doc/administration/repository_storage_paths.md
@@ -109,6 +109,11 @@ This can be configured from the admin interface:
 
 ![circuitbreaker configuration](img/circuitbreaker_config.png)
 
+**Number of access attempts**: The number of attempts GitLab will make to access a
+storage when probing a shard.
+
+**Number of failures before backing off**: The number of failures after which
+GitLab will start temporarily disabling access to a storage shard on a host.
 
 **Maximum git storage failures:** The number of failures of after which GitLab will
 completely prevent access to the storage. The number of failures can be reset in
@@ -126,6 +131,15 @@ mount is reset.
 **Seconds to wait for a storage access attempt:** The time in seconds GitLab will
 try to access storage. After this time a timeout error will be raised.
 
+To enable the circuitbreaker for repository storage you can flip the feature flag from a rails console:
+
+```
+Feature.enable('git_storage_circuit_breaker')
+```
+
+Alternatively it can be enabled by setting `true` in the `GIT_STORAGE_CIRCUIT_BREAKER` environment variable.
+This approach would be used when enabling the circuit breaker on a single host.
+
 When storage failures occur, this will be visible in the admin interface like this:
 
 ![failing storage](img/failing_storage.png)
diff --git a/doc/api/README.md b/doc/api/README.md
index de0fe79b3d6..89ffe9d7868 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -37,6 +37,7 @@ following locations:
 - [Notes](notes.md) (comments)
 - [Notification settings](notification_settings.md)
 - [Open source license templates](templates/licenses.md)
+- [Pages Domains](pages_domains.md)
 - [Pipelines](pipelines.md)
 - [Pipeline Triggers](pipeline_triggers.md)
 - [Pipeline Schedules](pipeline_schedules.md)
@@ -458,7 +459,7 @@ Content-Type: application/json
 ## Encoding `+` in ISO 8601 dates
 
 If you need to include a `+` in a query parameter, you may need to use `%2B` instead due
-a [W3 recommendation]((http://www.w3.org/Addressing/URL/4_URI_Recommentations.html) that
+a [W3 recommendation](http://www.w3.org/Addressing/URL/4_URI_Recommentations.html) that
 causes a `+` to be interpreted as a space. For example, in an ISO 8601 date, you may want to pass
 a time in Mountain Standard Time, such as:
 
diff --git a/doc/api/groups.md b/doc/api/groups.md
index c2daa8bc029..99d200c9c93 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -40,6 +40,38 @@ GET /groups
 ]
 ```
 
+When adding the parameter `statistics=true` and the authenticated user is an admin, additional group statistics are returned.
+
+```
+GET /groups?statistics=true
+```
+
+```json
+[
+  {
+    "id": 1,
+    "name": "Foobar Group",
+    "path": "foo-bar",
+    "description": "An interesting group",
+    "visibility": "public",
+    "lfs_enabled": true,
+    "avatar_url": "http://localhost:3000/uploads/group/avatar/1/foo.jpg",
+    "web_url": "http://localhost:3000/groups/foo-bar",
+    "request_access_enabled": false,
+    "full_name": "Foobar Group",
+    "full_path": "foo-bar",
+    "parent_id": null,
+    "statistics": {
+      "storage_size" : 212,
+      "repository_size" : 33,
+      "lfs_objects_size" : 123,
+      "job_artifacts_size" : 57
+
+    }
+  }
+]
+```
+
 You can search for groups by name or path, see below.
 
 ## List a group's projects
diff --git a/doc/api/pages_domains.md b/doc/api/pages_domains.md
new file mode 100644
index 00000000000..51962595e33
--- /dev/null
+++ b/doc/api/pages_domains.md
@@ -0,0 +1,170 @@
+# Pages domains API
+
+Endpoints for connecting custom domain(s) and TLS certificates in [GitLab Pages](https://about.gitlab.com/features/pages/).
+
+The GitLab Pages feature must be enabled to use these endpoints. Find out more about [administering](../administration/pages/index.md) and [using](../user/project/pages/index.md) the feature.
+
+## List pages domains
+
+Get a list of project pages domains. The user must have permissions to view pages domains.
+
+```http
+GET /projects/:id/pages/domains
+```
+
+| Attribute | Type           | Required | Description                              |
+| --------- | -------------- | -------- | ---------------------------------------- |
+| `id`      | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
+
+```bash
+curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/5/pages/domains
+```
+
+```json
+[
+  {
+    "domain": "www.domain.example",
+    "url": "http://www.domain.example"
+  },
+  {
+    "domain": "ssl.domain.example",
+    "url": "https://ssl.domain.example",
+    "certificate": {
+      "subject": "/O=Example, Inc./OU=Example Origin CA/CN=Example Origin Certificate",
+      "expired": false,
+      "certificate": "-----BEGIN CERTIFICATE-----\n … \n-----END CERTIFICATE-----",
+      "certificate_text": "Certificate:\n … \n"
+    }
+  }
+]
+```
+
+## Single pages domain
+
+Get a single project pages domain. The user must have permissions to view pages domains.
+
+```http
+GET /projects/:id/pages/domains/:domain
+```
+
+| Attribute | Type           | Required | Description                              |
+| --------- | -------------- | -------- | ---------------------------------------- |
+| `id`      | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
+| `domain`  | string         | yes      | The domain                               |
+
+```bash
+curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/5/pages/domains/www.domain.example
+```
+
+```json
+{
+  "domain": "www.domain.example",
+  "url": "http://www.domain.example"
+}
+```
+
+```bash
+curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/5/pages/domains/ssl.domain.example
+```
+
+```json
+{
+  "domain": "ssl.domain.example",
+  "url": "https://ssl.domain.example",
+  "certificate": {
+    "subject": "/O=Example, Inc./OU=Example Origin CA/CN=Example Origin Certificate",
+    "expired": false,
+    "certificate": "-----BEGIN CERTIFICATE-----\n … \n-----END CERTIFICATE-----",
+    "certificate_text": "Certificate:\n … \n"
+  }
+}
+```
+
+## Create new pages domain
+
+Creates a new pages domain. The user must have permissions to create new pages domains.
+
+```http
+POST /projects/:id/pages/domains
+```
+
+| Attribute     | Type           | Required | Description                              |
+| ------------- | -------------- | -------- | ---------------------------------------- |
+| `id`          | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
+| `domain`      | string         | yes      | The domain                               |
+| `certificate` | file/string    | no       | The certificate in PEM format with intermediates following in most specific to least specific order.|
+| `key`         | file/string    | no       | The certificate key in PEM format.       |
+
+```bash
+curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form="domain=ssl.domain.example" --form="certificate=@/path/to/cert.pem" --form="key=@/path/to/key.pem" https://gitlab.example.com/api/v4/projects/5/pages/domains
+```
+
+```bash
+curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form="domain=ssl.domain.example" --form="certificate=$CERT_PEM" --form="key=$KEY_PEM" https://gitlab.example.com/api/v4/projects/5/pages/domains
+```
+
+```json
+{
+  "domain": "ssl.domain.example",
+  "url": "https://ssl.domain.example",
+  "certificate": {
+    "subject": "/O=Example, Inc./OU=Example Origin CA/CN=Example Origin Certificate",
+    "expired": false,
+    "certificate": "-----BEGIN CERTIFICATE-----\n … \n-----END CERTIFICATE-----",
+    "certificate_text": "Certificate:\n … \n"
+  }
+}
+```
+
+## Update pages domain
+
+Updates an existing project pages domain. The user must have permissions to change an existing pages domains.
+
+```http
+PUT /projects/:id/pages/domains/:domain
+```
+
+| Attribute     | Type           | Required | Description                              |
+| ------------- | -------------- | -------- | ---------------------------------------- |
+| `id`          | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
+| `domain`      | string         | yes      | The domain                               |
+| `certificate` | file/string    | no       | The certificate in PEM format with intermediates following in most specific to least specific order.|
+| `key`         | file/string    | no       | The certificate key in PEM format.       |
+
+```bash
+curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form="certificate=@/path/to/cert.pem" --form="key=@/path/to/key.pem" https://gitlab.example.com/api/v4/projects/5/pages/domains/ssl.domain.example
+```
+
+```bash
+curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form="certificate=$CERT_PEM" --form="key=$KEY_PEM" https://gitlab.example.com/api/v4/projects/5/pages/domains/ssl.domain.example
+```
+
+```json
+{
+  "domain": "ssl.domain.example",
+  "url": "https://ssl.domain.example",
+  "certificate": {
+    "subject": "/O=Example, Inc./OU=Example Origin CA/CN=Example Origin Certificate",
+    "expired": false,
+    "certificate": "-----BEGIN CERTIFICATE-----\n … \n-----END CERTIFICATE-----",
+    "certificate_text": "Certificate:\n … \n"
+  }
+}
+```
+
+## Delete pages domain
+
+Deletes an existing project pages domain.
+
+```http
+DELETE /projects/:id/pages/domains/:domain
+```
+
+| Attribute | Type           | Required | Description                              |
+| --------- | -------------- | -------- | ---------------------------------------- |
+| `id`      | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
+| `domain`  | string         | yes      | The domain                               |
+
+```bash
+curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/5/pages/domains/ssl.domain.example
+```
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 664f3ef7b77..4e24e4bbfc3 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -69,6 +69,8 @@ PUT /application/settings
 | `after_sign_up_text`                     | string           | no                                            | Text shown to the user after signing up                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `akismet_api_key`                        | string           | no                                            | API key for akismet spam protection                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | `akismet_enabled`                        | boolean          | no                                            | Enable or disable akismet spam protection                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| `circuitbreaker_access_retries           | integer          | no                                            | The number of attempts GitLab will make to access a storage.                                                                                                                                                                                                                                                                                                                                                                                              |
+| `circuitbreaker_backoff_threshold        | integer          | no                                            | The number of failures after which GitLab will start temporarily disabling access to a storage shard on a host.                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | `circuitbreaker_failure_count_threshold` | integer          | no                                            | The number of failures of after which GitLab will completely prevent access to the storage.                                                                                                                                                                                                                                                                                                                                                               |
 | `circuitbreaker_failure_reset_time`      | integer          | no                                            | Time in seconds GitLab will keep storage failure information. When no failures occur during this time, the failure information is reset.                                                                                                                                                                                                                                                                                                                  |
 | `circuitbreaker_failure_wait_time`       | integer          | no                                            | Time in seconds GitLab will block access to a failing storage to allow it to recover.                                                                                                                                                                                                                                                                                                                                                                     |
diff --git a/doc/integration/trello_power_up.md b/doc/integration/trello_power_up.md
index d264486a872..834d63d1166 100644
--- a/doc/integration/trello_power_up.md
+++ b/doc/integration/trello_power_up.md
@@ -39,4 +39,4 @@ Learn more about generating a personal access token in the
 [Personal Access Token Documentation][personal-access-token-documentation].
 Don't forget to check the API scope checkbox!
 
-[personal-access-token-documentation]: ../user/profile/personal_access_tokens.html
+[personal-access-token-documentation]: ../user/profile/personal_access_tokens.md
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 8da6e2a8207..e2b285678c3 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -4,7 +4,7 @@
 1. [From ClearCase](clearcase.md)
 1. [From CVS](cvs.md)
 1. [From FogBugz](fogbugz.md)
-1. [From GitHub.com of GitHub Enterprise](github.md)
+1. [From GitHub.com or GitHub Enterprise](github.md)
 1. [From GitLab.com](gitlab_com.md)
 1. [From Gitea](gitea.md)
 1. [From Perforce](perforce.md)
diff --git a/doc/user/project/pages/introduction.md b/doc/user/project/pages/introduction.md
index 4fcdfa7b281..3ab88948fbd 100644
--- a/doc/user/project/pages/introduction.md
+++ b/doc/user/project/pages/introduction.md
@@ -3,7 +3,7 @@
 > **Notes:**
 > - This feature was [introduced][ee-80] in GitLab EE 8.3.
 > - Custom CNAMEs with TLS support were [introduced][ee-173] in GitLab EE 8.5.
-> - GitLab Pages [were ported][ce-14605] to Community Edition in GitLab 8.17.
+> - GitLab Pages [was ported][ce-14605] to Community Edition in GitLab 8.17.
 > - This document is about the user guide. To learn how to enable GitLab Pages
 >   across your GitLab instance, visit the [administrator documentation](../../../administration/pages/index.md).
 
@@ -174,7 +174,7 @@ job, the contents of the `public` directory will be served by GitLab Pages.
 
 #### How `.gitlab-ci.yml` looks like when the static content is in your repository
 
-Supposedly your repository contained the following files:
+Supposed your repository contained the following files:
 
 ```
 ├── index.html
@@ -419,7 +419,7 @@ You can only create the highest level group website.
 ## Redirects in GitLab Pages
 
 Since you cannot use any custom server configuration files, like `.htaccess` or
-any `.conf` file for that matter, if you want to redirect a web page to another
+any `.conf` file, if you want to redirect a page to another
 location, you can use the [HTTP meta refresh tag][metarefresh].
 
 Some static site generators provide plugins for that functionality so that you
@@ -434,7 +434,7 @@ Sure. All you need to do is download the artifacts archive from the job page.
 
 ### Can I use GitLab Pages if my project is private?
 
-Yes. GitLab Pages don't care whether you set your project's visibility level
+Yes. GitLab Pages doesn't care whether you set your project's visibility level
 to private, internal or public.
 
 ### Do I need to create a user/group website before creating a project website?
diff --git a/doc/user/project/repository/branches/index.md b/doc/user/project/repository/branches/index.md
index e1d3aebb8b3..26c55891b3c 100644
--- a/doc/user/project/repository/branches/index.md
+++ b/doc/user/project/repository/branches/index.md
@@ -37,7 +37,7 @@ This feature allows merged branches to be deleted in bulk. Only branches that
 have been merged and [are not protected][protected] will be deleted as part of
 this operation.
 
-It's particularly useful to clean up old branches that were not deleting
+It's particularly useful to clean up old branches that were not deleted
 automatically when a merge request was merged.
 
 [ce-6449]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6449 "Add button to delete all merged branches"
diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md
index d47a3acdbe9..db0c3ed9d59 100644
--- a/doc/user/project/repository/web_editor.md
+++ b/doc/user/project/repository/web_editor.md
@@ -105,7 +105,7 @@ merge request.
 
 Once you click it, a new branch will be created that diverges from the default
 branch of your project, by default `master`. The branch name will be based on
-the title of the issue and as suffix it will have its ID. Thus, the example
+the title of the issue and as a prefix, it will have its internal ID. Thus, the example
 screenshot above will yield a branch named
 `2-et-cum-et-sed-expedita-repellat-consequatur-ut-assumenda-numquam-rerum`.
 
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 99fcc59ba04..7db18e25a5f 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -131,6 +131,7 @@ module API
     mount ::API::Namespaces
     mount ::API::Notes
     mount ::API::NotificationSettings
+    mount ::API::PagesDomains
     mount ::API::Pipelines
     mount ::API::PipelineSchedules
     mount ::API::ProjectHooks
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5f0bad14839..efe874b2e6b 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1043,5 +1043,22 @@ module API
       expose :key
       expose :value
     end
+
+    class PagesDomainCertificate < Grape::Entity
+      expose :subject
+      expose :expired?, as: :expired
+      expose :certificate
+      expose :certificate_text
+    end
+
+    class PagesDomain < Grape::Entity
+      expose :domain
+      expose :url
+      expose :certificate,
+             if: ->(pages_domain, _) { pages_domain.certificate? },
+             using: PagesDomainCertificate do |pages_domain|
+        pages_domain
+      end
+    end
   end
 end
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 2b316b58ed9..7a2ec865860 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -184,6 +184,10 @@ module API
       end
     end
 
+    def require_pages_enabled!
+      not_found! unless user_project.pages_available?
+    end
+
     def can?(object, action, subject = :global)
       Ability.allowed?(object, action, subject)
     end
diff --git a/lib/api/pages_domains.rb b/lib/api/pages_domains.rb
new file mode 100644
index 00000000000..259f3f34068
--- /dev/null
+++ b/lib/api/pages_domains.rb
@@ -0,0 +1,117 @@
+module API
+  class PagesDomains < Grape::API
+    include PaginationParams
+
+    before do
+      authenticate!
+      require_pages_enabled!
+    end
+
+    after_validation do
+      normalize_params_file_to_string
+    end
+
+    helpers do
+      def find_pages_domain!
+        user_project.pages_domains.find_by(domain: params[:domain]) || not_found!('PagesDomain')
+      end
+
+      def pages_domain
+        @pages_domain ||= find_pages_domain!
+      end
+
+      def normalize_params_file_to_string
+        params.each do |k, v|
+          if v.is_a?(Hash) && v.key?(:tempfile)
+            params[k] = v[:tempfile].to_a.join('')
+          end
+        end
+      end
+    end
+
+    params do
+      requires :id, type: String, desc: 'The ID of a project'
+    end
+    resource :projects, requirements: { id: %r{[^/]+} } do
+      desc 'Get all pages domains' do
+        success Entities::PagesDomain
+      end
+      params do
+        use :pagination
+      end
+      get ":id/pages/domains" do
+        authorize! :read_pages, user_project
+
+        present paginate(user_project.pages_domains.order(:domain)), with: Entities::PagesDomain
+      end
+
+      desc 'Get a single pages domain' do
+        success Entities::PagesDomain
+      end
+      params do
+        requires :domain, type: String, desc: 'The domain'
+      end
+      get ":id/pages/domains/:domain", requirements: { domain: %r{[^/]+} } do
+        authorize! :read_pages, user_project
+
+        present pages_domain, with: Entities::PagesDomain
+      end
+
+      desc 'Create a new pages domain' do
+        success Entities::PagesDomain
+      end
+      params do
+        requires :domain, type: String, desc: 'The domain'
+        optional :certificate, allow_blank: false, types: [File, String], desc: 'The certificate'
+        optional :key, allow_blank: false, types: [File, String], desc: 'The key'
+        all_or_none_of :certificate, :key
+      end
+      post ":id/pages/domains" do
+        authorize! :update_pages, user_project
+
+        pages_domain_params = declared(params, include_parent_namespaces: false)
+        pages_domain = user_project.pages_domains.create(pages_domain_params)
+
+        if pages_domain.persisted?
+          present pages_domain, with: Entities::PagesDomain
+        else
+          render_validation_error!(pages_domain)
+        end
+      end
+
+      desc 'Updates a pages domain'
+      params do
+        requires :domain, type: String, desc: 'The domain'
+        optional :certificate, allow_blank: false, types: [File, String], desc: 'The certificate'
+        optional :key, allow_blank: false, types: [File, String], desc: 'The key'
+      end
+      put ":id/pages/domains/:domain", requirements: { domain: %r{[^/]+} } do
+        authorize! :update_pages, user_project
+
+        pages_domain_params = declared(params, include_parent_namespaces: false)
+
+        # Remove empty private key if certificate is not empty.
+        if pages_domain_params[:certificate] && !pages_domain_params[:key]
+          pages_domain_params.delete(:key)
+        end
+
+        if pages_domain.update(pages_domain_params)
+          present pages_domain, with: Entities::PagesDomain
+        else
+          render_validation_error!(pages_domain)
+        end
+      end
+
+      desc 'Delete a pages domain'
+      params do
+        requires :domain, type: String, desc: 'The domain'
+      end
+      delete ":id/pages/domains/:domain", requirements: { domain: %r{[^/]+} } do
+        authorize! :update_pages, user_project
+
+        status 204
+        pages_domain.destroy
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/git/storage.rb b/lib/gitlab/git/storage.rb
index 08e6c29abad..99518c9b1e4 100644
--- a/lib/gitlab/git/storage.rb
+++ b/lib/gitlab/git/storage.rb
@@ -12,6 +12,7 @@ module Gitlab
 
       CircuitOpen = Class.new(Inaccessible)
       Misconfiguration = Class.new(Inaccessible)
+      Failing = Class.new(Inaccessible)
 
       REDIS_KEY_PREFIX = 'storage_accessible:'.freeze
 
diff --git a/lib/gitlab/git/storage/circuit_breaker.rb b/lib/gitlab/git/storage/circuit_breaker.rb
index 0456ad9a1f3..be7598ef011 100644
--- a/lib/gitlab/git/storage/circuit_breaker.rb
+++ b/lib/gitlab/git/storage/circuit_breaker.rb
@@ -54,7 +54,7 @@ module Gitlab
         end
 
         def perform
-          return yield unless Feature.enabled?('git_storage_circuit_breaker')
+          return yield unless enabled?
 
           check_storage_accessible!
 
@@ -64,10 +64,27 @@ module Gitlab
         def circuit_broken?
           return false if no_failures?
 
+          failure_count > failure_count_threshold
+        end
+
+        def backing_off?
+          return false if no_failures?
+
           recent_failure = last_failure > failure_wait_time.seconds.ago
-          too_many_failures = failure_count > failure_count_threshold
+          too_many_failures = failure_count > backoff_threshold
 
-          recent_failure || too_many_failures
+          recent_failure && too_many_failures
+        end
+
+        private
+
+        # The circuitbreaker can be enabled for the entire fleet using a Feature
+        # flag.
+        #
+        # Enabling it for a single host can be done setting the
+        # `GIT_STORAGE_CIRCUIT_BREAKER` environment variable.
+        def enabled?
+          ENV['GIT_STORAGE_CIRCUIT_BREAKER'].present? || Feature.enabled?('git_storage_circuit_breaker')
         end
 
         def failure_info
@@ -83,7 +100,7 @@ module Gitlab
           return @storage_available if @storage_available
 
           if @storage_available = Gitlab::Git::Storage::ForkedStorageCheck
-                                    .storage_available?(storage_path, storage_timeout)
+                                    .storage_available?(storage_path, storage_timeout, access_retries)
             track_storage_accessible
           else
             track_storage_inaccessible
@@ -94,7 +111,11 @@ module Gitlab
 
         def check_storage_accessible!
           if circuit_broken?
-            raise Gitlab::Git::Storage::CircuitOpen.new("Circuit for #{storage} is broken", failure_wait_time)
+            raise Gitlab::Git::Storage::CircuitOpen.new("Circuit for #{storage} is broken", failure_reset_time)
+          end
+
+          if backing_off?
+            raise Gitlab::Git::Storage::Failing.new("Backing off access to #{storage}", failure_wait_time)
           end
 
           unless storage_available?
@@ -131,12 +152,6 @@ module Gitlab
           end
         end
 
-        def cache_key
-          @cache_key ||= "#{Gitlab::Git::Storage::REDIS_KEY_PREFIX}#{storage}:#{hostname}"
-        end
-
-        private
-
         def get_failure_info
           last_failure, failure_count = Gitlab::Git::Storage.redis.with do |redis|
             redis.hmget(cache_key, :last_failure, :failure_count)
@@ -146,6 +161,10 @@ module Gitlab
 
           FailureInfo.new(last_failure, failure_count.to_i)
         end
+
+        def cache_key
+          @cache_key ||= "#{Gitlab::Git::Storage::REDIS_KEY_PREFIX}#{storage}:#{hostname}"
+        end
       end
     end
   end
diff --git a/lib/gitlab/git/storage/circuit_breaker_settings.rb b/lib/gitlab/git/storage/circuit_breaker_settings.rb
index d2313fe7c1b..257fe8cd8f0 100644
--- a/lib/gitlab/git/storage/circuit_breaker_settings.rb
+++ b/lib/gitlab/git/storage/circuit_breaker_settings.rb
@@ -18,6 +18,14 @@ module Gitlab
           application_settings.circuitbreaker_storage_timeout
         end
 
+        def access_retries
+          application_settings.circuitbreaker_access_retries
+        end
+
+        def backoff_threshold
+          application_settings.circuitbreaker_backoff_threshold
+        end
+
         private
 
         def application_settings
diff --git a/lib/gitlab/git/storage/forked_storage_check.rb b/lib/gitlab/git/storage/forked_storage_check.rb
index 91d8241f17b..1307f400700 100644
--- a/lib/gitlab/git/storage/forked_storage_check.rb
+++ b/lib/gitlab/git/storage/forked_storage_check.rb
@@ -4,8 +4,17 @@ module Gitlab
       module ForkedStorageCheck
         extend self
 
-        def storage_available?(path, timeout_seconds = 5)
-          status = timeout_check(path, timeout_seconds)
+        def storage_available?(path, timeout_seconds = 5, retries = 1)
+          partial_timeout = timeout_seconds / retries
+          status = timeout_check(path, partial_timeout)
+
+          # If the status check did not succeed the first time, we retry a few
+          # more times to avoid one-off failures
+          current_attempts = 1
+          while current_attempts < retries && !status.success?
+            status = timeout_check(path, partial_timeout)
+            current_attempts += 1
+          end
 
           status.success?
         end
diff --git a/lib/gitlab/git/storage/null_circuit_breaker.rb b/lib/gitlab/git/storage/null_circuit_breaker.rb
index 60c6791a7e4..a12d52d295f 100644
--- a/lib/gitlab/git/storage/null_circuit_breaker.rb
+++ b/lib/gitlab/git/storage/null_circuit_breaker.rb
@@ -25,6 +25,10 @@ module Gitlab
           !!@error
         end
 
+        def backing_off?
+          false
+        end
+
         def last_failure
           circuit_broken? ? Time.now : nil
         end
diff --git a/lib/gitlab/git/user.rb b/lib/gitlab/git/user.rb
index da74719ae87..e6b61417de1 100644
--- a/lib/gitlab/git/user.rb
+++ b/lib/gitlab/git/user.rb
@@ -7,9 +7,8 @@ module Gitlab
         new(gitlab_user.username, gitlab_user.name, gitlab_user.email, Gitlab::GlId.gl_id(gitlab_user))
       end
 
-      # TODO support the username field in Gitaly https://gitlab.com/gitlab-org/gitaly/issues/628
       def self.from_gitaly(gitaly_user)
-        new('', gitaly_user.name, gitaly_user.email, gitaly_user.gl_id)
+        new(gitaly_user.gl_username, gitaly_user.name, gitaly_user.email, gitaly_user.gl_id)
       end
 
       def initialize(username, name, email, gl_id)
@@ -22,6 +21,10 @@ module Gitlab
       def ==(other)
         [username, name, email, gl_id] == [other.username, other.name, other.email, other.gl_id]
       end
+
+      def to_gitaly
+        Gitaly::User.new(gl_username: username, gl_id: gl_id, name: name, email: email)
+      end
     end
   end
 end
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb
index 91f34011f6e..adaf255f24b 100644
--- a/lib/gitlab/gitaly_client/operation_service.rb
+++ b/lib/gitlab/gitaly_client/operation_service.rb
@@ -10,7 +10,7 @@ module Gitlab
         request = Gitaly::UserDeleteTagRequest.new(
           repository: @gitaly_repo,
           tag_name: GitalyClient.encode(tag_name),
-          user: Util.gitaly_user(user)
+          user: Gitlab::Git::User.from_gitlab(user).to_gitaly
         )
 
         response = GitalyClient.call(@repository.storage, :operation_service, :user_delete_tag, request)
@@ -23,7 +23,7 @@ module Gitlab
       def add_tag(tag_name, user, target, message)
         request = Gitaly::UserCreateTagRequest.new(
           repository: @gitaly_repo,
-          user: Util.gitaly_user(user),
+          user: Gitlab::Git::User.from_gitlab(user).to_gitaly,
           tag_name: GitalyClient.encode(tag_name),
           target_revision: GitalyClient.encode(target),
           message: GitalyClient.encode(message.to_s)
@@ -45,7 +45,7 @@ module Gitlab
         request = Gitaly::UserCreateBranchRequest.new(
           repository: @gitaly_repo,
           branch_name: GitalyClient.encode(branch_name),
-          user: Util.gitaly_user(user),
+          user: Gitlab::Git::User.from_gitlab(user).to_gitaly,
           start_point: GitalyClient.encode(start_point)
         )
         response = GitalyClient.call(@repository.storage, :operation_service,
@@ -65,7 +65,7 @@ module Gitlab
         request = Gitaly::UserDeleteBranchRequest.new(
           repository: @gitaly_repo,
           branch_name: GitalyClient.encode(branch_name),
-          user: Util.gitaly_user(user)
+          user: Gitlab::Git::User.from_gitlab(user).to_gitaly
         )
 
         response = GitalyClient.call(@repository.storage, :operation_service, :user_delete_branch, request)
@@ -87,7 +87,7 @@ module Gitlab
         request_enum.push(
           Gitaly::UserMergeBranchRequest.new(
             repository: @gitaly_repo,
-            user: Util.gitaly_user(user),
+            user: Gitlab::Git::User.from_gitlab(user).to_gitaly,
             commit_id: source_sha,
             branch: GitalyClient.encode(target_branch),
             message: GitalyClient.encode(message)
diff --git a/lib/gitlab/gitaly_client/util.rb b/lib/gitlab/gitaly_client/util.rb
index a1222a7e718..b1a033280b4 100644
--- a/lib/gitlab/gitaly_client/util.rb
+++ b/lib/gitlab/gitaly_client/util.rb
@@ -18,16 +18,6 @@ module Gitlab
           )
         end
 
-        def gitaly_user(gitlab_user)
-          return unless gitlab_user
-
-          Gitaly::User.new(
-            gl_id: Gitlab::GlId.gl_id(gitlab_user),
-            name: GitalyClient.encode(gitlab_user.name),
-            email: GitalyClient.encode(gitlab_user.email)
-          )
-        end
-
         def gitlab_tag_from_gitaly_tag(repository, gitaly_tag)
           if gitaly_tag.target_commit.present?
             commit = Gitlab::Git::Commit.decorate(repository, gitaly_tag.target_commit)
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
index 6bffd410ed0..a42e312b5d3 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
@@ -13,7 +13,7 @@ module Gitlab
     end
 
     def self.read_latest
-      path = Rails.root.join("log", file_name)
+      path = self.full_log_path
 
       return [] unless File.readable?(path)
 
@@ -22,7 +22,15 @@ module Gitlab
     end
 
     def self.build
-      new(Rails.root.join("log", file_name))
+      RequestStore[self.cache_key] ||= new(self.full_log_path)
+    end
+
+    def self.full_log_path
+      Rails.root.join("log", file_name)
+    end
+
+    def self.cache_key
+      'logger:'.freeze + self.full_log_path.to_s
     end
   end
 end
diff --git a/lib/gitlab/performance_bar/peek_query_tracker.rb b/lib/gitlab/performance_bar/peek_query_tracker.rb
index 67fee8c227d..69e117f1da9 100644
--- a/lib/gitlab/performance_bar/peek_query_tracker.rb
+++ b/lib/gitlab/performance_bar/peek_query_tracker.rb
@@ -36,8 +36,8 @@ module Gitlab
       end
 
       def track_query(raw_query, bindings, start, finish)
-        query = Gitlab::Sherlock::Query.new(raw_query, start, finish)
-        query_info = { duration: query.duration.round(3), sql: query.formatted_query }
+        duration = finish - start
+        query_info = { duration: duration.round(3), sql: raw_query }
 
         PEEK_DB_CLIENT.query_details << query_info
       end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 1f356a231b0..08f6212d997 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 17:50+0200\n"
-"PO-Revision-Date: 2017-10-10 17:50+0200\n"
+"POT-Creation-Date: 2017-10-22 16:40+0300\n"
+"PO-Revision-Date: 2017-10-22 16:40+0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -106,6 +106,12 @@ msgstr ""
 msgid "Add new directory"
 msgstr ""
 
+msgid "AdminHealthPageLink|health page"
+msgstr ""
+
+msgid "Advanced settings"
+msgstr ""
+
 msgid "All"
 msgstr ""
 
@@ -127,6 +133,9 @@ msgstr ""
 msgid "Are you sure you want to discard your changes?"
 msgstr ""
 
+msgid "Are you sure you want to leave this group?"
+msgstr ""
+
 msgid "Are you sure you want to reset registration token?"
 msgstr ""
 
@@ -160,18 +169,21 @@ msgstr ""
 msgid "AutoDevOps|Auto DevOps (Beta)"
 msgstr ""
 
-msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration."
-msgstr ""
-
 msgid "AutoDevOps|Auto DevOps documentation"
 msgstr ""
 
 msgid "AutoDevOps|Enable in settings"
 msgstr ""
 
+msgid "AutoDevOps|It will automatically build, test, and deploy your application based on a predefined CI/CD configuration."
+msgstr ""
+
 msgid "AutoDevOps|Learn more in the %{link_to_documentation}"
 msgstr ""
 
+msgid "AutoDevOps|You can activate %{link_to_settings} for this project."
+msgstr ""
+
 msgid "Branch"
 msgid_plural "Branches"
 msgstr[0] ""
@@ -180,6 +192,9 @@ msgstr[1] ""
 msgid "Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}"
 msgstr ""
 
+msgid "Branch has changed"
+msgstr ""
+
 msgid "BranchSwitcherPlaceholder|Search branches"
 msgstr ""
 
@@ -375,6 +390,9 @@ msgstr ""
 msgid "CiStatus|running"
 msgstr ""
 
+msgid "CircuitBreakerApiLink|circuitbreaker api"
+msgstr ""
+
 msgid "Clone repository"
 msgstr ""
 
@@ -384,6 +402,9 @@ msgstr ""
 msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account"
 msgstr ""
 
+msgid "ClusterIntegration|Cluster details"
+msgstr ""
+
 msgid "ClusterIntegration|Cluster integration"
 msgstr ""
 
@@ -435,6 +456,9 @@ msgstr ""
 msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters"
 msgstr ""
 
+msgid "ClusterIntegration|Manage Cluster integration on your GitLab project"
+msgstr ""
+
 msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}"
 msgstr ""
 
@@ -459,7 +483,7 @@ msgstr ""
 msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project."
 msgstr ""
 
-msgid "ClusterIntegration|Save"
+msgid "ClusterIntegration|See and edit the details for your cluster"
 msgstr ""
 
 msgid "ClusterIntegration|See machine types"
@@ -614,6 +638,9 @@ msgstr ""
 msgid "Create merge request"
 msgstr ""
 
+msgid "Create new branch"
+msgstr ""
+
 msgid "Create new..."
 msgstr ""
 
@@ -1021,6 +1048,9 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
+msgid "Maximum git storage failures"
+msgstr ""
+
 msgid "Median"
 msgstr ""
 
@@ -1347,6 +1377,9 @@ msgstr ""
 msgid "Profiles|your account"
 msgstr ""
 
+msgid "Project '%{project_name}' is in the process of being deleted."
+msgstr ""
+
 msgid "Project '%{project_name}' queued for deletion."
 msgstr ""
 
@@ -1356,9 +1389,6 @@ msgstr ""
 msgid "Project '%{project_name}' was successfully updated."
 msgstr ""
 
-msgid "Project '%{project_name}' will be deleted."
-msgstr ""
-
 msgid "Project access must be granted explicitly to each user."
 msgstr ""
 
@@ -1494,6 +1524,9 @@ msgstr ""
 msgid "SSH Keys"
 msgstr ""
 
+msgid "Save"
+msgstr ""
+
 msgid "Save changes"
 msgstr ""
 
@@ -1512,6 +1545,15 @@ msgstr ""
 msgid "Search branches and tags"
 msgstr ""
 
+msgid "Seconds before reseting failure information"
+msgstr ""
+
+msgid "Seconds to wait after a storage failure"
+msgstr ""
+
+msgid "Seconds to wait for a storage access attempt"
+msgstr ""
+
 msgid "Select Archive Format"
 msgstr ""
 
@@ -1714,6 +1756,9 @@ msgstr ""
 msgid "The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage."
 msgstr ""
 
+msgid "The number of failures of after which GitLab will completely prevent access to the storage. The number of failures can be reset in the admin interface: %{link_to_health_page} or using the %{api_documentation_link}."
+msgstr ""
+
 msgid "The phase of the development lifecycle."
 msgstr ""
 
@@ -1744,6 +1789,12 @@ msgstr ""
 msgid "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running."
 msgstr ""
 
+msgid "The time in seconds GitLab will keep failure information. When no failures occur during this time, information about the mount is reset."
+msgstr ""
+
+msgid "The time in seconds GitLab will try to access storage. After this time a timeout error will be raised."
+msgstr ""
+
 msgid "The time taken by each data entry gathered by that stage."
 msgstr ""
 
@@ -1753,6 +1804,9 @@ msgstr ""
 msgid "There are problems accessing Git storage: "
 msgstr ""
 
+msgid "This branch has changed since you started editing. Would you like to create a new branch?"
+msgstr ""
+
 msgid "This is a confidential issue."
 msgstr ""
 
@@ -1976,6 +2030,9 @@ msgstr ""
 msgid "We don't have enough data to show this stage."
 msgstr ""
 
+msgid "When access to a storage fails. GitLab will prevent access to the storage for the time specified here. This allows the filesystem to recover. Repositories on failing shards are temporarly unavailable"
+msgstr ""
+
 msgid "Wiki"
 msgstr ""
 
diff --git a/qa/qa/page/group/show.rb b/qa/qa/page/group/show.rb
index 6987c1f8f85..8080deda675 100644
--- a/qa/qa/page/group/show.rb
+++ b/qa/qa/page/group/show.rb
@@ -2,10 +2,6 @@ module QA
   module Page
     module Group
       class Show < Page::Base
-        def go_to_subgroups
-          click_link 'Subgroups'
-        end
-
         def go_to_subgroup(name)
           click_link name
         end
@@ -15,11 +11,19 @@ module QA
         end
 
         def go_to_new_subgroup
-          click_on 'New Subgroup'
+          within '.new-project-subgroup' do
+            find('.dropdown-toggle').click
+            find("li[data-value='new-subgroup']").click
+          end
+          find("input[data-action='new-subgroup']").click
         end
 
         def go_to_new_project
-          click_on 'New Project'
+          within '.new-project-subgroup' do
+            find('.dropdown-toggle').click
+            find("li[data-value='new-project']").click
+          end
+          find("input[data-action='new-project']").click
         end
       end
     end
diff --git a/qa/qa/scenario/gitlab/project/create.rb b/qa/qa/scenario/gitlab/project/create.rb
index 7b614bfdd94..bb3b9e19c0f 100644
--- a/qa/qa/scenario/gitlab/project/create.rb
+++ b/qa/qa/scenario/gitlab/project/create.rb
@@ -15,8 +15,6 @@ module QA
             Scenario::Gitlab::Sandbox::Prepare.perform
 
             Page::Group::Show.perform do |page|
-              page.go_to_subgroups
-
               if page.has_subgroup?(Runtime::Namespace.name)
                 page.go_to_subgroup(Runtime::Namespace.name)
               else
diff --git a/spec/controllers/admin/hooks_controller_spec.rb b/spec/controllers/admin/hooks_controller_spec.rb
index 1d1070e90f4..e6ba596117a 100644
--- a/spec/controllers/admin/hooks_controller_spec.rb
+++ b/spec/controllers/admin/hooks_controller_spec.rb
@@ -20,7 +20,7 @@ describe Admin::HooksController do
 
       post :create, hook: hook_params
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(SystemHook.all.size).to eq(1)
       expect(SystemHook.first).to have_attributes(hook_params)
     end
diff --git a/spec/controllers/admin/impersonations_controller_spec.rb b/spec/controllers/admin/impersonations_controller_spec.rb
index 8f1f0ba89ff..944680b3f42 100644
--- a/spec/controllers/admin/impersonations_controller_spec.rb
+++ b/spec/controllers/admin/impersonations_controller_spec.rb
@@ -22,7 +22,7 @@ describe Admin::ImpersonationsController do
         it "responds with status 404" do
           delete :destroy
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
 
         it "doesn't sign us in" do
@@ -46,7 +46,7 @@ describe Admin::ImpersonationsController do
           it "responds with status 404" do
             delete :destroy
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
 
           it "doesn't sign us in as the impersonator" do
@@ -65,7 +65,7 @@ describe Admin::ImpersonationsController do
             it "responds with status 404" do
               delete :destroy
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
 
             it "doesn't sign us in as the impersonator" do
diff --git a/spec/controllers/admin/projects_controller_spec.rb b/spec/controllers/admin/projects_controller_spec.rb
index 373260b3978..d5a3c250f31 100644
--- a/spec/controllers/admin/projects_controller_spec.rb
+++ b/spec/controllers/admin/projects_controller_spec.rb
@@ -27,7 +27,7 @@ describe Admin::ProjectsController do
 
       get :index
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response.body).not_to match(pending_delete_project.name)
       expect(response.body).to match(project.name)
     end
diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index b5fe40d0510..312dbdd0624 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -11,7 +11,7 @@ describe Admin::RunnersController do
     it 'lists all runners' do
       get :index
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 
@@ -19,13 +19,13 @@ describe Admin::RunnersController do
     it 'shows a particular runner' do
       get :show, id: runner.id
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'shows 404 for unknown runner' do
       get :show, id: 0
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -39,7 +39,7 @@ describe Admin::RunnersController do
 
       runner.reload
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(runner.description).to eq(new_desc)
     end
   end
@@ -48,7 +48,7 @@ describe Admin::RunnersController do
     it 'destroys the runner' do
       delete :destroy, id: runner.id
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(Ci::Runner.find_by(id: runner.id)).to be_nil
     end
   end
@@ -63,7 +63,7 @@ describe Admin::RunnersController do
 
       runner.reload
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(runner.active).to eq(true)
     end
   end
@@ -78,7 +78,7 @@ describe Admin::RunnersController do
 
       runner.reload
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(runner.active).to eq(false)
     end
   end
diff --git a/spec/controllers/admin/services_controller_spec.rb b/spec/controllers/admin/services_controller_spec.rb
index 249bd948847..701211c2586 100644
--- a/spec/controllers/admin/services_controller_spec.rb
+++ b/spec/controllers/admin/services_controller_spec.rb
@@ -20,7 +20,7 @@ describe Admin::ServicesController do
         it 'successfully displays the template' do
           get :edit, id: service.id
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
@@ -46,7 +46,7 @@ describe Admin::ServicesController do
 
       put :update, id: service.id, service: { active: true }
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
     end
 
     it 'does not call the propagation worker when service is not active' do
@@ -54,7 +54,7 @@ describe Admin::ServicesController do
 
       put :update, id: service.id, service: { properties: {} }
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
     end
   end
 end
diff --git a/spec/controllers/admin/spam_logs_controller_spec.rb b/spec/controllers/admin/spam_logs_controller_spec.rb
index 585ca31389d..7a96ef6a5cc 100644
--- a/spec/controllers/admin/spam_logs_controller_spec.rb
+++ b/spec/controllers/admin/spam_logs_controller_spec.rb
@@ -14,7 +14,7 @@ describe Admin::SpamLogsController do
     it 'lists all spam logs' do
       get :index
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 
@@ -22,14 +22,14 @@ describe Admin::SpamLogsController do
     it 'removes only the spam log when removing log' do
       expect { delete :destroy, id: first_spam.id }.to change { SpamLog.count }.by(-1)
       expect(User.find(user.id)).to be_truthy
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'removes user and his spam logs when removing the user' do
       delete :destroy, id: first_spam.id, remove_user: true
 
       expect(flash[:notice]).to eq "User #{user.username} was successfully removed."
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(SpamLog.count).to eq(0)
       expect { User.find(user.id) }.to raise_error(ActiveRecord::RecordNotFound)
     end
@@ -42,7 +42,7 @@ describe Admin::SpamLogsController do
     it 'submits the log as ham' do
       post :mark_as_ham, id: first_spam.id
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(SpamLog.find(first_spam.id).submitted_as_ham).to be_truthy
     end
   end
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 25fe547ff37..f044a068938 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -19,7 +19,7 @@ describe Admin::UsersController do
     it 'deletes user and ghosts their contributions' do
       delete :destroy, id: user.username, format: :json
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(User.exists?(user.id)).to be_falsy
       expect(issue.reload.author).to be_ghost
     end
@@ -27,7 +27,7 @@ describe Admin::UsersController do
     it 'deletes the user and their contributions when hard delete is specified' do
       delete :destroy, id: user.username, hard_delete: true, format: :json
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(User.exists?(user.id)).to be_falsy
       expect(Issue.exists?(issue.id)).to be_falsy
     end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 0a3a0f7da18..6802b839eaa 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -61,7 +61,7 @@ describe ApplicationController do
       context "when the 'private_token' param is populated with the private token" do
         it "logs the user in" do
           get :index, private_token: user.private_token
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.body).to eq("authenticated")
         end
       end
@@ -70,7 +70,7 @@ describe ApplicationController do
         it "logs the user in" do
           @request.headers['PRIVATE-TOKEN'] = user.private_token
           get :index
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.body).to eq("authenticated")
         end
       end
@@ -95,7 +95,7 @@ describe ApplicationController do
       context "when the 'personal_access_token' param is populated with the personal access token" do
         it "logs the user in" do
           get :index, private_token: personal_access_token.token
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.body).to eq('authenticated')
         end
       end
@@ -104,7 +104,7 @@ describe ApplicationController do
         it "logs the user in" do
           @request.headers["PRIVATE-TOKEN"] = personal_access_token.token
           get :index
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.body).to eq('authenticated')
         end
       end
@@ -158,7 +158,7 @@ describe ApplicationController do
       it 'returns 200 response' do
         get :index, private_token: user.private_token, format: requested_format
 
-        expect(response).to have_http_status 200
+        expect(response).to have_gitlab_http_status 200
       end
     end
 
@@ -166,7 +166,7 @@ describe ApplicationController do
       it 'returns 404 response' do
         get :index, private_token: user.private_token
 
-        expect(response).to have_http_status 404
+        expect(response).to have_gitlab_http_status 404
       end
     end
   end
@@ -183,7 +183,7 @@ describe ApplicationController do
         context 'when the request format is atom' do
           it "logs the user in" do
             get :index, rss_token: user.rss_token, format: :atom
-            expect(response).to have_http_status 200
+            expect(response).to have_gitlab_http_status 200
             expect(response.body).to eq 'authenticated'
           end
         end
@@ -191,7 +191,7 @@ describe ApplicationController do
         context 'when the request format is not atom' do
           it "doesn't log the user in" do
             get :index, rss_token: user.rss_token
-            expect(response.status).not_to have_http_status 200
+            expect(response.status).not_to have_gitlab_http_status 200
             expect(response.body).not_to eq 'authenticated'
           end
         end
diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb
index be27bbb4283..73fff6eb5ca 100644
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
@@ -30,7 +30,7 @@ describe AutocompleteController do
           get(:users, project_id: 'unknown')
         end
 
-        it { expect(response).to have_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(404) }
       end
     end
 
@@ -59,7 +59,7 @@ describe AutocompleteController do
           get(:users, group_id: 'unknown')
         end
 
-        it { expect(response).to have_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(404) }
       end
     end
 
@@ -138,7 +138,7 @@ describe AutocompleteController do
           get(:users, project_id: project.id)
         end
 
-        it { expect(response).to have_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(404) }
       end
 
       describe 'GET #users with unknown project' do
@@ -146,7 +146,7 @@ describe AutocompleteController do
           get(:users, project_id: 'unknown')
         end
 
-        it { expect(response).to have_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(404) }
       end
 
       describe 'GET #users with inaccessible group' do
@@ -155,7 +155,7 @@ describe AutocompleteController do
           get(:users, group_id: user.namespace.id)
         end
 
-        it { expect(response).to have_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(404) }
       end
 
       describe 'GET #users with no project' do
diff --git a/spec/controllers/boards/issues_controller_spec.rb b/spec/controllers/boards/issues_controller_spec.rb
index 5163099cd98..44d504d5852 100644
--- a/spec/controllers/boards/issues_controller_spec.rb
+++ b/spec/controllers/boards/issues_controller_spec.rb
@@ -24,7 +24,7 @@ describe Boards::IssuesController do
       it 'returns a not found 404 response' do
         list_issues user: user, board: 999, list: list2
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -62,7 +62,7 @@ describe Boards::IssuesController do
         it 'returns a not found 404 response' do
           list_issues user: user, board: board, list: 999
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -93,7 +93,7 @@ describe Boards::IssuesController do
       it 'returns a forbidden 403 response' do
         list_issues user: user, board: board, list: list2
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -116,7 +116,7 @@ describe Boards::IssuesController do
       it 'returns a successful 200 response' do
         create_issue user: user, board: board, list: list1, title: 'New issue'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'returns the created issue' do
@@ -131,7 +131,7 @@ describe Boards::IssuesController do
         it 'returns an unprocessable entity 422 response' do
           create_issue user: user, board: board, list: list1, title: nil
 
-          expect(response).to have_http_status(422)
+          expect(response).to have_gitlab_http_status(422)
         end
       end
 
@@ -141,7 +141,7 @@ describe Boards::IssuesController do
 
           create_issue user: user, board: board, list: list, title: 'New issue'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -149,7 +149,7 @@ describe Boards::IssuesController do
         it 'returns a not found 404 response' do
           create_issue user: user, board: 999, list: list1, title: 'New issue'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -157,7 +157,7 @@ describe Boards::IssuesController do
         it 'returns a not found 404 response' do
           create_issue user: user, board: board, list: 999, title: 'New issue'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -166,7 +166,7 @@ describe Boards::IssuesController do
       it 'returns a forbidden 403 response' do
         create_issue user: guest, board: board, list: list1, title: 'New issue'
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -187,7 +187,7 @@ describe Boards::IssuesController do
       it 'returns a successful 200 response' do
         move user: user, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'moves issue to the desired list' do
@@ -201,19 +201,19 @@ describe Boards::IssuesController do
       it 'returns a unprocessable entity 422 response for invalid lists' do
         move user: user, board: board, issue: issue, from_list_id: nil, to_list_id: nil
 
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
 
       it 'returns a not found 404 response for invalid board id' do
         move user: user, board: 999, issue: issue, from_list_id: list1.id, to_list_id: list2.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a not found 404 response for invalid issue id' do
         move user: user, board: board, issue: double(id: 999), from_list_id: list1.id, to_list_id: list2.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -227,7 +227,7 @@ describe Boards::IssuesController do
       it 'returns a forbidden 403 response' do
         move user: guest, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
diff --git a/spec/controllers/boards/lists_controller_spec.rb b/spec/controllers/boards/lists_controller_spec.rb
index b11fce0fa58..a2b432af23a 100644
--- a/spec/controllers/boards/lists_controller_spec.rb
+++ b/spec/controllers/boards/lists_controller_spec.rb
@@ -15,7 +15,7 @@ describe Boards::ListsController do
     it 'returns a successful 200 response' do
       read_board_list user: user, board: board
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response.content_type).to eq 'application/json'
     end
 
@@ -39,7 +39,7 @@ describe Boards::ListsController do
       it 'returns a forbidden 403 response' do
         read_board_list user: user, board: board
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -60,7 +60,7 @@ describe Boards::ListsController do
       it 'returns a successful 200 response' do
         create_board_list user: user, board: board, label_id: label.id
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'returns the created list' do
@@ -75,7 +75,7 @@ describe Boards::ListsController do
         it 'returns a not found 404 response' do
           create_board_list user: user, board: board, label_id: nil
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -85,7 +85,7 @@ describe Boards::ListsController do
 
           create_board_list user: user, board: board, label_id: label.id
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -96,7 +96,7 @@ describe Boards::ListsController do
 
         create_board_list user: guest, board: board, label_id: label.id
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -119,7 +119,7 @@ describe Boards::ListsController do
       it 'returns a successful 200 response' do
         move user: user, board: board, list: planning, position: 1
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'moves the list to the desired position' do
@@ -133,7 +133,7 @@ describe Boards::ListsController do
       it 'returns an unprocessable entity 422 response' do
         move user: user, board: board, list: planning, position: 6
 
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
     end
 
@@ -141,7 +141,7 @@ describe Boards::ListsController do
       it 'returns a not found 404 response' do
         move user: user, board: board, list: 999, position: 1
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -149,7 +149,7 @@ describe Boards::ListsController do
       it 'returns a forbidden 403 response' do
         move user: guest, board: board, list: planning, position: 6
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -172,7 +172,7 @@ describe Boards::ListsController do
       it 'returns a successful 200 response' do
         remove_board_list user: user, board: board, list: planning
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'removes list from board' do
@@ -184,7 +184,7 @@ describe Boards::ListsController do
       it 'returns a not found 404 response' do
         remove_board_list user: user, board: board, list: 999
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -192,7 +192,7 @@ describe Boards::ListsController do
       it 'returns a forbidden 403 response' do
         remove_board_list user: guest, board: board, list: planning
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -212,7 +212,7 @@ describe Boards::ListsController do
       it 'returns a successful 200 response' do
         generate_default_lists user: user, board: board
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'returns the defaults lists' do
@@ -228,7 +228,7 @@ describe Boards::ListsController do
 
         generate_default_lists user: user, board: board
 
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
     end
 
@@ -236,7 +236,7 @@ describe Boards::ListsController do
       it 'returns a forbidden 403 response' do
         generate_default_lists user: guest, board: board
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
diff --git a/spec/controllers/dashboard/milestones_controller_spec.rb b/spec/controllers/dashboard/milestones_controller_spec.rb
index 2dcb67d50f4..2f3d7be9abe 100644
--- a/spec/controllers/dashboard/milestones_controller_spec.rb
+++ b/spec/controllers/dashboard/milestones_controller_spec.rb
@@ -32,7 +32,7 @@ describe Dashboard::MilestonesController do
     it 'shows milestone page' do
       view_milestone
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 end
diff --git a/spec/controllers/dashboard/todos_controller_spec.rb b/spec/controllers/dashboard/todos_controller_spec.rb
index 9df4ebf2fa0..d862e1447e3 100644
--- a/spec/controllers/dashboard/todos_controller_spec.rb
+++ b/spec/controllers/dashboard/todos_controller_spec.rb
@@ -18,19 +18,19 @@ describe Dashboard::TodosController do
 
         get :index, project_id: unauthorized_project.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'renders 404 when given project does not exists' do
         get :index, project_id: 999
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'renders 200 when filtering for "any project" todos' do
         get :index, project_id: ''
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'renders 200 when user has access on given project' do
@@ -38,7 +38,7 @@ describe Dashboard::TodosController do
 
         get :index, project_id: authorized_project.id
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -61,7 +61,7 @@ describe Dashboard::TodosController do
         get :index, page: last_page
 
         expect(assigns(:todos).current_page).to eq(last_page)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'does not redirect to external sites when provided a host field' do
@@ -104,7 +104,7 @@ describe Dashboard::TodosController do
       patch :restore, id: todo.id
 
       expect(todo.reload).to be_pending
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ "count" => "1", "done_count" => "0" })
     end
   end
@@ -118,7 +118,7 @@ describe Dashboard::TodosController do
       todos.each do |todo|
         expect(todo.reload).to be_pending
       end
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'count' => '2', 'done_count' => '0' })
     end
   end
diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb
index cce53f6697c..9c6d584f59b 100644
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
@@ -8,7 +8,7 @@ describe Groups::GroupMembersController do
     it 'renders index with 200 status code' do
       get :index, group_id: group
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to render_template(:index)
     end
   end
@@ -30,7 +30,7 @@ describe Groups::GroupMembersController do
                       user_ids: group_user.id,
                       access_level: Gitlab::Access::GUEST
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
         expect(group.users).not_to include group_user
       end
     end
@@ -73,7 +73,7 @@ describe Groups::GroupMembersController do
       it 'returns 403' do
         delete :destroy, group_id: group, id: 42
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -86,7 +86,7 @@ describe Groups::GroupMembersController do
         it 'returns 403' do
           delete :destroy, group_id: group, id: member
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
           expect(group.members).to include member
         end
       end
@@ -123,7 +123,7 @@ describe Groups::GroupMembersController do
       it 'returns 404' do
         delete :leave, group_id: group
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -144,7 +144,7 @@ describe Groups::GroupMembersController do
         it 'supports json request' do
           delete :leave, group_id: group, format: :json
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['notice']).to eq "You left the \"#{group.name}\" group."
         end
       end
@@ -157,7 +157,7 @@ describe Groups::GroupMembersController do
         it 'cannot removes himself from the group' do
           delete :leave, group_id: group
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
@@ -204,7 +204,7 @@ describe Groups::GroupMembersController do
       it 'returns 403' do
         post :approve_access_request, group_id: group, id: 42
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -217,7 +217,7 @@ describe Groups::GroupMembersController do
         it 'returns 403' do
           post :approve_access_request, group_id: group, id: member
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
           expect(group.members).not_to include member
         end
       end
diff --git a/spec/controllers/groups/labels_controller_spec.rb b/spec/controllers/groups/labels_controller_spec.rb
index 899d8ebd12b..da54aa9054c 100644
--- a/spec/controllers/groups/labels_controller_spec.rb
+++ b/spec/controllers/groups/labels_controller_spec.rb
@@ -16,7 +16,7 @@ describe Groups::LabelsController do
 
       post :toggle_subscription, group_id: group.to_param, id: label.to_param
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 end
diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb
index fbbc67f3ae0..c1aba46be04 100644
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
@@ -35,7 +35,7 @@ describe Groups::MilestonesController do
     it 'shows group milestones page' do
       get :index, group_id: group.to_param
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     context 'as JSON' do
@@ -51,7 +51,7 @@ describe Groups::MilestonesController do
         expect(milestones.count).to eq(2)
         expect(milestones.first["title"]).to eq("group milestone")
         expect(milestones.second["title"]).to eq("legacy")
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response.content_type).to eq 'application/json'
       end
     end
@@ -153,7 +153,7 @@ describe Groups::MilestonesController do
             it 'does not redirect' do
               get :index, group_id: group.to_param
 
-              expect(response).not_to have_http_status(301)
+              expect(response).not_to have_gitlab_http_status(301)
             end
           end
 
@@ -172,7 +172,7 @@ describe Groups::MilestonesController do
             it 'does not redirect' do
               get :show, group_id: group.to_param, id: title
 
-              expect(response).not_to have_http_status(301)
+              expect(response).not_to have_gitlab_http_status(301)
             end
           end
 
@@ -242,7 +242,7 @@ describe Groups::MilestonesController do
              group_id: group.to_param,
              milestone: { title: title }
 
-        expect(response).not_to have_http_status(404)
+        expect(response).not_to have_gitlab_http_status(404)
       end
 
       it 'does not redirect to the correct casing' do
@@ -250,7 +250,7 @@ describe Groups::MilestonesController do
              group_id: group.to_param,
              milestone: { title: title }
 
-        expect(response).not_to have_http_status(301)
+        expect(response).not_to have_gitlab_http_status(301)
       end
     end
 
@@ -262,7 +262,7 @@ describe Groups::MilestonesController do
              group_id: redirect_route.path,
              milestone: { title: title }
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/groups/settings/ci_cd_controller_spec.rb b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
index 2e0efb57c74..e9f0924caba 100644
--- a/spec/controllers/groups/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
@@ -13,7 +13,7 @@ describe Groups::Settings::CiCdController do
     it 'renders show with 200 status code' do
       get :show, group_id: group
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to render_template(:show)
     end
   end
diff --git a/spec/controllers/groups/variables_controller_spec.rb b/spec/controllers/groups/variables_controller_spec.rb
index 02f2fa46047..8ea98cd9e8f 100644
--- a/spec/controllers/groups/variables_controller_spec.rb
+++ b/spec/controllers/groups/variables_controller_spec.rb
@@ -48,7 +48,7 @@ describe Groups::VariablesController do
         post :update, group_id: group,
                       id: variable.id, variable: { key: '?', value: variable.value }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to render_template :show
       end
     end
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 5036c1d2226..a9cfd964dd5 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -263,7 +263,7 @@ describe GroupsController do
     it 'updates the path successfully' do
       post :update, id: group.to_param, group: { path: 'new_path' }
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(controller).to set_flash[:notice]
     end
 
@@ -334,7 +334,7 @@ describe GroupsController do
               it 'does not redirect' do
                 get :issues, id: group.to_param
 
-                expect(response).not_to have_http_status(301)
+                expect(response).not_to have_gitlab_http_status(301)
               end
             end
 
@@ -353,7 +353,7 @@ describe GroupsController do
               it 'does not redirect' do
                 get :show, id: group.to_param
 
-                expect(response).not_to have_http_status(301)
+                expect(response).not_to have_gitlab_http_status(301)
               end
             end
 
@@ -420,13 +420,13 @@ describe GroupsController do
           it 'does not 404' do
             post :update, id: group.to_param.upcase, group: { path: 'new_path' }
 
-            expect(response).not_to have_http_status(404)
+            expect(response).not_to have_gitlab_http_status(404)
           end
 
           it 'does not redirect to the correct casing' do
             post :update, id: group.to_param.upcase, group: { path: 'new_path' }
 
-            expect(response).not_to have_http_status(301)
+            expect(response).not_to have_gitlab_http_status(301)
           end
         end
 
@@ -436,7 +436,7 @@ describe GroupsController do
           it 'returns not found' do
             post :update, id: redirect_route.path, group: { path: 'new_path' }
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -446,13 +446,13 @@ describe GroupsController do
           it 'does not 404' do
             delete :destroy, id: group.to_param.upcase
 
-            expect(response).not_to have_http_status(404)
+            expect(response).not_to have_gitlab_http_status(404)
           end
 
           it 'does not redirect to the correct casing' do
             delete :destroy, id: group.to_param.upcase
 
-            expect(response).not_to have_http_status(301)
+            expect(response).not_to have_gitlab_http_status(301)
           end
         end
 
@@ -462,7 +462,7 @@ describe GroupsController do
           it 'returns not found' do
             delete :destroy, id: redirect_route.path
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
diff --git a/spec/controllers/health_check_controller_spec.rb b/spec/controllers/health_check_controller_spec.rb
index 03da6287774..2cead1770c9 100644
--- a/spec/controllers/health_check_controller_spec.rb
+++ b/spec/controllers/health_check_controller_spec.rb
@@ -100,7 +100,7 @@ describe HealthCheckController do
       it 'supports failure plaintext response' do
         get :index
 
-        expect(response).to have_http_status(500)
+        expect(response).to have_gitlab_http_status(500)
         expect(response.content_type).to eq 'text/plain'
         expect(response.body).to include('The server is on fire')
       end
@@ -108,7 +108,7 @@ describe HealthCheckController do
       it 'supports failure json response' do
         get :index, format: :json
 
-        expect(response).to have_http_status(500)
+        expect(response).to have_gitlab_http_status(500)
         expect(response.content_type).to eq 'application/json'
         expect(json_response['healthy']).to be false
         expect(json_response['message']).to include('The server is on fire')
@@ -117,7 +117,7 @@ describe HealthCheckController do
       it 'supports failure xml response' do
         get :index, format: :xml
 
-        expect(response).to have_http_status(500)
+        expect(response).to have_gitlab_http_status(500)
         expect(response.content_type).to eq 'application/xml'
         expect(xml_response['healthy']).to be false
         expect(xml_response['message']).to include('The server is on fire')
@@ -126,7 +126,7 @@ describe HealthCheckController do
       it 'supports failure responses for specific checks' do
         get :index, checks: 'email', format: :json
 
-        expect(response).to have_http_status(500)
+        expect(response).to have_gitlab_http_status(500)
         expect(response.content_type).to eq 'application/json'
         expect(json_response['healthy']).to be false
         expect(json_response['message']).to include('Email is on fire')
diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb
index d3489324a9c..f75048f422c 100644
--- a/spec/controllers/help_controller_spec.rb
+++ b/spec/controllers/help_controller_spec.rb
@@ -100,7 +100,7 @@ describe HelpController do
     context 'for UI Development Kit' do
       it 'renders found' do
         get :ui
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
   end
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index e00403118a0..6c09ca7dc66 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -15,7 +15,7 @@ describe InvitesController do
       get :accept, id: token
       member.reload
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(member.user).to eq(user)
       expect(flash[:notice]).to include 'You have been granted'
     end
@@ -26,7 +26,7 @@ describe InvitesController do
       get :decline, id: token
       expect {member.reload}.to raise_error ActiveRecord::RecordNotFound
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(flash[:notice]).to include 'You have declined the invitation to join'
     end
   end
diff --git a/spec/controllers/notification_settings_controller_spec.rb b/spec/controllers/notification_settings_controller_spec.rb
index bef815ee1f7..9014b8b5084 100644
--- a/spec/controllers/notification_settings_controller_spec.rb
+++ b/spec/controllers/notification_settings_controller_spec.rb
@@ -110,7 +110,7 @@ describe NotificationSettingsController do
              project_id: private_project.id,
              notification_setting: { level: :participating }
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -172,7 +172,7 @@ describe NotificationSettingsController do
             id: notification_setting,
             notification_setting: { level: :participating }
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/oauth/applications_controller_spec.rb b/spec/controllers/oauth/applications_controller_spec.rb
index 552899eb36c..b38652e7ab9 100644
--- a/spec/controllers/oauth/applications_controller_spec.rb
+++ b/spec/controllers/oauth/applications_controller_spec.rb
@@ -12,7 +12,7 @@ describe Oauth::ApplicationsController do
       it 'shows list of applications' do
         get :index
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'redirects back to profile page if OAuth applications are disabled' do
@@ -21,7 +21,7 @@ describe Oauth::ApplicationsController do
 
         get :index
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
         expect(response).to redirect_to(profile_path)
       end
     end
diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb
index ac7f73c6e81..004b463e745 100644
--- a/spec/controllers/oauth/authorizations_controller_spec.rb
+++ b/spec/controllers/oauth/authorizations_controller_spec.rb
@@ -28,7 +28,7 @@ describe Oauth::AuthorizationsController do
       it 'returns 200 code and renders error view' do
         get :new
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to render_template('doorkeeper/authorizations/error')
       end
     end
@@ -37,7 +37,7 @@ describe Oauth::AuthorizationsController do
       it 'returns 200 code and renders view' do
         get :new, params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to render_template('doorkeeper/authorizations/new')
       end
 
@@ -48,7 +48,7 @@ describe Oauth::AuthorizationsController do
         get :new, params
 
         expect(request.session['user_return_to']).to be_nil
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
   end
diff --git a/spec/controllers/passwords_controller_spec.rb b/spec/controllers/passwords_controller_spec.rb
index cdaa88bbf5d..8778bff1190 100644
--- a/spec/controllers/passwords_controller_spec.rb
+++ b/spec/controllers/passwords_controller_spec.rb
@@ -12,7 +12,7 @@ describe PasswordsController do
 
         post :create
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
diff --git a/spec/controllers/profiles/accounts_controller_spec.rb b/spec/controllers/profiles/accounts_controller_spec.rb
index d387aba227b..f8d9d7e39ee 100644
--- a/spec/controllers/profiles/accounts_controller_spec.rb
+++ b/spec/controllers/profiles/accounts_controller_spec.rb
@@ -11,7 +11,7 @@ describe Profiles::AccountsController do
     it 'renders 404 if someone tries to unlink a non existent provider' do
       delete :unlink, provider: 'github'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     [:saml, :cas3].each do |provider|
@@ -23,7 +23,7 @@ describe Profiles::AccountsController do
 
           delete :unlink, provider: provider.to_s
 
-          expect(response).to have_http_status(302)
+          expect(response).to have_gitlab_http_status(302)
           expect(user.reload.identities).to include(identity)
         end
       end
@@ -38,7 +38,7 @@ describe Profiles::AccountsController do
 
           delete :unlink, provider: provider.to_s
 
-          expect(response).to have_http_status(302)
+          expect(response).to have_gitlab_http_status(302)
           expect(user.reload.identities).not_to include(identity)
         end
       end
diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb
index d0992719171..d1051741430 100644
--- a/spec/controllers/projects/artifacts_controller_spec.rb
+++ b/spec/controllers/projects/artifacts_controller_spec.rb
@@ -60,7 +60,7 @@ describe Projects::ArtifactsController do
         it 'renders the file view' do
           get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt'
 
-          expect(response).to have_http_status(302)
+          expect(response).to have_gitlab_http_status(302)
         end
       end
 
@@ -78,7 +78,7 @@ describe Projects::ArtifactsController do
         it 'renders the file view' do
           get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt'
 
-          expect(response).to have_http_status(:ok)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(response).to render_template('projects/artifacts/file')
         end
       end
@@ -106,7 +106,7 @@ describe Projects::ArtifactsController do
       it 'does not redirect the request' do
         get :file, namespace_id: private_project.namespace, project_id: private_project, job_id: job, path: 'ci_artifacts.txt'
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to render_template('projects/artifacts/file')
       end
     end
@@ -143,7 +143,7 @@ describe Projects::ArtifactsController do
 
     context 'cannot find the job' do
       shared_examples 'not found' do
-        it { expect(response).to have_http_status(:not_found) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
 
       context 'has no such ref' do
diff --git a/spec/controllers/projects/badges_controller_spec.rb b/spec/controllers/projects/badges_controller_spec.rb
index d68200164e4..e7cddf8cfbf 100644
--- a/spec/controllers/projects/badges_controller_spec.rb
+++ b/spec/controllers/projects/badges_controller_spec.rb
@@ -13,13 +13,13 @@ describe Projects::BadgesController do
   it 'requests the pipeline badge successfully' do
     get_badge(:pipeline)
 
-    expect(response).to have_http_status(:ok)
+    expect(response).to have_gitlab_http_status(:ok)
   end
 
   it 'requests the coverage badge successfully' do
     get_badge(:coverage)
 
-    expect(response).to have_http_status(:ok)
+    expect(response).to have_gitlab_http_status(:ok)
   end
 
   def get_badge(badge)
diff --git a/spec/controllers/projects/blame_controller_spec.rb b/spec/controllers/projects/blame_controller_spec.rb
index c086b386381..54282aa4001 100644
--- a/spec/controllers/projects/blame_controller_spec.rb
+++ b/spec/controllers/projects/blame_controller_spec.rb
@@ -28,7 +28,7 @@ describe Projects::BlameController do
 
     context "invalid file" do
       let(:id) { 'master/files/ruby/missing_file.rb'}
-      it { expect(response).to have_http_status(404) }
+      it { expect(response).to have_gitlab_http_status(404) }
     end
   end
 end
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb
index fb76b7fdf38..6a1c07b4a0b 100644
--- a/spec/controllers/projects/blob_controller_spec.rb
+++ b/spec/controllers/projects/blob_controller_spec.rb
@@ -153,7 +153,7 @@ describe Projects::BlobController do
       end
 
       it 'redirects to blob show' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -167,7 +167,7 @@ describe Projects::BlobController do
       end
 
       it 'redirects to blob show' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
   end
diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb
index 9e2e9a39481..84cde33d944 100644
--- a/spec/controllers/projects/boards_controller_spec.rb
+++ b/spec/controllers/projects/boards_controller_spec.rb
@@ -45,7 +45,7 @@ describe Projects::BoardsController do
       it 'returns a not found 404 response' do
         list_boards
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -85,7 +85,7 @@ describe Projects::BoardsController do
       it 'returns a not found 404 response' do
         read_board board: board
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -95,7 +95,7 @@ describe Projects::BoardsController do
 
         read_board board: another_board
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 3b3b63444c7..973d6fed288 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -128,7 +128,7 @@ describe Projects::BranchesController do
             issue_iid: issue.iid
 
           expect(response.location).to include(project_new_blob_path(project, branch))
-          expect(response).to have_http_status(302)
+          expect(response).to have_gitlab_http_status(302)
         end
       end
 
@@ -161,7 +161,7 @@ describe Projects::BranchesController do
       it 'returns a successful 200 response' do
         create_branch name: 'my-branch', ref: 'master'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'returns the created branch' do
@@ -175,7 +175,7 @@ describe Projects::BranchesController do
       it 'returns an unprocessable entity 422 response' do
         create_branch name: "<script>alert('merge');</script>", ref: "<script>alert('ref');</script>"
 
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
     end
 
@@ -202,7 +202,7 @@ describe Projects::BranchesController do
            namespace_id: project.namespace,
            project_id: project
 
-      expect(response).to have_http_status(303)
+      expect(response).to have_gitlab_http_status(303)
     end
   end
 
@@ -226,28 +226,28 @@ describe Projects::BranchesController do
       context "valid branch name, valid source" do
         let(:branch) { "feature" }
 
-        it { expect(response).to have_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(200) }
         it { expect(response.body).to be_blank }
       end
 
       context "valid branch name with unencoded slashes" do
         let(:branch) { "improve/awesome" }
 
-        it { expect(response).to have_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(200) }
         it { expect(response.body).to be_blank }
       end
 
       context "valid branch name with encoded slashes" do
         let(:branch) { "improve%2Fawesome" }
 
-        it { expect(response).to have_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(200) }
         it { expect(response.body).to be_blank }
       end
 
       context "invalid branch name, valid ref" do
         let(:branch) { "no-branch" }
 
-        it { expect(response).to have_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(404) }
         it { expect(response.body).to be_blank }
       end
     end
@@ -263,7 +263,7 @@ describe Projects::BranchesController do
           expect(json_response).to eql("message" => 'Branch was removed')
         end
 
-        it { expect(response).to have_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(200) }
       end
 
       context 'valid branch name with unencoded slashes' do
@@ -273,7 +273,7 @@ describe Projects::BranchesController do
           expect(json_response).to eql('message' => 'Branch was removed')
         end
 
-        it { expect(response).to have_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(200) }
       end
 
       context "valid branch name with encoded slashes" do
@@ -283,7 +283,7 @@ describe Projects::BranchesController do
           expect(json_response).to eql('message' => 'Branch was removed')
         end
 
-        it { expect(response).to have_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(200) }
       end
 
       context 'invalid branch name, valid ref' do
@@ -293,7 +293,7 @@ describe Projects::BranchesController do
           expect(json_response).to eql('message' => 'No such branch')
         end
 
-        it { expect(response).to have_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(404) }
       end
     end
 
@@ -341,7 +341,7 @@ describe Projects::BranchesController do
       it 'responds with status 404' do
         destroy_all_merged
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -379,7 +379,7 @@ describe Projects::BranchesController do
             project_id: project,
             format: :html
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
   end
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index 7985028d73b..bd924a1c7be 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -169,7 +169,7 @@ describe Projects::ClustersController do
     it "responds with matching schema" do
       subject
 
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(response).to match_response_schema('cluster_status')
     end
   end
@@ -189,14 +189,14 @@ describe Projects::ClustersController do
       it "allows to update cluster" do
         subject
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response.body).to include("Save")
       end
 
       it "allows remove integration" do
         subject
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response.body).to include("Remove integration")
       end
     end
@@ -207,7 +207,7 @@ describe Projects::ClustersController do
       it "does not allow to access page" do
         subject
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -251,7 +251,7 @@ describe Projects::ClustersController do
         it "rejects changes" do
           subject
 
-          expect(response).to have_http_status(:ok)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(response).to render_template(:show)
         end
       end
@@ -263,7 +263,7 @@ describe Projects::ClustersController do
       it "does not allow to update cluster" do
         subject
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -292,7 +292,7 @@ describe Projects::ClustersController do
       it "does not allow to destroy cluster" do
         subject
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index df53863482d..4612fc6e441 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -157,7 +157,7 @@ describe Projects::CommitController do
             id: commit.id)
 
         expect(response).not_to be_success
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -206,7 +206,7 @@ describe Projects::CommitController do
             id: master_pickable_commit.id)
 
         expect(response).not_to be_success
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -286,7 +286,7 @@ describe Projects::CommitController do
           end
 
           it 'returns a 404' do
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -298,7 +298,7 @@ describe Projects::CommitController do
         end
 
         it 'returns a 404' do
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -309,7 +309,7 @@ describe Projects::CommitController do
       end
 
       it 'returns a 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -356,7 +356,7 @@ describe Projects::CommitController do
       end
 
       it 'returns a 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/projects/compare_controller_spec.rb b/spec/controllers/projects/compare_controller_spec.rb
index b4f9fd9b7a2..fe5818da0bc 100644
--- a/spec/controllers/projects/compare_controller_spec.rb
+++ b/spec/controllers/projects/compare_controller_spec.rb
@@ -133,7 +133,7 @@ describe Projects::CompareController do
           end
 
           it 'returns a 404' do
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -145,7 +145,7 @@ describe Projects::CompareController do
         end
 
         it 'returns a 404' do
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -156,7 +156,7 @@ describe Projects::CompareController do
       end
 
       it 'returns a 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -166,7 +166,7 @@ describe Projects::CompareController do
       end
 
       it 'returns a 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb
index 3daff1eeea3..3164fd5c143 100644
--- a/spec/controllers/projects/deployments_controller_spec.rb
+++ b/spec/controllers/projects/deployments_controller_spec.rb
@@ -67,7 +67,7 @@ describe Projects::DeploymentsController do
 
         it 'returns a empty response 204 resposne' do
           get :metrics, deployment_params(id: deployment.id)
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
           expect(response.body).to eq('')
         end
       end
@@ -142,7 +142,7 @@ describe Projects::DeploymentsController do
 
         it 'returns a empty response 204 response' do
           get :additional_metrics, deployment_params(id: deployment.id, format: :json)
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
           expect(response.body).to eq('')
         end
       end
diff --git a/spec/controllers/projects/discussions_controller_spec.rb b/spec/controllers/projects/discussions_controller_spec.rb
index fe62898fa9b..3bf676637a2 100644
--- a/spec/controllers/projects/discussions_controller_spec.rb
+++ b/spec/controllers/projects/discussions_controller_spec.rb
@@ -25,7 +25,7 @@ describe Projects::DiscussionsController do
       it "returns status 404" do
         post :resolve, request_params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -42,7 +42,7 @@ describe Projects::DiscussionsController do
         it "returns status 404" do
           post :resolve, request_params
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -69,7 +69,7 @@ describe Projects::DiscussionsController do
         it "returns status 200" do
           post :resolve, request_params
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
@@ -86,7 +86,7 @@ describe Projects::DiscussionsController do
       it "returns status 404" do
         delete :unresolve, request_params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -103,7 +103,7 @@ describe Projects::DiscussionsController do
         it "returns status 404" do
           delete :unresolve, request_params
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -117,7 +117,7 @@ describe Projects::DiscussionsController do
         it "returns status 200" do
           delete :unresolve, request_params
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 5a95f4f6199..ff9ab53d8c3 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -19,7 +19,7 @@ describe Projects::EnvironmentsController do
       it 'responds with status code 200' do
         get :index, environment_params
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
 
@@ -59,7 +59,7 @@ describe Projects::EnvironmentsController do
         end
 
         it 'sets the polling interval header' do
-          expect(response).to have_http_status(:ok)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(response.headers['Poll-Interval']).to eq("3000")
         end
       end
@@ -137,7 +137,7 @@ describe Projects::EnvironmentsController do
         params[:id] = 12345
         get :show, params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -155,7 +155,7 @@ describe Projects::EnvironmentsController do
       patch_params = environment_params.merge(environment: { external_url: 'https://git.gitlab.com' })
       patch :update, patch_params
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
     end
   end
 
@@ -166,7 +166,7 @@ describe Projects::EnvironmentsController do
 
         patch :stop, environment_params(format: :json)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -179,7 +179,7 @@ describe Projects::EnvironmentsController do
 
         patch :stop, environment_params(format: :json)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to eq(
           { 'redirect_url' =>
               project_job_url(project, action) })
@@ -193,7 +193,7 @@ describe Projects::EnvironmentsController do
 
         patch :stop, environment_params(format: :json)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to eq(
           { 'redirect_url' =>
               project_environment_url(project, environment) })
@@ -206,7 +206,7 @@ describe Projects::EnvironmentsController do
       it 'responds with a status code 200' do
         get :terminal, environment_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'loads the terminals for the enviroment' do
@@ -220,7 +220,7 @@ describe Projects::EnvironmentsController do
       it 'responds with a status code 404' do
         get :terminal, environment_params(id: 666)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -244,7 +244,7 @@ describe Projects::EnvironmentsController do
 
           get :terminal_websocket_authorize, environment_params
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.headers["Content-Type"]).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
           expect(response.body).to eq('{"workhorse":"response"}')
         end
@@ -254,7 +254,7 @@ describe Projects::EnvironmentsController do
         it 'returns 404' do
           get :terminal_websocket_authorize, environment_params(id: 666)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -290,7 +290,7 @@ describe Projects::EnvironmentsController do
         it 'returns a metrics JSON document' do
           get :metrics, environment_params(format: :json)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
           expect(json_response).to eq({})
         end
       end
@@ -330,7 +330,7 @@ describe Projects::EnvironmentsController do
         it 'returns a metrics JSON document' do
           get :additional_metrics, environment_params(format: :json)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
           expect(json_response).to eq({})
         end
       end
diff --git a/spec/controllers/projects/forks_controller_spec.rb b/spec/controllers/projects/forks_controller_spec.rb
index dc8290c438e..1bedb8ebdff 100644
--- a/spec/controllers/projects/forks_controller_spec.rb
+++ b/spec/controllers/projects/forks_controller_spec.rb
@@ -89,7 +89,7 @@ describe Projects::ForksController do
 
         get_new
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -118,7 +118,7 @@ describe Projects::ForksController do
 
         post_create
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
         expect(response).to redirect_to(namespace_project_import_path(user.namespace, project))
       end
     end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index ed8088a46f0..6f48f091a20 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -20,7 +20,7 @@ describe Projects::IssuesController do
 
           get :index, namespace_id: project.namespace, project_id: project
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -28,7 +28,7 @@ describe Projects::IssuesController do
         it 'renders the "index" template' do
           get :index, namespace_id: project.namespace, project_id: project
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to render_template(:index)
         end
       end
@@ -45,7 +45,7 @@ describe Projects::IssuesController do
       it "returns index" do
         get :index, namespace_id: project.namespace, project_id: project
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it "returns 301 if request path doesn't match project path" do
@@ -59,7 +59,7 @@ describe Projects::IssuesController do
         project.save!
 
         get :index, namespace_id: project.namespace, project_id: project
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -89,7 +89,7 @@ describe Projects::IssuesController do
           page: last_page.to_param
 
         expect(assigns(:issues).current_page).to eq(last_page)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'does not redirect to external sites when provided a host field' do
@@ -166,7 +166,7 @@ describe Projects::IssuesController do
 
           get :new, namespace_id: project.namespace, project_id: project
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -174,7 +174,7 @@ describe Projects::IssuesController do
         it 'renders the "new" template' do
           get :new, namespace_id: project.namespace, project_id: project
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to render_template(:new)
         end
       end
@@ -224,7 +224,7 @@ describe Projects::IssuesController do
         it 'moves issue to another project' do
           move_issue
 
-          expect(response).to have_http_status :ok
+          expect(response).to have_gitlab_http_status :ok
           expect(another_project.issues).not_to be_empty
         end
       end
@@ -233,7 +233,7 @@ describe Projects::IssuesController do
         it 'responds with 404' do
           move_issue
 
-          expect(response).to have_http_status :not_found
+          expect(response).to have_gitlab_http_status :not_found
         end
       end
 
@@ -329,14 +329,14 @@ describe Projects::IssuesController do
         sign_out(:user)
         go(id: unescaped_parameter_value.to_param)
 
-        expect(response).to have_http_status :not_found
+        expect(response).to have_gitlab_http_status :not_found
       end
 
       it 'returns 404 for non project members' do
         sign_in(non_member)
         go(id: unescaped_parameter_value.to_param)
 
-        expect(response).to have_http_status :not_found
+        expect(response).to have_gitlab_http_status :not_found
       end
 
       it 'returns 404 for project members with guest role' do
@@ -344,21 +344,21 @@ describe Projects::IssuesController do
         project.team << [member, :guest]
         go(id: unescaped_parameter_value.to_param)
 
-        expect(response).to have_http_status :not_found
+        expect(response).to have_gitlab_http_status :not_found
       end
 
       it "returns #{http_status[:success]} for author" do
         sign_in(author)
         go(id: unescaped_parameter_value.to_param)
 
-        expect(response).to have_http_status http_status[:success]
+        expect(response).to have_gitlab_http_status http_status[:success]
       end
 
       it "returns #{http_status[:success]} for assignee" do
         sign_in(assignee)
         go(id: request_forgery_timing_attack.to_param)
 
-        expect(response).to have_http_status http_status[:success]
+        expect(response).to have_gitlab_http_status http_status[:success]
       end
 
       it "returns #{http_status[:success]} for project members" do
@@ -366,14 +366,14 @@ describe Projects::IssuesController do
         project.team << [member, :developer]
         go(id: unescaped_parameter_value.to_param)
 
-        expect(response).to have_http_status http_status[:success]
+        expect(response).to have_gitlab_http_status http_status[:success]
       end
 
       it "returns #{http_status[:success]} for admin" do
         sign_in(admin)
         go(id: unescaped_parameter_value.to_param)
 
-        expect(response).to have_http_status http_status[:success]
+        expect(response).to have_gitlab_http_status http_status[:success]
       end
     end
 
@@ -475,7 +475,7 @@ describe Projects::IssuesController do
             it 'returns 422 status' do
               update_issue
 
-              expect(response).to have_http_status(422)
+              expect(response).to have_gitlab_http_status(422)
             end
           end
 
@@ -495,7 +495,7 @@ describe Projects::IssuesController do
             end
 
             it 'returns 200 status' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
 
             it 'accepts an issue after recaptcha is verified' do
@@ -553,7 +553,7 @@ describe Projects::IssuesController do
         it 'returns 200' do
           go(id: issue.iid)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
@@ -778,7 +778,7 @@ describe Projects::IssuesController do
 
       it "rejects a developer to destroy an issue" do
         delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -794,7 +794,7 @@ describe Projects::IssuesController do
       it "deletes the issue" do
         delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
         expect(controller).to set_flash[:notice].to(/The issue was successfully deleted\./)
       end
 
@@ -818,7 +818,7 @@ describe Projects::IssuesController do
                                   project_id: project, id: issue.iid, name: "thumbsup")
       end.to change { issue.award_emoji.count }.by(1)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index d01339a0b88..f9688949a19 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -20,7 +20,7 @@ describe Projects::JobsController do
       end
 
       it 'has only pending builds' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(assigns(:builds).first.status).to eq('pending')
       end
     end
@@ -33,7 +33,7 @@ describe Projects::JobsController do
       end
 
       it 'has only running jobs' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(assigns(:builds).first.status).to eq('running')
       end
     end
@@ -46,7 +46,7 @@ describe Projects::JobsController do
       end
 
       it 'has only finished jobs' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(assigns(:builds).first.status).to eq('success')
       end
     end
@@ -62,7 +62,7 @@ describe Projects::JobsController do
         end
 
         it 'redirects to the page' do
-          expect(response).to have_http_status(:ok)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(assigns(:builds).current_page).to eq(last_page)
         end
       end
@@ -107,7 +107,7 @@ describe Projects::JobsController do
         end
 
         it 'has a job' do
-          expect(response).to have_http_status(:ok)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(assigns(:build).id).to eq(job.id)
         end
       end
@@ -118,7 +118,7 @@ describe Projects::JobsController do
         end
 
         it 'renders not_found' do
-          expect(response).to have_http_status(:not_found)
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
     end
@@ -136,7 +136,7 @@ describe Projects::JobsController do
       end
 
       it 'exposes needed information' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['raw_path']).to match(/jobs\/\d+\/raw\z/)
         expect(json_response.dig('merge_request', 'path')).to match(/merge_requests\/\d+\z/)
         expect(json_response['new_issue_path'])
@@ -163,7 +163,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :trace, pipeline: pipeline) }
 
       it 'returns a trace' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['id']).to eq job.id
         expect(json_response['status']).to eq job.status
         expect(json_response['html']).to eq('BUILD TRACE')
@@ -174,7 +174,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, pipeline: pipeline) }
 
       it 'returns no traces' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['id']).to eq job.id
         expect(json_response['status']).to eq job.status
         expect(json_response['html']).to be_nil
@@ -185,7 +185,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :unicode_trace, pipeline: pipeline) }
 
       it 'returns a trace with Unicode' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['id']).to eq job.id
         expect(json_response['status']).to eq job.status
         expect(json_response['html']).to include("ヾ(´༎ຶД༎ຶ`)ﾉ")
@@ -212,7 +212,7 @@ describe Projects::JobsController do
     end
 
     it 'return a detailed job status in json' do
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['text']).to eq status.text
       expect(json_response['label']).to eq status.label
       expect(json_response['icon']).to eq status.icon
@@ -232,7 +232,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :retryable, pipeline: pipeline) }
 
       it 'redirects to the retried job page' do
-        expect(response).to have_http_status(:found)
+        expect(response).to have_gitlab_http_status(:found)
         expect(response).to redirect_to(namespace_project_job_path(id: Ci::Build.last.id))
       end
     end
@@ -241,7 +241,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, pipeline: pipeline) }
 
       it 'renders unprocessable_entity' do
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
       end
     end
 
@@ -268,7 +268,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :playable, pipeline: pipeline) }
 
       it 'redirects to the played job page' do
-        expect(response).to have_http_status(:found)
+        expect(response).to have_gitlab_http_status(:found)
         expect(response).to redirect_to(namespace_project_job_path(id: job.id))
       end
 
@@ -281,7 +281,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, pipeline: pipeline) }
 
       it 'renders unprocessable_entity' do
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
       end
     end
 
@@ -304,7 +304,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :cancelable, pipeline: pipeline) }
 
       it 'redirects to the canceled job page' do
-        expect(response).to have_http_status(:found)
+        expect(response).to have_gitlab_http_status(:found)
         expect(response).to redirect_to(namespace_project_job_path(id: job.id))
       end
 
@@ -317,7 +317,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :canceled, pipeline: pipeline) }
 
       it 'returns unprocessable_entity' do
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
       end
     end
 
@@ -342,7 +342,7 @@ describe Projects::JobsController do
       end
 
       it 'redirects to a index page' do
-        expect(response).to have_http_status(:found)
+        expect(response).to have_gitlab_http_status(:found)
         expect(response).to redirect_to(namespace_project_jobs_path)
       end
 
@@ -359,7 +359,7 @@ describe Projects::JobsController do
       end
 
       it 'redirects to a index page' do
-        expect(response).to have_http_status(:found)
+        expect(response).to have_gitlab_http_status(:found)
         expect(response).to redirect_to(namespace_project_jobs_path)
       end
     end
@@ -382,7 +382,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :erasable, :trace, pipeline: pipeline) }
 
       it 'redirects to the erased job page' do
-        expect(response).to have_http_status(:found)
+        expect(response).to have_gitlab_http_status(:found)
         expect(response).to redirect_to(namespace_project_job_path(id: job.id))
       end
 
@@ -400,7 +400,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :erased, pipeline: pipeline) }
 
       it 'returns unprocessable_entity' do
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
       end
     end
 
@@ -420,7 +420,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, :trace, pipeline: pipeline) }
 
       it 'send a trace file' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response.content_type).to eq 'text/plain; charset=utf-8'
         expect(response.body).to eq 'BUILD TRACE'
       end
@@ -430,7 +430,7 @@ describe Projects::JobsController do
       let(:job) { create(:ci_build, pipeline: pipeline) }
 
       it 'returns not_found' do
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb
index f4e2dca883d..cf83f2f3265 100644
--- a/spec/controllers/projects/labels_controller_spec.rb
+++ b/spec/controllers/projects/labels_controller_spec.rb
@@ -78,7 +78,7 @@ describe Projects::LabelsController do
       it 'creates labels' do
         post :generate, namespace_id: personal_project.namespace.to_param, project_id: personal_project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -86,7 +86,7 @@ describe Projects::LabelsController do
       it 'creates labels' do
         post :generate, namespace_id: project.namespace.to_param, project_id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
   end
@@ -97,7 +97,7 @@ describe Projects::LabelsController do
 
       toggle_subscription(label)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'allows user to toggle subscription on group labels' do
@@ -105,7 +105,7 @@ describe Projects::LabelsController do
 
       toggle_subscription(group_label)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     def toggle_subscription(label)
@@ -121,7 +121,7 @@ describe Projects::LabelsController do
       it 'denies access' do
         post :promote, namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -170,7 +170,7 @@ describe Projects::LabelsController do
             it 'does not redirect' do
               get :index, namespace_id: project.namespace, project_id: project.to_param
 
-              expect(response).not_to have_http_status(301)
+              expect(response).not_to have_gitlab_http_status(301)
             end
           end
 
@@ -203,13 +203,13 @@ describe Projects::LabelsController do
       it 'does not 404' do
         post :generate, namespace_id: project.namespace, project_id: project
 
-        expect(response).not_to have_http_status(404)
+        expect(response).not_to have_gitlab_http_status(404)
       end
 
       it 'does not redirect to the correct casing' do
         post :generate, namespace_id: project.namespace, project_id: project
 
-        expect(response).not_to have_http_status(301)
+        expect(response).not_to have_gitlab_http_status(301)
       end
     end
 
@@ -219,7 +219,7 @@ describe Projects::LabelsController do
       it 'returns not found' do
         post :generate, namespace_id: project.namespace, project_id: project.to_param + 'old'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/projects/mattermosts_controller_spec.rb b/spec/controllers/projects/mattermosts_controller_spec.rb
index 4eea7041d29..33d48ff94d1 100644
--- a/spec/controllers/projects/mattermosts_controller_spec.rb
+++ b/spec/controllers/projects/mattermosts_controller_spec.rb
@@ -20,7 +20,7 @@ describe Projects::MattermostsController do
           namespace_id: project.namespace.to_param,
           project_id: project)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 
diff --git a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
index c6d50c28106..2d7647a6e12 100644
--- a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
@@ -28,7 +28,7 @@ describe Projects::MergeRequests::ConflictsController do
       end
 
       it 'returns a 200 status code' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
       end
 
       it 'returns JSON with a message' do
@@ -116,7 +116,7 @@ describe Projects::MergeRequests::ConflictsController do
       end
 
       it 'returns a 404 status code' do
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -126,7 +126,7 @@ describe Projects::MergeRequests::ConflictsController do
       end
 
       it 'returns a 404 status code' do
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -138,7 +138,7 @@ describe Projects::MergeRequests::ConflictsController do
       end
 
       it 'returns a 200 status code' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
       end
 
       it 'returns the file in JSON format' do
@@ -198,7 +198,7 @@ describe Projects::MergeRequests::ConflictsController do
       end
 
       it 'returns an OK response' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
 
@@ -224,7 +224,7 @@ describe Projects::MergeRequests::ConflictsController do
       end
 
       it 'returns a 400 error' do
-        expect(response).to have_http_status(:bad_request)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'has a message with the name of the first missing section' do
@@ -254,7 +254,7 @@ describe Projects::MergeRequests::ConflictsController do
       end
 
       it 'returns a 400 error' do
-        expect(response).to have_http_status(:bad_request)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'has a message with the name of the missing file' do
@@ -292,7 +292,7 @@ describe Projects::MergeRequests::ConflictsController do
       end
 
       it 'returns a 400 error' do
-        expect(response).to have_http_status(:bad_request)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'has a message with the path of the problem file' do
diff --git a/spec/controllers/projects/merge_requests/creations_controller_spec.rb b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
index fc4cec53374..7fdddc02fd3 100644
--- a/spec/controllers/projects/merge_requests/creations_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
@@ -112,7 +112,7 @@ describe Projects::MergeRequests::CreationsController do
         end
 
         it 'returns a 404' do
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
index 7260350d5fb..18a70bec103 100644
--- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
@@ -119,7 +119,7 @@ describe Projects::MergeRequests::DiffsController do
           end
 
           it 'returns a 404' do
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -131,7 +131,7 @@ describe Projects::MergeRequests::DiffsController do
         end
 
         it 'returns a 404' do
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -142,7 +142,7 @@ describe Projects::MergeRequests::DiffsController do
       end
 
       it 'returns a 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -155,7 +155,7 @@ describe Projects::MergeRequests::DiffsController do
       end
 
       it 'returns a 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 707e7c32283..b7cccddefdd 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -143,7 +143,7 @@ describe Projects::MergeRequestsController do
         get_merge_requests(last_page)
 
         expect(assigns(:merge_requests).current_page).to eq(last_page)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'does not redirect to external sites when provided a host field' do
@@ -278,7 +278,7 @@ describe Projects::MergeRequestsController do
       end
 
       it 'returns 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -434,7 +434,7 @@ describe Projects::MergeRequestsController do
     it "denies access to users unless they're admin or project owner" do
       delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context "when the user is owner" do
@@ -449,7 +449,7 @@ describe Projects::MergeRequestsController do
       it "deletes the merge request" do
         delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
         expect(controller).to set_flash[:notice].to(/The merge request was successfully deleted\./)
       end
 
@@ -539,7 +539,7 @@ describe Projects::MergeRequestsController do
       subject
     end
 
-    it { is_expected.to have_http_status(:success) }
+    it { is_expected.to have_gitlab_http_status(:success) }
 
     it 'renders MergeRequest as JSON' do
       subject
@@ -636,7 +636,7 @@ describe Projects::MergeRequestsController do
       end
 
       it 'return a detailed head_pipeline status in json' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['text']).to eq status.text
         expect(json_response['label']).to eq status.label
         expect(json_response['icon']).to eq status.icon
@@ -650,7 +650,7 @@ describe Projects::MergeRequestsController do
       end
 
       it 'return empty' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response).to be_empty
       end
     end
diff --git a/spec/controllers/projects/milestones_controller_spec.rb b/spec/controllers/projects/milestones_controller_spec.rb
index 62f1fb1f697..573530d0db0 100644
--- a/spec/controllers/projects/milestones_controller_spec.rb
+++ b/spec/controllers/projects/milestones_controller_spec.rb
@@ -27,7 +27,7 @@ describe Projects::MilestonesController do
     it 'shows milestone page' do
       view_milestone
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index 135fd6449ff..1184c55e540 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -180,13 +180,13 @@ describe Projects::NotesController do
     it "returns status 302 for html" do
       post :create, request_params
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
     end
 
     it "returns status 200 for json" do
       post :create, request_params.merge(format: :json)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     context 'when merge_request_diff_head_sha present' do
@@ -205,7 +205,7 @@ describe Projects::NotesController do
       it "returns status 302 for html" do
         post :create, request_params
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -240,7 +240,7 @@ describe Projects::NotesController do
         it 'returns a 404' do
           post_create(note_project_id: Project.maximum(:id).succ)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -248,7 +248,7 @@ describe Projects::NotesController do
         it 'returns a 404' do
           post_create
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -278,7 +278,7 @@ describe Projects::NotesController do
           request_params[:note][:noteable_id] = 9999
           post :create, request_params.merge(format: :json)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -286,13 +286,13 @@ describe Projects::NotesController do
         it 'returns 302 status for html' do
           post :create, request_params
 
-          expect(response).to have_http_status(302)
+          expect(response).to have_gitlab_http_status(302)
         end
 
         it 'returns 200 status for json' do
           post :create, request_params.merge(format: :json)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         it 'creates a new note' do
@@ -308,7 +308,7 @@ describe Projects::NotesController do
         it 'returns 404 status' do
           post :create, request_params
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
 
         it 'does not create a new note' do
@@ -337,7 +337,7 @@ describe Projects::NotesController do
       it "returns status 200 for html" do
         delete :destroy, request_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it "deletes the note" do
@@ -354,7 +354,7 @@ describe Projects::NotesController do
       it "returns status 404" do
         delete :destroy, request_params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -370,7 +370,7 @@ describe Projects::NotesController do
         post(:toggle_award_emoji, request_params.merge(name: "thumbsup"))
       end.to change { note.award_emoji.count }.by(1)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it "removes the already awarded emoji" do
@@ -380,7 +380,7 @@ describe Projects::NotesController do
         post(:toggle_award_emoji, request_params.merge(name: "thumbsup"))
       end.to change { AwardEmoji.count }.by(-1)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 
@@ -398,7 +398,7 @@ describe Projects::NotesController do
         it "returns status 404" do
           post :resolve, request_params
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -415,7 +415,7 @@ describe Projects::NotesController do
           it "returns status 404" do
             post :resolve, request_params
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -442,7 +442,7 @@ describe Projects::NotesController do
           it "returns status 200" do
             post :resolve, request_params
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
       end
@@ -459,7 +459,7 @@ describe Projects::NotesController do
         it "returns status 404" do
           delete :unresolve, request_params
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -476,7 +476,7 @@ describe Projects::NotesController do
           it "returns status 404" do
             delete :unresolve, request_params
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -490,7 +490,7 @@ describe Projects::NotesController do
           it "returns status 200" do
             delete :unresolve, request_params
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
       end
diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb
index 83c7744a231..4705c50de7e 100644
--- a/spec/controllers/projects/pages_controller_spec.rb
+++ b/spec/controllers/projects/pages_controller_spec.rb
@@ -21,7 +21,7 @@ describe Projects::PagesController do
     it 'returns 200 status' do
       get :show, request_params
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     context 'when the project is in a subgroup' do
@@ -31,7 +31,7 @@ describe Projects::PagesController do
       it 'returns a 404 status code' do
         get :show, request_params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -40,7 +40,7 @@ describe Projects::PagesController do
     it 'returns 302 status' do
       delete :destroy, request_params
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
     end
   end
 
@@ -53,7 +53,7 @@ describe Projects::PagesController do
       it 'returns 404 status' do
         get :show, request_params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -61,7 +61,7 @@ describe Projects::PagesController do
       it 'returns 404 status' do
         delete :destroy, request_params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/projects/pages_domains_controller_spec.rb b/spec/controllers/projects/pages_domains_controller_spec.rb
index ad4d7da3bdd..e9e7d357d9c 100644
--- a/spec/controllers/projects/pages_domains_controller_spec.rb
+++ b/spec/controllers/projects/pages_domains_controller_spec.rb
@@ -26,7 +26,7 @@ describe Projects::PagesDomainsController do
     it "displays the 'show' page" do
       get(:show, request_params.merge(id: pages_domain.domain))
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to render_template('show')
     end
   end
@@ -35,7 +35,7 @@ describe Projects::PagesDomainsController do
     it "displays the 'new' page" do
       get(:new, request_params)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to render_template('new')
     end
   end
@@ -69,7 +69,7 @@ describe Projects::PagesDomainsController do
       it 'returns 404 status' do
         get(:show, request_params.merge(id: pages_domain.domain))
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -77,7 +77,7 @@ describe Projects::PagesDomainsController do
       it 'returns 404 status' do
         get :new, request_params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -85,7 +85,7 @@ describe Projects::PagesDomainsController do
       it "returns 404 status" do
         post(:create, request_params.merge(pages_domain: pages_domain_params))
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -93,7 +93,7 @@ describe Projects::PagesDomainsController do
       it "deletes the pages domain" do
         delete(:destroy, request_params.merge(id: pages_domain.domain))
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
index 4ac0559c679..4e52e261920 100644
--- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb
+++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
@@ -15,7 +15,7 @@ describe Projects::PipelineSchedulesController do
     it 'renders the index view' do
       visit_pipelines_schedules
 
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(response).to render_template(:index)
     end
 
@@ -35,7 +35,7 @@ describe Projects::PipelineSchedulesController do
       end
 
       it 'only shows active pipeline schedules' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(assigns(:schedules)).to include(pipeline_schedule)
         expect(assigns(:schedules)).not_to include(inactive_pipeline_schedule)
       end
@@ -57,7 +57,7 @@ describe Projects::PipelineSchedulesController do
     it 'initializes a pipeline schedule model' do
       get :new, namespace_id: project.namespace.to_param, project_id: project
 
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(assigns(:schedule)).to be_a_new(Ci::PipelineSchedule)
     end
   end
@@ -87,7 +87,7 @@ describe Projects::PipelineSchedulesController do
             .to change { Ci::PipelineSchedule.count }.by(1)
             .and change { Ci::PipelineScheduleVariable.count }.by(1)
 
-          expect(response).to have_http_status(:found)
+          expect(response).to have_gitlab_http_status(:found)
 
           Ci::PipelineScheduleVariable.last.tap do |v|
             expect(v.key).to eq("AAA")
@@ -158,7 +158,7 @@ describe Projects::PipelineSchedulesController do
             expect { go }.to change { Ci::PipelineScheduleVariable.count }.by(1)
 
             pipeline_schedule.reload
-            expect(response).to have_http_status(:found)
+            expect(response).to have_gitlab_http_status(:found)
             expect(pipeline_schedule.variables.last.key).to eq('AAA')
             expect(pipeline_schedule.variables.last.value).to eq('AAA123')
           end
@@ -324,7 +324,7 @@ describe Projects::PipelineSchedulesController do
       it 'loads the pipeline schedule' do
         get :edit, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(assigns(:schedule)).to eq(pipeline_schedule)
       end
     end
@@ -376,7 +376,7 @@ describe Projects::PipelineSchedulesController do
       end
 
       it 'does not delete the pipeline schedule' do
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -391,7 +391,7 @@ describe Projects::PipelineSchedulesController do
           delete :destroy, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id
         end.to change { project.pipeline_schedules.count }.by(-1)
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
   end
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 67b53d2acce..f1ad5dd84ff 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -33,7 +33,7 @@ describe Projects::PipelinesController do
     it 'returns JSON with serialized pipelines' do
       subject
 
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(response).to match_response_schema('pipeline')
 
       expect(json_response).to include('pipelines')
@@ -57,7 +57,7 @@ describe Projects::PipelinesController do
     it 'returns the pipeline' do
       get_pipeline_json
 
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response).not_to be_an(Array)
       expect(json_response['id']).to be(pipeline.id)
       expect(json_response['details']).to have_key 'stages'
@@ -111,7 +111,7 @@ describe Projects::PipelinesController do
       end
 
       it 'returns html source for stage dropdown' do
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to render_template('projects/pipelines/_stage')
         expect(json_response).to include('html')
       end
@@ -123,7 +123,7 @@ describe Projects::PipelinesController do
       end
 
       it 'responds with not found' do
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -148,7 +148,7 @@ describe Projects::PipelinesController do
     end
 
     it 'return a detailed pipeline status in json' do
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['text']).to eq status.text
       expect(json_response['label']).to eq status.label
       expect(json_response['icon']).to eq status.icon
@@ -171,14 +171,14 @@ describe Projects::PipelinesController do
       let(:feature) { ProjectFeature::ENABLED }
 
       it 'retries a pipeline without returning any content' do
-        expect(response).to have_http_status(:no_content)
+        expect(response).to have_gitlab_http_status(:no_content)
         expect(build.reload).to be_retried
       end
     end
 
     context 'when builds are disabled' do
       it 'fails to retry pipeline' do
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -198,14 +198,14 @@ describe Projects::PipelinesController do
       let(:feature) { ProjectFeature::ENABLED }
 
       it 'cancels a pipeline without returning any content' do
-        expect(response).to have_http_status(:no_content)
+        expect(response).to have_gitlab_http_status(:no_content)
         expect(pipeline.reload).to be_canceled
       end
     end
 
     context 'when builds are disabled' do
       it 'fails to retry pipeline' do
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
diff --git a/spec/controllers/projects/pipelines_settings_controller_spec.rb b/spec/controllers/projects/pipelines_settings_controller_spec.rb
index ee46ad00947..21b6a6d45f5 100644
--- a/spec/controllers/projects/pipelines_settings_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_settings_controller_spec.rb
@@ -25,7 +25,7 @@ describe Projects::PipelinesSettingsController do
       let(:params) { { enabled: '', domain: 'mepmep.md' } }
 
       it 'redirects to the settings page' do
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
         expect(flash[:notice]).to eq("Pipelines settings for '#{project.name}' were successfully updated.")
       end
 
diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb
index 3cb1bec5ea2..a34dc27a5ed 100644
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
@@ -8,7 +8,7 @@ describe Projects::ProjectMembersController do
     it 'should have the project_members address with a 200 status code' do
       get :index, namespace_id: project.namespace, project_id: project
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 
@@ -30,7 +30,7 @@ describe Projects::ProjectMembersController do
                       user_ids: project_user.id,
                       access_level: Gitlab::Access::GUEST
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(project.users).not_to include project_user
       end
     end
@@ -79,7 +79,7 @@ describe Projects::ProjectMembersController do
                          project_id: project,
                          id: 42
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -94,7 +94,7 @@ describe Projects::ProjectMembersController do
                            project_id: project,
                            id: member
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
           expect(project.members).to include member
         end
       end
@@ -137,7 +137,7 @@ describe Projects::ProjectMembersController do
         delete :leave, namespace_id: project.namespace,
                        project_id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -168,7 +168,7 @@ describe Projects::ProjectMembersController do
           delete :leave, namespace_id: project.namespace,
                          project_id: project
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
@@ -221,7 +221,7 @@ describe Projects::ProjectMembersController do
                                       project_id: project,
                                       id: 42
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -236,7 +236,7 @@ describe Projects::ProjectMembersController do
                                         project_id: project,
                                         id: member
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
           expect(project.members).not_to include member
         end
       end
diff --git a/spec/controllers/projects/prometheus_controller_spec.rb b/spec/controllers/projects/prometheus_controller_spec.rb
index 8407a53272a..bbfe78d305a 100644
--- a/spec/controllers/projects/prometheus_controller_spec.rb
+++ b/spec/controllers/projects/prometheus_controller_spec.rb
@@ -24,7 +24,7 @@ describe Projects::PrometheusController do
         it 'returns no content response' do
           get :active_metrics, project_params(format: :json)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end
       end
 
@@ -38,7 +38,7 @@ describe Projects::PrometheusController do
         it 'returns no content response' do
           get :active_metrics, project_params(format: :json)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to eq(sample_response.deep_stringify_keys)
         end
       end
@@ -47,7 +47,7 @@ describe Projects::PrometheusController do
         it 'returns not found response' do
           get :active_metrics, project_params
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index b4eaab29fed..3a0c3faa7b4 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -13,7 +13,7 @@ describe Projects::RawController do
             project_id: public_project,
             id: id)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response.header['Content-Type']).to eq('text/plain; charset=utf-8')
         expect(response.header['Content-Disposition'])
             .to eq('inline')
@@ -30,7 +30,7 @@ describe Projects::RawController do
             project_id: public_project,
             id: id)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response.header['Content-Type']).to eq('image/jpeg')
         expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with('git-blob:')
       end
@@ -59,7 +59,7 @@ describe Projects::RawController do
                 project_id: public_project,
                 id: id)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
 
@@ -70,7 +70,7 @@ describe Projects::RawController do
                 project_id: public_project,
                 id: id)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -86,7 +86,7 @@ describe Projects::RawController do
               project_id: public_project,
               id: id)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.header['Content-Type']).to eq('text/plain; charset=utf-8')
           expect(response.header['Content-Disposition'])
               .to eq('inline')
diff --git a/spec/controllers/projects/registry/repositories_controller_spec.rb b/spec/controllers/projects/registry/repositories_controller_spec.rb
index 5d9d5351687..17769a14def 100644
--- a/spec/controllers/projects/registry/repositories_controller_spec.rb
+++ b/spec/controllers/projects/registry/repositories_controller_spec.rb
@@ -35,7 +35,7 @@ describe Projects::Registry::RepositoriesController do
           it 'successfully renders container repositories' do
             go_to_index
 
-            expect(response).to have_http_status(:ok)
+            expect(response).to have_gitlab_http_status(:ok)
           end
 
           it 'creates a root container repository' do
@@ -46,7 +46,7 @@ describe Projects::Registry::RepositoriesController do
           it 'json has a list of projects' do
             go_to_index(format: :json)
 
-            expect(response).to have_http_status(:ok)
+            expect(response).to have_gitlab_http_status(:ok)
             expect(response).to match_response_schema('registry/repositories')
           end
         end
@@ -59,7 +59,7 @@ describe Projects::Registry::RepositoriesController do
           it 'successfully renders container repositories' do
             go_to_index
 
-            expect(response).to have_http_status(:ok)
+            expect(response).to have_gitlab_http_status(:ok)
           end
 
           it 'does not ensure root container repository' do
@@ -69,7 +69,7 @@ describe Projects::Registry::RepositoriesController do
           it 'responds with json if asked' do
             go_to_index(format: :json)
 
-            expect(response).to have_http_status(:ok)
+            expect(response).to have_gitlab_http_status(:ok)
             expect(json_response).to be_kind_of(Array)
           end
         end
@@ -89,7 +89,7 @@ describe Projects::Registry::RepositoriesController do
         it 'deletes a repository' do
           expect { delete_repository(repository) }.to change { ContainerRepository.all.count }.by(-1)
 
-          expect(response).to have_http_status(:no_content)
+          expect(response).to have_gitlab_http_status(:no_content)
         end
       end
     end
@@ -100,7 +100,7 @@ describe Projects::Registry::RepositoriesController do
       it 'responds with 404' do
         go_to_index
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
 
       it 'does not ensure root container repository' do
diff --git a/spec/controllers/projects/registry/tags_controller_spec.rb b/spec/controllers/projects/registry/tags_controller_spec.rb
index bb702ebeb23..7fee8fd44ff 100644
--- a/spec/controllers/projects/registry/tags_controller_spec.rb
+++ b/spec/controllers/projects/registry/tags_controller_spec.rb
@@ -30,7 +30,7 @@ describe Projects::Registry::TagsController do
       it 'receive a list of tags' do
         get_tags
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('registry/tags')
         expect(response).to include_pagination_headers
       end
@@ -44,7 +44,7 @@ describe Projects::Registry::TagsController do
       it 'receive a list of tags' do
         get_tags
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('registry/tags')
         expect(response).to include_pagination_headers
       end
@@ -58,7 +58,7 @@ describe Projects::Registry::TagsController do
       it 'does not receive a list of tags' do
         get_tags
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
diff --git a/spec/controllers/projects/repositories_controller_spec.rb b/spec/controllers/projects/repositories_controller_spec.rb
index f712d1e0d63..8b777eb68ca 100644
--- a/spec/controllers/projects/repositories_controller_spec.rb
+++ b/spec/controllers/projects/repositories_controller_spec.rb
@@ -35,7 +35,7 @@ describe Projects::RepositoriesController do
         it "renders Not Found" do
           get :archive, namespace_id: project.namespace, project_id: project, ref: "master", format: "zip"
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
diff --git a/spec/controllers/projects/runners_controller_spec.rb b/spec/controllers/projects/runners_controller_spec.rb
index 2b6f988fd9c..89a13f3c976 100644
--- a/spec/controllers/projects/runners_controller_spec.rb
+++ b/spec/controllers/projects/runners_controller_spec.rb
@@ -29,7 +29,7 @@ describe Projects::RunnersController do
 
       runner.reload
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(runner.description).to eq(new_desc)
     end
   end
@@ -38,7 +38,7 @@ describe Projects::RunnersController do
     it 'destroys the runner' do
       delete :destroy, params
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(Ci::Runner.find_by(id: runner.id)).to be_nil
     end
   end
@@ -53,7 +53,7 @@ describe Projects::RunnersController do
 
       runner.reload
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(runner.active).to eq(true)
     end
   end
@@ -68,7 +68,7 @@ describe Projects::RunnersController do
 
       runner.reload
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(runner.active).to eq(false)
     end
   end
diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
index efba9cc7306..a907da2b60f 100644
--- a/spec/controllers/projects/services_controller_spec.rb
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -19,7 +19,7 @@ describe Projects::ServicesController do
 
         put :test, namespace_id: project.namespace, project_id: project, id: service.to_param
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
index a8f4b79b64c..b8fe0f46f57 100644
--- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
@@ -13,7 +13,7 @@ describe Projects::Settings::CiCdController do
     it 'renders show with 200 status code' do
       get :show, namespace_id: project.namespace, project_id: project
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to render_template(:show)
     end
   end
diff --git a/spec/controllers/projects/settings/integrations_controller_spec.rb b/spec/controllers/projects/settings/integrations_controller_spec.rb
index e0f9a5b24a6..3068837f394 100644
--- a/spec/controllers/projects/settings/integrations_controller_spec.rb
+++ b/spec/controllers/projects/settings/integrations_controller_spec.rb
@@ -13,7 +13,7 @@ describe Projects::Settings::IntegrationsController do
     it 'renders show with 200 status code' do
       get :show, namespace_id: project.namespace, project_id: project
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to render_template(:show)
     end
   end
diff --git a/spec/controllers/projects/settings/repository_controller_spec.rb b/spec/controllers/projects/settings/repository_controller_spec.rb
index f73471f8ca8..3a4014b7768 100644
--- a/spec/controllers/projects/settings/repository_controller_spec.rb
+++ b/spec/controllers/projects/settings/repository_controller_spec.rb
@@ -13,7 +13,7 @@ describe Projects::Settings::RepositoryController do
     it 'renders show with 200 status code' do
       get :show, namespace_id: project.namespace, project_id: project
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to render_template(:show)
     end
   end
diff --git a/spec/controllers/projects/snippets_controller_spec.rb b/spec/controllers/projects/snippets_controller_spec.rb
index 3a1550aa730..e7c0b484ede 100644
--- a/spec/controllers/projects/snippets_controller_spec.rb
+++ b/spec/controllers/projects/snippets_controller_spec.rb
@@ -29,7 +29,7 @@ describe Projects::SnippetsController do
           project_id: project, page: last_page.to_param
 
         expect(assigns(:snippets).current_page).to eq(last_page)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -41,7 +41,7 @@ describe Projects::SnippetsController do
           get :index, namespace_id: project.namespace, project_id: project
 
           expect(assigns(:snippets)).not_to include(project_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
 
@@ -54,7 +54,7 @@ describe Projects::SnippetsController do
           get :index, namespace_id: project.namespace, project_id: project
 
           expect(assigns(:snippets)).to include(project_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
 
@@ -67,7 +67,7 @@ describe Projects::SnippetsController do
           get :index, namespace_id: project.namespace, project_id: project
 
           expect(assigns(:snippets)).to include(project_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
@@ -316,7 +316,7 @@ describe Projects::SnippetsController do
           it 'responds with status 404' do
             get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -329,7 +329,7 @@ describe Projects::SnippetsController do
             get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param
 
             expect(assigns(:snippet)).to eq(project_snippet)
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
 
@@ -342,7 +342,7 @@ describe Projects::SnippetsController do
             get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param
 
             expect(assigns(:snippet)).to eq(project_snippet)
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
       end
@@ -352,7 +352,7 @@ describe Projects::SnippetsController do
           it 'responds with status 404' do
             get action, namespace_id: project.namespace, project_id: project, id: 42
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -364,7 +364,7 @@ describe Projects::SnippetsController do
           it 'responds with status 404' do
             get action, namespace_id: project.namespace, project_id: project, id: 42
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
diff --git a/spec/controllers/projects/todos_controller_spec.rb b/spec/controllers/projects/todos_controller_spec.rb
index 41d211ed1bb..4622e27e60f 100644
--- a/spec/controllers/projects/todos_controller_spec.rb
+++ b/spec/controllers/projects/todos_controller_spec.rb
@@ -28,13 +28,13 @@ describe Projects::TodosController do
             go
           end.to change { user.todos.count }.by(1)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         it 'returns todo path and pending count' do
           go
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['count']).to eq 1
           expect(json_response['delete_path']).to match(/\/dashboard\/todos\/\d{1}/)
         end
@@ -47,7 +47,7 @@ describe Projects::TodosController do
             go
           end.to change { user.todos.count }.by(0)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
 
         it 'does not create todo for issue when user not logged in' do
@@ -55,7 +55,7 @@ describe Projects::TodosController do
             go
           end.to change { user.todos.count }.by(0)
 
-          expect(response).to have_http_status(302)
+          expect(response).to have_gitlab_http_status(302)
         end
       end
 
@@ -68,7 +68,7 @@ describe Projects::TodosController do
 
         it "doesn't create todo" do
           expect { go }.not_to change { user.todos.count }
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -96,13 +96,13 @@ describe Projects::TodosController do
             go
           end.to change { user.todos.count }.by(1)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         it 'returns todo path and pending count' do
           go
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['count']).to eq 1
           expect(json_response['delete_path']).to match(/\/dashboard\/todos\/\d{1}/)
         end
@@ -115,7 +115,7 @@ describe Projects::TodosController do
             go
           end.to change { user.todos.count }.by(0)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
 
         it 'does not create todo for merge request user has no access to' do
@@ -123,7 +123,7 @@ describe Projects::TodosController do
             go
           end.to change { user.todos.count }.by(0)
 
-          expect(response).to have_http_status(302)
+          expect(response).to have_gitlab_http_status(302)
         end
       end
 
@@ -136,7 +136,7 @@ describe Projects::TodosController do
 
         it "doesn't create todo" do
           expect { go }.not_to change { user.todos.count }
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
diff --git a/spec/controllers/projects/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb
index 775f3998f5d..65b821c9486 100644
--- a/spec/controllers/projects/tree_controller_spec.rb
+++ b/spec/controllers/projects/tree_controller_spec.rb
@@ -64,7 +64,7 @@ describe Projects::TreeController do
 
     context "valid SHA commit ID with path" do
       let(:id) { '6d39438/.gitignore' }
-      it { expect(response).to have_http_status(302) }
+      it { expect(response).to have_gitlab_http_status(302) }
     end
   end
 
diff --git a/spec/controllers/projects/uploads_controller_spec.rb b/spec/controllers/projects/uploads_controller_spec.rb
index 488bcf31371..c2550b1efa7 100644
--- a/spec/controllers/projects/uploads_controller_spec.rb
+++ b/spec/controllers/projects/uploads_controller_spec.rb
@@ -18,7 +18,7 @@ describe Projects::UploadsController do
           namespace_id: project.namespace.to_param,
           project_id: project,
           format: :json
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
     end
 
@@ -90,7 +90,7 @@ describe Projects::UploadsController do
           it "responds with status 200" do
             go
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
 
@@ -98,7 +98,7 @@ describe Projects::UploadsController do
           it "responds with status 404" do
             go
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -117,7 +117,7 @@ describe Projects::UploadsController do
           it "responds with status 200" do
             go
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
 
@@ -125,7 +125,7 @@ describe Projects::UploadsController do
           it "responds with status 404" do
             go
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -151,7 +151,7 @@ describe Projects::UploadsController do
             it "responds with status 200" do
               go
 
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
           end
 
@@ -192,7 +192,7 @@ describe Projects::UploadsController do
             it "responds with status 200" do
               go
 
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
           end
 
@@ -200,7 +200,7 @@ describe Projects::UploadsController do
             it "responds with status 404" do
               go
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
           end
         end
@@ -220,7 +220,7 @@ describe Projects::UploadsController do
               it "responds with status 200" do
                 go
 
-                expect(response).to have_http_status(200)
+                expect(response).to have_gitlab_http_status(200)
               end
             end
 
@@ -228,7 +228,7 @@ describe Projects::UploadsController do
               it "responds with status 404" do
                 go
 
-                expect(response).to have_http_status(404)
+                expect(response).to have_gitlab_http_status(404)
               end
             end
           end
@@ -237,7 +237,7 @@ describe Projects::UploadsController do
             it "responds with status 404" do
               go
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
           end
         end
diff --git a/spec/controllers/projects/variables_controller_spec.rb b/spec/controllers/projects/variables_controller_spec.rb
index 6957fb43c19..d065cd00d00 100644
--- a/spec/controllers/projects/variables_controller_spec.rb
+++ b/spec/controllers/projects/variables_controller_spec.rb
@@ -50,7 +50,7 @@ describe Projects::VariablesController do
         post :update, namespace_id: project.namespace.to_param, project_id: project,
                       id: variable.id, variable: { key: '?', value: variable.value }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to render_template :show
       end
     end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 7569052c3aa..b1d7157e447 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -24,7 +24,7 @@ describe ProjectsController do
 
             get :new, namespace_id: group.id
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to render_template('new')
           end
         end
@@ -33,7 +33,7 @@ describe ProjectsController do
           it 'responds with status 404' do
             get :new, namespace_id: group.id
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
             expect(response).not_to render_template('new')
           end
         end
@@ -152,7 +152,7 @@ describe ProjectsController do
       it 'renders a 503' do
         get :show, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(503)
+        expect(response).to have_gitlab_http_status(503)
       end
     end
 
@@ -257,7 +257,7 @@ describe ProjectsController do
 
         get :show, namespace_id: project.namespace, id: project, format: :git
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
         expect(response).to redirect_to(namespace_project_path)
       end
     end
@@ -280,7 +280,7 @@ describe ProjectsController do
 
         expect(project.path).to include 'renamed_path'
         expect(assigns(:repository).path).to include project.path
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -296,7 +296,7 @@ describe ProjectsController do
           .not_to change { project.reload.path }
 
         expect(controller).to set_flash[:alert].to(/container registry tags/)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -312,7 +312,7 @@ describe ProjectsController do
           id: project.id,
           project: params
 
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       params.each do |param, value|
         expect(project.public_send(param)).to eq(value)
       end
@@ -345,7 +345,7 @@ describe ProjectsController do
       project.reload
 
       expect(project.namespace).to eq(new_namespace)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     context 'when new namespace is empty' do
@@ -364,7 +364,7 @@ describe ProjectsController do
         project.reload
 
         expect(project.namespace).to eq(old_namespace)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(flash[:alert]).to eq 'Please select a new namespace for your project.'
       end
     end
@@ -381,7 +381,7 @@ describe ProjectsController do
       delete :destroy, namespace_id: project.namespace, id: project
 
       expect { Project.find(orig_id) }.to raise_error(ActiveRecord::RecordNotFound)
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(response).to redirect_to(dashboard_projects_path)
     end
 
@@ -420,7 +420,7 @@ describe ProjectsController do
     end
 
     it 'has http status 200' do
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'changes the user incoming email token' do
@@ -496,7 +496,7 @@ describe ProjectsController do
       delete(:remove_fork,
           namespace_id: project.namespace,
           id: project, format: :js)
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
   end
 
@@ -544,7 +544,7 @@ describe ProjectsController do
             get :show, namespace_id: public_project.namespace, id: public_project
 
             expect(assigns(:project)).to eq(public_project)
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
 
@@ -583,13 +583,13 @@ describe ProjectsController do
         it 'does not 404' do
           post :toggle_star, namespace_id: public_project.namespace, id: public_project.path.upcase
 
-          expect(response).not_to have_http_status(404)
+          expect(response).not_to have_gitlab_http_status(404)
         end
 
         it 'does not redirect to the correct casing' do
           post :toggle_star, namespace_id: public_project.namespace, id: public_project.path.upcase
 
-          expect(response).not_to have_http_status(301)
+          expect(response).not_to have_gitlab_http_status(301)
         end
       end
 
@@ -599,7 +599,7 @@ describe ProjectsController do
         it 'returns not found' do
           post :toggle_star, namespace_id: 'foo', id: 'bar'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -613,13 +613,13 @@ describe ProjectsController do
         it 'does not 404' do
           delete :destroy, namespace_id: project.namespace, id: project.path.upcase
 
-          expect(response).not_to have_http_status(404)
+          expect(response).not_to have_gitlab_http_status(404)
         end
 
         it 'does not redirect to the correct casing' do
           delete :destroy, namespace_id: project.namespace, id: project.path.upcase
 
-          expect(response).not_to have_http_status(301)
+          expect(response).not_to have_gitlab_http_status(301)
         end
       end
 
@@ -629,7 +629,7 @@ describe ProjectsController do
         it 'returns not found' do
           delete :destroy, namespace_id: 'foo', id: 'bar'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -646,7 +646,7 @@ describe ProjectsController do
       it 'returns 302' do
         get :export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -658,7 +658,7 @@ describe ProjectsController do
       it 'returns 404' do
         get :export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -674,7 +674,7 @@ describe ProjectsController do
       it 'returns 302' do
         get :download_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -686,7 +686,7 @@ describe ProjectsController do
       it 'returns 404' do
         get :download_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -702,7 +702,7 @@ describe ProjectsController do
       it 'returns 302' do
         post :remove_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -714,7 +714,7 @@ describe ProjectsController do
       it 'returns 404' do
         post :remove_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -730,7 +730,7 @@ describe ProjectsController do
       it 'returns 302' do
         post :generate_new_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(302)
+        expect(response).to have_gitlab_http_status(302)
       end
     end
 
@@ -742,7 +742,7 @@ describe ProjectsController do
       it 'returns 404' do
         post :generate_new_export, namespace_id: project.namespace, id: project
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/controllers/sent_notifications_controller_spec.rb b/spec/controllers/sent_notifications_controller_spec.rb
index 31593ce7311..54a9af92f07 100644
--- a/spec/controllers/sent_notifications_controller_spec.rb
+++ b/spec/controllers/sent_notifications_controller_spec.rb
@@ -69,7 +69,7 @@ describe SentNotificationsController do
         end
 
         it 'returns a 404' do
-          expect(response).to have_http_status(:not_found)
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
 
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index a22fd8eaf9b..55bd4352bd3 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -19,7 +19,7 @@ describe SessionsController do
         it 'redirects to :omniauth_authorize_path' do
           get(:new)
 
-          expect(response).to have_http_status(302)
+          expect(response).to have_gitlab_http_status(302)
           expect(response).to redirect_to('/saml')
         end
       end
@@ -28,7 +28,7 @@ describe SessionsController do
         it 'responds with 200' do
           get(:new, auto_sign_in: 'false')
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
diff --git a/spec/controllers/snippets/notes_controller_spec.rb b/spec/controllers/snippets/notes_controller_spec.rb
index 225753333ee..e6148ea1734 100644
--- a/spec/controllers/snippets/notes_controller_spec.rb
+++ b/spec/controllers/snippets/notes_controller_spec.rb
@@ -20,7 +20,7 @@ describe Snippets::NotesController do
       end
 
       it "returns status 200" do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it "returns not empty array of notes" do
@@ -37,7 +37,7 @@ describe Snippets::NotesController do
         it "returns status 404" do
           get :index, { snippet_id: internal_snippet }
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -49,7 +49,7 @@ describe Snippets::NotesController do
         it "returns status 200" do
           get :index, { snippet_id: internal_snippet }
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
@@ -63,7 +63,7 @@ describe Snippets::NotesController do
         it "returns status 404" do
           get :index, { snippet_id: private_snippet }
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -75,7 +75,7 @@ describe Snippets::NotesController do
         it "returns status 404" do
           get :index, { snippet_id: private_snippet }
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -89,7 +89,7 @@ describe Snippets::NotesController do
         it "returns status 200" do
           get :index, { snippet_id: private_snippet }
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         it "returns 1 note" do
@@ -134,7 +134,7 @@ describe Snippets::NotesController do
       it "returns status 200" do
         delete :destroy, request_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it "deletes the note" do
@@ -162,7 +162,7 @@ describe Snippets::NotesController do
       it "returns status 404" do
         delete :destroy, request_params
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "does not update the note" do
@@ -182,7 +182,7 @@ describe Snippets::NotesController do
     it "toggles the award emoji" do
       expect { subject }.to change { note.award_emoji.count }.by(1)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it "removes the already awarded emoji when it exists" do
@@ -190,7 +190,7 @@ describe Snippets::NotesController do
 
       expect { subject }.to change { AwardEmoji.count }.by(-1)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
   end
 end
diff --git a/spec/controllers/snippets_controller_spec.rb b/spec/controllers/snippets_controller_spec.rb
index be273acb69b..9effe47ab05 100644
--- a/spec/controllers/snippets_controller_spec.rb
+++ b/spec/controllers/snippets_controller_spec.rb
@@ -40,7 +40,7 @@ describe SnippetsController do
       it 'responds with status 200' do
         get :new
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -69,7 +69,7 @@ describe SnippetsController do
           it 'responds with status 404' do
             get :show, id: other_personal_snippet.to_param
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -78,7 +78,7 @@ describe SnippetsController do
             get :show, id: personal_snippet.to_param
 
             expect(assigns(:snippet)).to eq(personal_snippet)
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
       end
@@ -104,7 +104,7 @@ describe SnippetsController do
           get :show, id: personal_snippet.to_param
 
           expect(assigns(:snippet)).to eq(personal_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
 
@@ -129,7 +129,7 @@ describe SnippetsController do
           get :show, id: personal_snippet.to_param
 
           expect(assigns(:snippet)).to eq(personal_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
 
@@ -138,7 +138,7 @@ describe SnippetsController do
           get :show, id: personal_snippet.to_param
 
           expect(assigns(:snippet)).to eq(personal_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
@@ -152,7 +152,7 @@ describe SnippetsController do
         it 'responds with status 404' do
           get :show, id: 'doesntexist'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -432,7 +432,7 @@ describe SnippetsController do
           it 'responds with status 404' do
             get :raw, id: other_personal_snippet.to_param
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -443,7 +443,7 @@ describe SnippetsController do
 
           it 'responds with status 200' do
             expect(assigns(:snippet)).to eq(personal_snippet)
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it 'has expected headers' do
@@ -475,7 +475,7 @@ describe SnippetsController do
           get :raw, id: personal_snippet.to_param
 
           expect(assigns(:snippet)).to eq(personal_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
 
@@ -500,7 +500,7 @@ describe SnippetsController do
           get :raw, id: personal_snippet.to_param
 
           expect(assigns(:snippet)).to eq(personal_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         context 'CRLF line ending' do
@@ -527,7 +527,7 @@ describe SnippetsController do
           get :raw, id: personal_snippet.to_param
 
           expect(assigns(:snippet)).to eq(personal_snippet)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
@@ -541,7 +541,7 @@ describe SnippetsController do
         it 'responds with status 404' do
           get :raw, id: 'doesntexist'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index b29f3d861be..7e42e43345c 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -18,7 +18,7 @@ describe UploadsController do
       it "returns 401 when the user is not logged in" do
         post :create, model: model, id: snippet.id, format: :json
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       it "returns 404 when user can't comment on a snippet" do
@@ -27,7 +27,7 @@ describe UploadsController do
         sign_in(user)
         post :create, model: model, id: private_snippet.id, format: :json
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -39,7 +39,7 @@ describe UploadsController do
       it "returns an error without file" do
         post :create, model: model, id: snippet.id, format: :json
 
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
 
       it "returns an error with invalid model" do
@@ -50,7 +50,7 @@ describe UploadsController do
       it "returns 404 status when object not found" do
         post :create, model: model, id: 9999, format: :json
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       context 'with valid image' do
@@ -174,7 +174,7 @@ describe UploadsController do
           it "responds with status 200" do
             get :show, model: "user", mounted_as: "avatar", id: user.id, filename: "image.png"
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
@@ -190,7 +190,7 @@ describe UploadsController do
         it "responds with status 200" do
           get :show, model: "user", mounted_as: "avatar", id: user.id, filename: "image.png"
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         it_behaves_like 'content not cached without revalidation' do
@@ -214,7 +214,7 @@ describe UploadsController do
           it "responds with status 200" do
             get :show, model: "project", mounted_as: "avatar", id: project.id, filename: "image.png"
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
@@ -233,7 +233,7 @@ describe UploadsController do
           it "responds with status 200" do
             get :show, model: "project", mounted_as: "avatar", id: project.id, filename: "image.png"
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
@@ -285,7 +285,7 @@ describe UploadsController do
               it "responds with status 200" do
                 get :show, model: "project", mounted_as: "avatar", id: project.id, filename: "image.png"
 
-                expect(response).to have_http_status(200)
+                expect(response).to have_gitlab_http_status(200)
               end
 
               it_behaves_like 'content not cached without revalidation' do
@@ -301,7 +301,7 @@ describe UploadsController do
             it "responds with status 404" do
               get :show, model: "project", mounted_as: "avatar", id: project.id, filename: "image.png"
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
           end
         end
@@ -316,7 +316,7 @@ describe UploadsController do
           it "responds with status 200" do
             get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
@@ -335,7 +335,7 @@ describe UploadsController do
           it "responds with status 200" do
             get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
@@ -378,7 +378,7 @@ describe UploadsController do
               it "responds with status 200" do
                 get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
 
-                expect(response).to have_http_status(200)
+                expect(response).to have_gitlab_http_status(200)
               end
 
               it_behaves_like 'content not cached without revalidation' do
@@ -394,7 +394,7 @@ describe UploadsController do
             it "responds with status 404" do
               get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
           end
         end
@@ -414,7 +414,7 @@ describe UploadsController do
           it "responds with status 200" do
             get :show, model: "note", mounted_as: "attachment", id: note.id, filename: "image.png"
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
@@ -433,7 +433,7 @@ describe UploadsController do
           it "responds with status 200" do
             get :show, model: "note", mounted_as: "attachment", id: note.id, filename: "image.png"
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
@@ -485,7 +485,7 @@ describe UploadsController do
               it "responds with status 200" do
                 get :show, model: "note", mounted_as: "attachment", id: note.id, filename: "image.png"
 
-                expect(response).to have_http_status(200)
+                expect(response).to have_gitlab_http_status(200)
               end
 
               it_behaves_like 'content not cached without revalidation' do
@@ -501,7 +501,7 @@ describe UploadsController do
             it "responds with status 404" do
               get :show, model: "note", mounted_as: "attachment", id: note.id, filename: "image.png"
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
           end
         end
@@ -516,7 +516,7 @@ describe UploadsController do
           it 'responds with status 200' do
             get :show, model: 'appearance', mounted_as: 'header_logo', id: appearance.id, filename: 'dk.png'
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
@@ -535,7 +535,7 @@ describe UploadsController do
           it 'responds with status 200' do
             get :show, model: 'appearance', mounted_as: 'logo', id: appearance.id, filename: 'dk.png'
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it_behaves_like 'content not cached without revalidation' do
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 2cecd2646fc..01ab59aa363 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -24,7 +24,7 @@ describe UsersController do
         it 'renders the show template' do
           get :show, username: user.username
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to render_template('show')
         end
       end
@@ -49,7 +49,7 @@ describe UsersController do
 
         it 'renders show' do
           get :show, username: user.username
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to render_template('show')
         end
       end
@@ -70,7 +70,7 @@ describe UsersController do
 
         it 'renders 404' do
           get :show, username: 'nonexistent'
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -82,7 +82,7 @@ describe UsersController do
 
       get :calendar, username: user.username, format: :json
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     context 'forked project' do
@@ -139,7 +139,7 @@ describe UsersController do
     context 'format html' do
       it 'renders snippets page' do
         get :snippets, username: user.username
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to render_template('show')
       end
     end
@@ -147,7 +147,7 @@ describe UsersController do
     context 'format json' do
       it 'response with snippets json data' do
         get :snippets, username: user.username, format: :json
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(JSON.parse(response.body)).to have_key('html')
       end
     end
diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb
index d03ddfece74..ca2225318cd 100644
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -83,7 +83,6 @@ feature 'Merge request created from fork' do
       page.within('.merge-request-tabs') { click_link 'Pipelines' }
 
       page.within('.ci-table') do
-        expect(page).to have_content pipeline.status
         expect(page).to have_content pipeline.id
       end
     end
diff --git a/spec/features/profiles/chat_names_spec.rb b/spec/features/profiles/chat_names_spec.rb
index 35793539e0e..5c959acbbc9 100644
--- a/spec/features/profiles/chat_names_spec.rb
+++ b/spec/features/profiles/chat_names_spec.rb
@@ -33,7 +33,7 @@ feature 'Profile > Chat' do
       scenario 'second use of link is denied' do
         visit authorize_path
 
-        expect(page).to have_http_status(:not_found)
+        expect(page).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -51,7 +51,7 @@ feature 'Profile > Chat' do
       scenario 'second use of link is denied' do
         visit authorize_path
 
-        expect(page).to have_http_status(:not_found)
+        expect(page).to have_gitlab_http_status(:not_found)
       end
     end
   end
diff --git a/spec/features/profiles/password_spec.rb b/spec/features/profiles/password_spec.rb
index 225d4c16841..fb4355074df 100644
--- a/spec/features/profiles/password_spec.rb
+++ b/spec/features/profiles/password_spec.rb
@@ -58,7 +58,7 @@ describe 'Profile > Password' do
 
         visit edit_profile_password_path
 
-        expect(page).to have_http_status(200)
+        expect(page).to have_gitlab_http_status(200)
       end
     end
 
@@ -68,7 +68,7 @@ describe 'Profile > Password' do
       it 'renders 404' do
         visit edit_profile_password_path
 
-        expect(page).to have_http_status(404)
+        expect(page).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/features/projects/badges/coverage_spec.rb b/spec/features/projects/badges/coverage_spec.rb
index 368a046f741..c68e10a2563 100644
--- a/spec/features/projects/badges/coverage_spec.rb
+++ b/spec/features/projects/badges/coverage_spec.rb
@@ -50,7 +50,7 @@ feature 'test coverage badge' do
     scenario 'user requests test coverage badge image' do
       show_test_coverage_badge
 
-      expect(page).to have_http_status(404)
+      expect(page).to have_gitlab_http_status(404)
     end
   end
 
diff --git a/spec/features/projects/commit/builds_spec.rb b/spec/features/projects/commit/builds_spec.rb
index 9c57626ea1d..79e84a4f0a6 100644
--- a/spec/features/projects/commit/builds_spec.rb
+++ b/spec/features/projects/commit/builds_spec.rb
@@ -20,7 +20,6 @@ feature 'project commit pipelines', :js do
       visit pipelines_project_commit_path(project, project.commit.sha)
 
       page.within('.table-holder') do
-        expect(page).to have_content project.pipelines[0].status # pipeline status
         expect(page).to have_content project.pipelines[0].id     # pipeline ids
       end
     end
diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb
index 56addd64056..0fe1eb4c293 100644
--- a/spec/features/projects/environments/environment_spec.rb
+++ b/spec/features/projects/environments/environment_spec.rb
@@ -198,7 +198,7 @@ feature 'Environment' do
       end
 
       it 'renders a correct environment folder' do
-        expect(page).to have_http_status(:ok)
+        expect(page).to have_gitlab_http_status(:ok)
         expect(page).to have_content('Environments / staging-1.0')
       end
     end
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 576870ea0f3..b095c3e6f7b 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -396,7 +396,7 @@ feature 'Jobs' do
       end
 
       it 'shows the right status and buttons', :js do
-        expect(page).to have_http_status(200)
+        expect(page).to have_gitlab_http_status(200)
         page.within('aside.right-sidebar') do
           expect(page).to have_content 'Cancel'
         end
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index c35b0840248..ae888fd4343 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -525,7 +525,7 @@ describe 'Pipelines', :js do
       let(:project) { create(:project, :public, :repository) }
 
       it { expect(page).to have_content 'Build with confidence' }
-      it { expect(page).to have_http_status(:success) }
+      it { expect(page).to have_gitlab_http_status(:success) }
     end
 
     context 'when project is private' do
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb
new file mode 100644
index 00000000000..4c1fa5a666e
--- /dev/null
+++ b/spec/features/projects/tree/create_directory_spec.rb
@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+feature 'Multi-file editor new directory', :js do
+  include WaitForRequests
+
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository) }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    page.driver.set_cookie('new_repo', 'true')
+
+    visit project_tree_path(project, :master)
+
+    wait_for_requests
+  end
+
+  it 'creates directory in current directory' do
+    find('.add-to-tree').click
+
+    click_link('New directory')
+
+    page.within('.popup-dialog') do
+      find('.form-control').set('foldername')
+
+      click_button('Create directory')
+    end
+
+    fill_in('commit-message', with: 'commit message')
+
+    click_button('Commit 1 file')
+
+    expect(page).to have_content('Your changes have been committed')
+    expect(page).to have_selector('td', text: 'commit message')
+
+    click_link('foldername')
+
+    expect(page).to have_selector('td', text: 'commit message', count: 2)
+    expect(page).to have_selector('td', text: '.gitkeep')
+  end
+end
diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb
new file mode 100644
index 00000000000..a67ec891e7c
--- /dev/null
+++ b/spec/features/projects/tree/create_file_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+feature 'Multi-file editor new file', :js do
+  include WaitForRequests
+
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository) }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    page.driver.set_cookie('new_repo', 'true')
+
+    visit project_tree_path(project, :master)
+
+    wait_for_requests
+  end
+
+  it 'creates file in current directory' do
+    find('.add-to-tree').click
+
+    click_link('New file')
+
+    page.within('.popup-dialog') do
+      find('.form-control').set('filename')
+
+      click_button('Create file')
+    end
+
+    find('.inputarea').send_keys('file content')
+
+    fill_in('commit-message', with: 'commit message')
+
+    click_button('Commit 1 file')
+
+    expect(page).to have_content('Your changes have been committed')
+    expect(page).to have_selector('td', text: 'commit message')
+  end
+end
diff --git a/spec/finders/branches_finder_spec.rb b/spec/finders/branches_finder_spec.rb
index 91f34973ba5..9e3f2c69606 100644
--- a/spec/finders/branches_finder_spec.rb
+++ b/spec/finders/branches_finder_spec.rb
@@ -46,6 +46,15 @@ describe BranchesFinder do
         expect(result.count).to eq(1)
       end
 
+      it 'filters branches by name ignoring letter case' do
+        branches_finder = described_class.new(repository, { search: 'FiX' })
+
+        result = branches_finder.execute
+
+        expect(result.first.name).to eq('fix')
+        expect(result.count).to eq(1)
+      end
+
       it 'does not find any branch with that name' do
         branches_finder = described_class.new(repository, { search: 'random' })
 
diff --git a/spec/fixtures/api/schemas/public_api/v4/pages_domains.json b/spec/fixtures/api/schemas/public_api/v4/pages_domains.json
new file mode 100644
index 00000000000..0de1d0f1228
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/pages_domains.json
@@ -0,0 +1,23 @@
+{
+  "type": "array",
+  "items": {
+    "type": "object",
+    "properties": {
+      "domain": { "type": "string" },
+      "url": { "type": "uri" },
+      "certificate": {
+        "type": "object",
+        "properties": {
+          "subject": { "type": "string" },
+          "expired": { "type": "boolean" },
+          "certificate": { "type": "string" },
+          "certificate_text": { "type": "string" }
+        },
+        "required": ["subject", "expired"],
+        "additionalProperties": false
+      }
+    },
+    "required": ["domain", "url"],
+    "additionalProperties": false
+  }
+}
diff --git a/spec/javascripts/helpers/vue_mount_component_helper.js b/spec/javascripts/helpers/vue_mount_component_helper.js
index d7a2e86771c..b71136c4114 100644
--- a/spec/javascripts/helpers/vue_mount_component_helper.js
+++ b/spec/javascripts/helpers/vue_mount_component_helper.js
@@ -1,4 +1,3 @@
-export default (Component, props = {}) => new Component({
+export default (Component, props = {}, el = null) => new Component({
   propsData: props,
-}).$mount();
-
+}).$mount(el);
diff --git a/spec/javascripts/pipelines/pipelines_table_row_spec.js b/spec/javascripts/pipelines/pipelines_table_row_spec.js
index d7456a48bc1..a9126d2f4e9 100644
--- a/spec/javascripts/pipelines/pipelines_table_row_spec.js
+++ b/spec/javascripts/pipelines/pipelines_table_row_spec.js
@@ -10,6 +10,7 @@ describe('Pipelines Table Row', () => {
       propsData: {
         pipeline,
         autoDevopsHelpPath: 'foo',
+        viewType: 'root',
       },
     }).$mount();
   };
diff --git a/spec/javascripts/pipelines/pipelines_table_spec.js b/spec/javascripts/pipelines/pipelines_table_spec.js
index 4f5eb42eb35..ca2f9163313 100644
--- a/spec/javascripts/pipelines/pipelines_table_spec.js
+++ b/spec/javascripts/pipelines/pipelines_table_spec.js
@@ -23,6 +23,7 @@ describe('Pipelines Table', () => {
         propsData: {
           pipelines: [],
           autoDevopsHelpPath: 'foo',
+          viewType: 'root',
         },
       }).$mount();
     });
@@ -49,6 +50,7 @@ describe('Pipelines Table', () => {
         propsData: {
           pipelines: [],
           autoDevopsHelpPath: 'foo',
+          viewType: 'root',
         },
       }).$mount();
       expect(component.$el.querySelectorAll('.commit.gl-responsive-table-row').length).toEqual(0);
@@ -61,6 +63,7 @@ describe('Pipelines Table', () => {
         propsData: {
           pipelines: [pipeline],
           autoDevopsHelpPath: 'foo',
+          viewType: 'root',
         },
       }).$mount();
 
diff --git a/spec/javascripts/repo/components/new_dropdown/index_spec.js b/spec/javascripts/repo/components/new_dropdown/index_spec.js
new file mode 100644
index 00000000000..ddbfdab582d
--- /dev/null
+++ b/spec/javascripts/repo/components/new_dropdown/index_spec.js
@@ -0,0 +1,191 @@
+import Vue from 'vue';
+import newDropdown from '~/repo/components/new_dropdown/index.vue';
+import RepoStore from '~/repo/stores/repo_store';
+import RepoHelper from '~/repo/helpers/repo_helper';
+import eventHub from '~/repo/event_hub';
+import createComponent from '../../../helpers/vue_mount_component_helper';
+
+describe('new dropdown component', () => {
+  let vm;
+
+  beforeEach(() => {
+    const component = Vue.extend(newDropdown);
+
+    vm = createComponent(component);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+
+    RepoStore.files = [];
+    RepoStore.openedFiles = [];
+    RepoStore.setViewToPreview();
+  });
+
+  it('renders new file and new directory links', () => {
+    expect(vm.$el.querySelectorAll('a')[0].textContent.trim()).toBe('New file');
+    expect(vm.$el.querySelectorAll('a')[1].textContent.trim()).toBe('New directory');
+  });
+
+  describe('createNewItem', () => {
+    it('sets modalType to blob when new file is clicked', () => {
+      vm.$el.querySelectorAll('a')[0].click();
+
+      expect(vm.modalType).toBe('blob');
+    });
+
+    it('sets modalType to tree when new directory is clicked', () => {
+      vm.$el.querySelectorAll('a')[1].click();
+
+      expect(vm.modalType).toBe('tree');
+    });
+
+    it('opens modal when link is clicked', (done) => {
+      vm.$el.querySelectorAll('a')[0].click();
+
+      Vue.nextTick(() => {
+        expect(vm.$el.querySelector('.modal')).not.toBeNull();
+
+        done();
+      });
+    });
+  });
+
+  describe('toggleModalOpen', () => {
+    it('closes modal after toggling', (done) => {
+      vm.toggleModalOpen();
+
+      Vue.nextTick()
+        .then(() => {
+          expect(vm.$el.querySelector('.modal')).not.toBeNull();
+        })
+        .then(vm.toggleModalOpen)
+        .then(() => {
+          expect(vm.$el.querySelector('.modal')).toBeNull();
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+
+  describe('createEntryInStore', () => {
+    ['tree', 'blob'].forEach((type) => {
+      describe(type, () => {
+        it('closes modal after creating file', () => {
+          vm.openModal = true;
+
+          eventHub.$emit('createNewEntry', 'testing', type);
+
+          expect(vm.openModal).toBeFalsy();
+        });
+
+        it('sets editMode to true', () => {
+          eventHub.$emit('createNewEntry', 'testing', type);
+
+          expect(RepoStore.editMode).toBeTruthy();
+        });
+
+        it('toggles blob view', () => {
+          eventHub.$emit('createNewEntry', 'testing', type);
+
+          expect(RepoStore.isPreviewView()).toBeFalsy();
+        });
+
+        it('adds file into activeFiles', () => {
+          eventHub.$emit('createNewEntry', 'testing', type);
+
+          expect(RepoStore.openedFiles.length).toBe(1);
+        });
+
+        it(`creates ${type} in the current stores path`, () => {
+          RepoStore.path = 'testing';
+
+          eventHub.$emit('createNewEntry', 'testing/app', type);
+
+          expect(RepoStore.files[0].path).toBe('testing/app');
+          expect(RepoStore.files[0].name).toBe('app');
+
+          if (type === 'tree') {
+            expect(RepoStore.files[0].files.length).toBe(1);
+          }
+
+          RepoStore.path = '';
+        });
+      });
+    });
+
+    describe('file', () => {
+      it('creates new file', () => {
+        eventHub.$emit('createNewEntry', 'testing', 'blob');
+
+        expect(RepoStore.files.length).toBe(1);
+        expect(RepoStore.files[0].name).toBe('testing');
+        expect(RepoStore.files[0].type).toBe('blob');
+        expect(RepoStore.files[0].tempFile).toBeTruthy();
+      });
+
+      it('does not create temp file when file already exists', () => {
+        RepoStore.files.push(RepoHelper.serializeRepoEntity('blob', {
+          name: 'testing',
+        }));
+
+        eventHub.$emit('createNewEntry', 'testing', 'blob');
+
+        expect(RepoStore.files.length).toBe(1);
+        expect(RepoStore.files[0].name).toBe('testing');
+        expect(RepoStore.files[0].type).toBe('blob');
+        expect(RepoStore.files[0].tempFile).toBeUndefined();
+      });
+    });
+
+    describe('tree', () => {
+      it('creates new tree', () => {
+        eventHub.$emit('createNewEntry', 'testing', 'tree');
+
+        expect(RepoStore.files.length).toBe(1);
+        expect(RepoStore.files[0].name).toBe('testing');
+        expect(RepoStore.files[0].type).toBe('tree');
+        expect(RepoStore.files[0].tempFile).toBeTruthy();
+        expect(RepoStore.files[0].files.length).toBe(1);
+        expect(RepoStore.files[0].files[0].name).toBe('.gitkeep');
+      });
+
+      it('creates multiple trees when entryName has slashes', () => {
+        eventHub.$emit('createNewEntry', 'app/test', 'tree');
+
+        expect(RepoStore.files.length).toBe(1);
+        expect(RepoStore.files[0].name).toBe('app');
+        expect(RepoStore.files[0].files[0].name).toBe('test');
+        expect(RepoStore.files[0].files[0].files[0].name).toBe('.gitkeep');
+      });
+
+      it('creates tree in existing tree', () => {
+        RepoStore.files.push(RepoHelper.serializeRepoEntity('tree', {
+          name: 'app',
+        }));
+
+        eventHub.$emit('createNewEntry', 'app/test', 'tree');
+
+        expect(RepoStore.files.length).toBe(1);
+        expect(RepoStore.files[0].name).toBe('app');
+        expect(RepoStore.files[0].tempFile).toBeUndefined();
+        expect(RepoStore.files[0].files[0].tempFile).toBeTruthy();
+        expect(RepoStore.files[0].files[0].name).toBe('test');
+        expect(RepoStore.files[0].files[0].files[0].name).toBe('.gitkeep');
+      });
+
+      it('does not create new tree when already exists', () => {
+        RepoStore.files.push(RepoHelper.serializeRepoEntity('tree', {
+          name: 'app',
+        }));
+
+        eventHub.$emit('createNewEntry', 'app', 'tree');
+
+        expect(RepoStore.files.length).toBe(1);
+        expect(RepoStore.files[0].name).toBe('app');
+        expect(RepoStore.files[0].tempFile).toBeUndefined();
+        expect(RepoStore.files[0].files.length).toBe(0);
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/repo/components/new_dropdown/modal_spec.js b/spec/javascripts/repo/components/new_dropdown/modal_spec.js
new file mode 100644
index 00000000000..4c5cdc47c6e
--- /dev/null
+++ b/spec/javascripts/repo/components/new_dropdown/modal_spec.js
@@ -0,0 +1,76 @@
+import Vue from 'vue';
+import RepoStore from '~/repo/stores/repo_store';
+import modal from '~/repo/components/new_dropdown/modal.vue';
+import eventHub from '~/repo/event_hub';
+import createComponent from '../../../helpers/vue_mount_component_helper';
+
+describe('new file modal component', () => {
+  const Component = Vue.extend(modal);
+  let vm;
+
+  afterEach(() => {
+    vm.$destroy();
+
+    RepoStore.files = [];
+    RepoStore.openedFiles = [];
+    RepoStore.setViewToPreview();
+  });
+
+  ['tree', 'blob'].forEach((type) => {
+    describe(type, () => {
+      beforeEach(() => {
+        vm = createComponent(Component, {
+          type,
+          currentPath: RepoStore.path,
+        });
+      });
+
+      it(`sets modal title as ${type}`, () => {
+        const title = type === 'tree' ? 'directory' : 'file';
+
+        expect(vm.$el.querySelector('.modal-title').textContent.trim()).toBe(`Create new ${title}`);
+      });
+
+      it(`sets button label as ${type}`, () => {
+        const title = type === 'tree' ? 'directory' : 'file';
+
+        expect(vm.$el.querySelector('.btn-success').textContent.trim()).toBe(`Create ${title}`);
+      });
+
+      it(`sets form label as ${type}`, () => {
+        const title = type === 'tree' ? 'Directory' : 'File';
+
+        expect(vm.$el.querySelector('.label-light').textContent.trim()).toBe(`${title} name`);
+      });
+    });
+  });
+
+  it('focuses field on mount', () => {
+    document.body.innerHTML += '<div class="js-test"></div>';
+
+    vm = createComponent(Component, {
+      type: 'tree',
+      currentPath: RepoStore.path,
+    }, '.js-test');
+
+    expect(document.activeElement).toBe(vm.$refs.fieldName);
+
+    vm.$el.remove();
+  });
+
+  describe('createEntryInStore', () => {
+    it('emits createNewEntry event', () => {
+      spyOn(eventHub, '$emit');
+
+      vm = createComponent(Component, {
+        type: 'tree',
+        currentPath: RepoStore.path,
+      });
+      vm.entryName = 'testing';
+
+      vm.createEntryInStore();
+
+      expect(eventHub.$emit).toHaveBeenCalledWith('createNewEntry', 'testing', 'tree');
+    });
+  });
+});
diff --git a/spec/javascripts/repo/components/repo_file_buttons_spec.js b/spec/javascripts/repo/components/repo_file_buttons_spec.js
index 701c260224f..111c83ee50d 100644
--- a/spec/javascripts/repo/components/repo_file_buttons_spec.js
+++ b/spec/javascripts/repo/components/repo_file_buttons_spec.js
@@ -3,6 +3,15 @@ import repoFileButtons from '~/repo/components/repo_file_buttons.vue';
 import RepoStore from '~/repo/stores/repo_store';
 
 describe('RepoFileButtons', () => {
+  const activeFile = {
+    extension: 'md',
+    url: 'url',
+    raw_path: 'raw_path',
+    blame_path: 'blame_path',
+    commits_path: 'commits_path',
+    permalink: 'permalink',
+  };
+
   function createComponent() {
     const RepoFileButtons = Vue.extend(repoFileButtons);
 
@@ -14,14 +23,6 @@ describe('RepoFileButtons', () => {
   });
 
   it('renders Raw, Blame, History, Permalink and Preview toggle', () => {
-    const activeFile = {
-      extension: 'md',
-      url: 'url',
-      raw_path: 'raw_path',
-      blame_path: 'blame_path',
-      commits_path: 'commits_path',
-      permalink: 'permalink',
-    };
     const activeFileLabel = 'activeFileLabel';
     RepoStore.openedFiles = new Array(1);
     RepoStore.activeFile = activeFile;
@@ -34,7 +35,6 @@ describe('RepoFileButtons', () => {
     const blame = vm.$el.querySelector('.blame');
     const history = vm.$el.querySelector('.history');
 
-    expect(vm.$el.id).toEqual('repo-file-buttons');
     expect(raw.href).toMatch(`/${activeFile.raw_path}`);
     expect(raw.textContent.trim()).toEqual('Raw');
     expect(blame.href).toMatch(`/${activeFile.blame_path}`);
@@ -46,10 +46,6 @@ describe('RepoFileButtons', () => {
   });
 
   it('triggers rawPreviewToggle on preview click', () => {
-    const activeFile = {
-      extension: 'md',
-      url: 'url',
-    };
     RepoStore.openedFiles = new Array(1);
     RepoStore.activeFile = activeFile;
     RepoStore.editMode = true;
@@ -65,10 +61,7 @@ describe('RepoFileButtons', () => {
   });
 
   it('does not render preview toggle if not canPreview', () => {
-    const activeFile = {
-      extension: 'abcd',
-      url: 'url',
-    };
+    activeFile.extension = 'js';
     RepoStore.openedFiles = new Array(1);
     RepoStore.activeFile = activeFile;
 
diff --git a/spec/javascripts/repo/components/repo_file_spec.js b/spec/javascripts/repo/components/repo_file_spec.js
index 107f6797f8a..8403df9be64 100644
--- a/spec/javascripts/repo/components/repo_file_spec.js
+++ b/spec/javascripts/repo/components/repo_file_spec.js
@@ -7,6 +7,7 @@ import { file } from '../mock_data';
 describe('RepoFile', () => {
   const updated = 'updated';
   const otherFile = {
+    id: 'test',
     html: '<p class="file-content">html</p>',
     pageTitle: 'otherpageTitle',
   };
diff --git a/spec/javascripts/vue_shared/components/ci_badge_link_spec.js b/spec/javascripts/vue_shared/components/ci_badge_link_spec.js
index daed4da3e15..ba303738f71 100644
--- a/spec/javascripts/vue_shared/components/ci_badge_link_spec.js
+++ b/spec/javascripts/vue_shared/components/ci_badge_link_spec.js
@@ -1,8 +1,10 @@
 import Vue from 'vue';
 import ciBadge from '~/vue_shared/components/ci_badge_link.vue';
+import mountComponent from '../../helpers/vue_mount_component_helper';
 
 describe('CI Badge Link Component', () => {
   let CIBadge;
+  let vm;
 
   const statuses = {
     canceled: {
@@ -70,15 +72,17 @@ describe('CI Badge Link Component', () => {
     },
   };
 
-  it('should render each status badge', () => {
+  beforeEach(() => {
     CIBadge = Vue.extend(ciBadge);
-    Object.keys(statuses).map((status) => {
-      const vm = new CIBadge({
-        propsData: {
-          status: statuses[status],
-        },
-      }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
 
+  it('should render each status badge', () => {
+    Object.keys(statuses).map((status) => {
+      vm = mountComponent(CIBadge, { status: statuses[status] });
       expect(vm.$el.getAttribute('href')).toEqual(statuses[status].details_path);
       expect(vm.$el.textContent.trim()).toEqual(statuses[status].text);
       expect(vm.$el.getAttribute('class')).toEqual(`ci-status ci-${statuses[status].group}`);
@@ -86,4 +90,9 @@ describe('CI Badge Link Component', () => {
       return vm;
     });
   });
+
+  it('should not render label', () => {
+    vm = mountComponent(CIBadge, { status: statuses.canceled, showText: false });
+    expect(vm.$el.textContent.trim()).toEqual('');
+  });
 });
diff --git a/spec/lib/gitlab/app_logger_spec.rb b/spec/lib/gitlab/app_logger_spec.rb
new file mode 100644
index 00000000000..c86d30ce6df
--- /dev/null
+++ b/spec/lib/gitlab/app_logger_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Gitlab::AppLogger, :request_store do
+  subject { described_class }
+
+  it 'builds a logger once' do
+    expect(::Logger).to receive(:new).and_call_original
+
+    subject.info('hello world')
+    subject.error('hello again')
+  end
+end
diff --git a/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb b/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
index c8d532df059..72dabca793a 100644
--- a/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
+++ b/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
@@ -79,7 +79,9 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
       stub_application_setting(circuitbreaker_failure_count_threshold: 0,
                                circuitbreaker_failure_wait_time: 1,
                                circuitbreaker_failure_reset_time: 2,
-                               circuitbreaker_storage_timeout: 3)
+                               circuitbreaker_storage_timeout: 3,
+                               circuitbreaker_access_retries: 4,
+                               circuitbreaker_backoff_threshold: 5)
     end
 
     describe '#failure_count_threshold' do
@@ -105,14 +107,43 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
         expect(circuit_breaker.storage_timeout).to eq(3)
       end
     end
+
+    describe '#access_retries' do
+      it 'reads the value from settings' do
+        expect(circuit_breaker.access_retries).to eq(4)
+      end
+    end
+
+    describe '#backoff_threshold' do
+      it 'reads the value from settings' do
+        expect(circuit_breaker.backoff_threshold).to eq(5)
+      end
+    end
   end
 
   describe '#perform' do
-    it 'raises an exception with retry time when the circuit is open' do
-      allow(circuit_breaker).to receive(:circuit_broken?).and_return(true)
+    it 'raises the correct exception when the circuit is open' do
+      set_in_redis(:last_failure, 1.day.ago.to_f)
+      set_in_redis(:failure_count, 999)
 
       expect { |b| circuit_breaker.perform(&b) }
-        .to raise_error(Gitlab::Git::Storage::CircuitOpen)
+        .to raise_error do |exception|
+        expect(exception).to be_kind_of(Gitlab::Git::Storage::CircuitOpen)
+        expect(exception.retry_after).to eq(1800)
+      end
+    end
+
+    it 'raises the correct exception when backing off' do
+      Timecop.freeze do
+        set_in_redis(:last_failure, 1.second.ago.to_f)
+        set_in_redis(:failure_count, 90)
+
+        expect { |b| circuit_breaker.perform(&b) }
+          .to raise_error do |exception|
+          expect(exception).to be_kind_of(Gitlab::Git::Storage::Failing)
+          expect(exception.retry_after).to eq(30)
+        end
+      end
     end
 
     it 'yields the block' do
@@ -122,6 +153,7 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
 
     it 'checks if the storage is available' do
       expect(circuit_breaker).to receive(:check_storage_accessible!)
+                                   .and_call_original
 
       circuit_breaker.perform { 'hello world' }
     end
@@ -137,201 +169,124 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
         .to raise_error(Rugged::OSError)
     end
 
-    context 'with the feature disabled' do
-      it 'returns the block without checking accessibility' do
-        stub_feature_flags(git_storage_circuit_breaker: false)
-
-        expect(circuit_breaker).not_to receive(:circuit_broken?)
+    it 'tracks that the storage was accessible' do
+      set_in_redis(:failure_count, 10)
+      set_in_redis(:last_failure, Time.now.to_f)
 
-        result = circuit_breaker.perform { 'hello' }
+      circuit_breaker.perform { '' }
 
-        expect(result).to eq('hello')
-      end
+      expect(value_from_redis(:failure_count).to_i).to eq(0)
+      expect(value_from_redis(:last_failure)).to be_empty
+      expect(circuit_breaker.failure_count).to eq(0)
+      expect(circuit_breaker.last_failure).to be_nil
     end
-  end
 
-  describe '#circuit_broken?' do
-    it 'is working when there is no last failure' do
-      set_in_redis(:last_failure, nil)
-      set_in_redis(:failure_count, 0)
+    it 'only performs the accessibility check once' do
+      expect(Gitlab::Git::Storage::ForkedStorageCheck)
+        .to receive(:storage_available?).once.and_call_original
 
-      expect(circuit_breaker.circuit_broken?).to be_falsey
+      2.times { circuit_breaker.perform { '' } }
     end
 
-    it 'is broken when there was a recent failure' do
-      Timecop.freeze do
-        set_in_redis(:last_failure, 1.second.ago.to_f)
-        set_in_redis(:failure_count, 1)
+    it 'calls the check with the correct arguments' do
+      stub_application_setting(circuitbreaker_storage_timeout: 30,
+                               circuitbreaker_access_retries: 3)
 
-        expect(circuit_breaker.circuit_broken?).to be_truthy
-      end
-    end
+      expect(Gitlab::Git::Storage::ForkedStorageCheck)
+        .to receive(:storage_available?).with(TestEnv.repos_path, 30, 3)
+              .and_call_original
 
-    it 'is broken when there are too many failures' do
-      set_in_redis(:last_failure, 1.day.ago.to_f)
-      set_in_redis(:failure_count, 200)
-
-      expect(circuit_breaker.circuit_broken?).to be_truthy
+      circuit_breaker.perform { '' }
     end
 
-    context 'the `failure_wait_time` is set to 0' do
+    context 'with the feature disabled' do
       before do
-        stub_application_setting(circuitbreaker_failure_wait_time: 0)
-      end
-
-      it 'is working even when there is a recent failure' do
-        Timecop.freeze do
-          set_in_redis(:last_failure, 0.seconds.ago.to_f)
-          set_in_redis(:failure_count, 1)
-
-          expect(circuit_breaker.circuit_broken?).to be_falsey
-        end
+        stub_feature_flags(git_storage_circuit_breaker: false)
       end
-    end
-  end
 
-  describe "storage_available?" do
-    context 'the storage is available' do
-      it 'tracks that the storage was accessible an raises the error' do
-        expect(circuit_breaker).to receive(:track_storage_accessible)
-
-        circuit_breaker.storage_available?
-      end
+      it 'returns the block without checking accessibility' do
+        expect(circuit_breaker).not_to receive(:check_storage_accessible!)
 
-      it 'only performs the check once' do
-        expect(Gitlab::Git::Storage::ForkedStorageCheck)
-          .to receive(:storage_available?).once.and_call_original
+        result = circuit_breaker.perform { 'hello' }
 
-        2.times { circuit_breaker.storage_available? }
+        expect(result).to eq('hello')
       end
-    end
-
-    context 'storage is not available' do
-      let(:storage_name) { 'broken' }
-
-      it 'tracks that the storage was inaccessible' do
-        expect(circuit_breaker).to receive(:track_storage_inaccessible)
 
-        circuit_breaker.storage_available?
-      end
-    end
-  end
+      it 'allows enabling the feature using an ENV var' do
+        stub_env('GIT_STORAGE_CIRCUIT_BREAKER', 'true')
+        expect(circuit_breaker).to receive(:check_storage_accessible!)
 
-  describe '#check_storage_accessible!' do
-    it 'raises an exception with retry time when the circuit is open' do
-      allow(circuit_breaker).to receive(:circuit_broken?).and_return(true)
+        result = circuit_breaker.perform { 'hello' }
 
-      expect { circuit_breaker.check_storage_accessible! }
-        .to raise_error do |exception|
-        expect(exception).to be_kind_of(Gitlab::Git::Storage::CircuitOpen)
-        expect(exception.retry_after).to eq(30)
+        expect(result).to eq('hello')
       end
     end
 
     context 'the storage is not available' do
       let(:storage_name) { 'broken' }
 
-      it 'raises an error' do
+      it 'raises the correct exception' do
         expect(circuit_breaker).to receive(:track_storage_inaccessible)
 
-        expect { circuit_breaker.check_storage_accessible! }
+        expect { circuit_breaker.perform { '' } }
           .to raise_error do |exception|
           expect(exception).to be_kind_of(Gitlab::Git::Storage::Inaccessible)
           expect(exception.retry_after).to eq(30)
         end
       end
-    end
-  end
-
-  describe '#track_storage_inaccessible' do
-    around do |example|
-      Timecop.freeze { example.run }
-    end
-
-    it 'records the failure time in redis' do
-      circuit_breaker.track_storage_inaccessible
-
-      failure_time = value_from_redis(:last_failure)
 
-      expect(Time.at(failure_time.to_i)).to be_within(1.second).of(Time.now)
-    end
-
-    it 'sets the failure time on the breaker without reloading' do
-      circuit_breaker.track_storage_inaccessible
-
-      expect(circuit_breaker).not_to receive(:get_failure_info)
-      expect(circuit_breaker.last_failure).to eq(Time.now)
-    end
-
-    it 'increments the failure count in redis' do
-      set_in_redis(:failure_count, 10)
-
-      circuit_breaker.track_storage_inaccessible
-
-      expect(value_from_redis(:failure_count).to_i).to be(11)
-    end
-
-    it 'increments the failure count on the breaker without reloading' do
-      set_in_redis(:failure_count, 10)
-
-      circuit_breaker.track_storage_inaccessible
+      it 'tracks that the storage was inaccessible' do
+        Timecop.freeze do
+          expect { circuit_breaker.perform { '' } }.to raise_error(Gitlab::Git::Storage::Inaccessible)
 
-      expect(circuit_breaker).not_to receive(:get_failure_info)
-      expect(circuit_breaker.failure_count).to eq(11)
+          expect(value_from_redis(:failure_count).to_i).to eq(1)
+          expect(value_from_redis(:last_failure)).not_to be_empty
+          expect(circuit_breaker.failure_count).to eq(1)
+          expect(circuit_breaker.last_failure).to be_within(1.second).of(Time.now)
+        end
+      end
     end
   end
 
-  describe '#track_storage_accessible' do
-    it 'sets the failure count to zero in redis' do
-      set_in_redis(:failure_count, 10)
-
-      circuit_breaker.track_storage_accessible
-
-      expect(value_from_redis(:failure_count).to_i).to be(0)
-    end
-
-    it 'sets the failure count to zero on the breaker without reloading' do
-      set_in_redis(:failure_count, 10)
-
-      circuit_breaker.track_storage_accessible
+  describe '#circuit_broken?' do
+    it 'is working when there is no last failure' do
+      set_in_redis(:last_failure, nil)
+      set_in_redis(:failure_count, 0)
 
-      expect(circuit_breaker).not_to receive(:get_failure_info)
-      expect(circuit_breaker.failure_count).to eq(0)
+      expect(circuit_breaker.circuit_broken?).to be_falsey
     end
 
-    it 'removes the last failure time from redis' do
-      set_in_redis(:last_failure, Time.now.to_i)
-
-      circuit_breaker.track_storage_accessible
+    it 'is broken when there are too many failures' do
+      set_in_redis(:last_failure, 1.day.ago.to_f)
+      set_in_redis(:failure_count, 200)
 
-      expect(circuit_breaker).not_to receive(:get_failure_info)
-      expect(circuit_breaker.last_failure).to be_nil
+      expect(circuit_breaker.circuit_broken?).to be_truthy
     end
+  end
 
-    it 'removes the last failure time from the breaker without reloading' do
-      set_in_redis(:last_failure, Time.now.to_i)
-
-      circuit_breaker.track_storage_accessible
+  describe '#backing_off?' do
+    it 'is true when there was a recent failure' do
+      Timecop.freeze do
+        set_in_redis(:last_failure, 1.second.ago.to_f)
+        set_in_redis(:failure_count, 90)
 
-      expect(value_from_redis(:last_failure)).to be_empty
+        expect(circuit_breaker.backing_off?).to be_truthy
+      end
     end
 
-    it 'wont connect to redis when there are no failures' do
-      expect(Gitlab::Git::Storage.redis).to receive(:with).once
-                                              .and_call_original
-      expect(circuit_breaker).to receive(:track_storage_accessible)
-                           .and_call_original
-
-      circuit_breaker.track_storage_accessible
-    end
-  end
+    context 'the `failure_wait_time` is set to 0' do
+      before do
+        stub_application_setting(circuitbreaker_failure_wait_time: 0)
+      end
 
-  describe '#no_failures?' do
-    it 'is false when a failure was tracked' do
-      set_in_redis(:last_failure, Time.now.to_i)
-      set_in_redis(:failure_count, 1)
+      it 'is working even when there are failures' do
+        Timecop.freeze do
+          set_in_redis(:last_failure, 0.seconds.ago.to_f)
+          set_in_redis(:failure_count, 90)
 
-      expect(circuit_breaker.no_failures?).to be_falsey
+          expect(circuit_breaker.backing_off?).to be_falsey
+        end
+      end
     end
   end
 
@@ -351,10 +306,4 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
       expect(circuit_breaker.failure_count).to eq(7)
     end
   end
-
-  describe '#cache_key' do
-    it 'includes storage and host' do
-      expect(circuit_breaker.cache_key).to eq(cache_key)
-    end
-  end
 end
diff --git a/spec/lib/gitlab/git/storage/forked_storage_check_spec.rb b/spec/lib/gitlab/git/storage/forked_storage_check_spec.rb
index c708b15853a..39a5d020bb4 100644
--- a/spec/lib/gitlab/git/storage/forked_storage_check_spec.rb
+++ b/spec/lib/gitlab/git/storage/forked_storage_check_spec.rb
@@ -33,6 +33,21 @@ describe Gitlab::Git::Storage::ForkedStorageCheck, broken_storage: true, skip_da
       expect(runtime).to be < 1.0
     end
 
+    it 'will try the specified amount of times before failing'  do
+      allow(described_class).to receive(:check_filesystem_in_process) do
+        Process.spawn("sleep 10")
+      end
+
+      expect(Process).to receive(:spawn).with('sleep 10').twice
+                           .and_call_original
+
+      runtime = Benchmark.realtime do
+        described_class.storage_available?(existing_path, 0.5, 2)
+      end
+
+      expect(runtime).to be < 1.0
+    end
+
     describe 'when using paths with spaces' do
       let(:test_dir) { Rails.root.join('tmp', 'tests', 'storage_check') }
       let(:path_with_spaces) { File.join(test_dir, 'path with spaces') }
diff --git a/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb b/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb
index 7ee6d2f3709..5db37f55e03 100644
--- a/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb
+++ b/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb
@@ -65,17 +65,6 @@ describe Gitlab::Git::Storage::NullCircuitBreaker do
     ours = described_class.public_instance_methods
     theirs = Gitlab::Git::Storage::CircuitBreaker.public_instance_methods
 
-    # These methods are not part of the public API, but are public to allow the
-    # CircuitBreaker specs to operate. They should be made private over time.
-    exceptions = %i[
-      cache_key
-      check_storage_accessible!
-      no_failures?
-      storage_available?
-      track_storage_accessible
-      track_storage_inaccessible
-    ]
-
-    expect(theirs - ours).to contain_exactly(*exceptions)
+    expect(theirs - ours).to be_empty
   end
 end
diff --git a/spec/lib/gitlab/git/user_spec.rb b/spec/lib/gitlab/git/user_spec.rb
index 31d5f59a562..eb8db819045 100644
--- a/spec/lib/gitlab/git/user_spec.rb
+++ b/spec/lib/gitlab/git/user_spec.rb
@@ -5,14 +5,20 @@ describe Gitlab::Git::User do
   let(:name) { 'Jane Doe' }
   let(:email) { 'janedoe@example.com' }
   let(:gl_id) { 'user-123' }
+  let(:user) do
+    described_class.new(username, name, email, gl_id)
+  end
 
   subject { described_class.new(username, name, email, gl_id) }
 
   describe '.from_gitaly' do
-    let(:gitaly_user) { Gitaly::User.new(name: name, email: email, gl_id: gl_id) }
+    let(:gitaly_user) do
+      Gitaly::User.new(gl_username: username, name: name, email: email, gl_id: gl_id)
+    end
+
     subject { described_class.from_gitaly(gitaly_user) }
 
-    it { expect(subject).to eq(described_class.new('', name, email, gl_id)) }
+    it { expect(subject).to eq(user) }
   end
 
   describe '.from_gitlab' do
@@ -35,4 +41,16 @@ describe Gitlab::Git::User do
     it { expect(subject).not_to eq_other(username, name, email + 'x', gl_id) }
     it { expect(subject).not_to eq_other(username, name, email, gl_id + 'x') }
   end
+
+  describe '#to_gitaly' do
+    subject { user.to_gitaly }
+
+    it 'creates a Gitaly::User with the correct data' do
+      expect(subject).to be_a(Gitaly::User)
+      expect(subject.gl_username).to eq(username)
+      expect(subject.name).to eq(name)
+      expect(subject.email).to eq(email)
+      expect(subject.gl_id).to eq(gl_id)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
index 7bd6a7fa842..e144e28b5d8 100644
--- a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
@@ -5,7 +5,7 @@ describe Gitlab::GitalyClient::OperationService do
   let(:repository) { project.repository.raw }
   let(:client) { described_class.new(repository) }
   let(:user) { create(:user) }
-  let(:gitaly_user) { Gitlab::GitalyClient::Util.gitaly_user(user) }
+  let(:gitaly_user) { Gitlab::Git::User.from_gitlab(user).to_gitaly }
 
   describe '#user_create_branch' do
     let(:branch_name) { 'new' }
diff --git a/spec/lib/gitlab/gitaly_client/util_spec.rb b/spec/lib/gitlab/gitaly_client/util_spec.rb
index c0c29552494..d1e0136f8c1 100644
--- a/spec/lib/gitlab/gitaly_client/util_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/util_spec.rb
@@ -26,18 +26,4 @@ describe Gitlab::GitalyClient::Util do
       expect(subject.git_alternate_object_directories).to eq(git_alternate_object_directory)
     end
   end
-
-  describe '.gitaly_user' do
-    let(:user) { create(:user) }
-    let(:gl_id) { Gitlab::GlId.gl_id(user) }
-
-    subject { described_class.gitaly_user(user) }
-
-    it 'creates a Gitaly::User from a GitLab user' do
-      expect(subject).to be_a(Gitaly::User)
-      expect(subject.name).to eq(user.name)
-      expect(subject.email).to eq(user.email)
-      expect(subject.gl_id).to eq(gl_id)
-    end
-  end
 end
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 30495fd4f5e..47b7150d36f 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -115,7 +115,8 @@ describe ApplicationSetting do
     end
 
     context 'circuitbreaker settings' do
-      [:circuitbreaker_failure_count_threshold,
+      [:circuitbreaker_backoff_threshold,
+       :circuitbreaker_failure_count_threshold,
        :circuitbreaker_failure_wait_time,
        :circuitbreaker_failure_reset_time,
        :circuitbreaker_storage_timeout].each do |field|
@@ -125,6 +126,16 @@ describe ApplicationSetting do
                            .is_greater_than_or_equal_to(0)
         end
       end
+
+      it 'requires the `backoff_threshold` to be lower than the `failure_count_threshold`' do
+        setting.circuitbreaker_failure_count_threshold = 10
+        setting.circuitbreaker_backoff_threshold = 15
+        failure_message = "The circuitbreaker backoff threshold should be lower "\
+                          "than the failure count threshold"
+
+        expect(setting).not_to be_valid
+        expect(setting.errors[:circuitbreaker_backoff_threshold]).to include(failure_message)
+      end
     end
 
     context 'repository storages' do
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 25e5d155894..e1be23541e8 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -575,6 +575,16 @@ describe Environment do
     end
   end
 
+  describe '#ref_path' do
+    subject(:environment) do
+      create(:environment, name: 'staging / review-1')
+    end
+
+    it 'returns a path that uses the slug and does not have spaces' do
+      expect(environment.ref_path).to start_with('refs/environments/staging-review-1-')
+    end
+  end
+
   describe '#external_url_for' do
     let(:source_path) { 'source/file.html' }
     let(:sha) { RepoHelpers.sample_commit.id }
diff --git a/spec/requests/api/access_requests_spec.rb b/spec/requests/api/access_requests_spec.rb
index 50d0f72f6bc..35ca3635a9d 100644
--- a/spec/requests/api/access_requests_spec.rb
+++ b/spec/requests/api/access_requests_spec.rb
@@ -35,7 +35,7 @@ describe API::AccessRequests do
               user = public_send(type)
               get api("/#{source_type.pluralize}/#{source.id}/access_requests", user)
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -45,7 +45,7 @@ describe API::AccessRequests do
         it 'returns access requesters' do
           get api("/#{source_type.pluralize}/#{source.id}/access_requests", master)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.size).to eq(1)
@@ -68,7 +68,7 @@ describe API::AccessRequests do
                 user = public_send(type)
                 post api("/#{source_type.pluralize}/#{source.id}/access_requests", user)
 
-                expect(response).to have_http_status(403)
+                expect(response).to have_gitlab_http_status(403)
               end.not_to change { source.requesters.count }
             end
           end
@@ -80,7 +80,7 @@ describe API::AccessRequests do
           expect do
             post api("/#{source_type.pluralize}/#{source.id}/access_requests", access_requester)
 
-            expect(response).to have_http_status(400)
+            expect(response).to have_gitlab_http_status(400)
           end.not_to change { source.requesters.count }
         end
       end
@@ -95,7 +95,7 @@ describe API::AccessRequests do
             expect do
               post api("/#{source_type.pluralize}/#{source.id}/access_requests", stranger)
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end.not_to change { source.requesters.count }
           end
         end
@@ -104,7 +104,7 @@ describe API::AccessRequests do
           expect do
             post api("/#{source_type.pluralize}/#{source.id}/access_requests", stranger)
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
           end.to change { source.requesters.count }.by(1)
 
           # User attributes
@@ -135,7 +135,7 @@ describe API::AccessRequests do
               user = public_send(type)
               put api("/#{source_type.pluralize}/#{source.id}/access_requests/#{access_requester.id}/approve", user)
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -147,7 +147,7 @@ describe API::AccessRequests do
             put api("/#{source_type.pluralize}/#{source.id}/access_requests/#{access_requester.id}/approve", master),
                 access_level: Member::MASTER
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
           end.to change { source.members.count }.by(1)
           # User attributes
           expect(json_response['id']).to eq(access_requester.id)
@@ -166,7 +166,7 @@ describe API::AccessRequests do
             expect do
               put api("/#{source_type.pluralize}/#{source.id}/access_requests/#{stranger.id}/approve", master)
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end.not_to change { source.members.count }
           end
         end
@@ -187,7 +187,7 @@ describe API::AccessRequests do
               user = public_send(type)
               delete api("/#{source_type.pluralize}/#{source.id}/access_requests/#{access_requester.id}", user)
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -198,7 +198,7 @@ describe API::AccessRequests do
           expect do
             delete api("/#{source_type.pluralize}/#{source.id}/access_requests/#{access_requester.id}", access_requester)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { source.requesters.count }.by(-1)
         end
       end
@@ -208,7 +208,7 @@ describe API::AccessRequests do
           expect do
             delete api("/#{source_type.pluralize}/#{source.id}/access_requests/#{access_requester.id}", master)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { source.requesters.count }.by(-1)
         end
 
@@ -217,7 +217,7 @@ describe API::AccessRequests do
             expect do
               delete api("/#{source_type.pluralize}/#{source.id}/access_requests/#{developer.id}", master)
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end.not_to change { source.requesters.count }
           end
         end
@@ -227,7 +227,7 @@ describe API::AccessRequests do
             expect do
               delete api("/#{source_type.pluralize}/#{source.id}/access_requests/#{stranger.id}", master)
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end.not_to change { source.requesters.count }
           end
         end
diff --git a/spec/requests/api/award_emoji_spec.rb b/spec/requests/api/award_emoji_spec.rb
index 7a0765c1fae..eaf12f71421 100644
--- a/spec/requests/api/award_emoji_spec.rb
+++ b/spec/requests/api/award_emoji_spec.rb
@@ -18,7 +18,7 @@ describe API::AwardEmoji do
       it "returns an array of award_emoji" do
         get api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(award_emoji.name)
       end
@@ -26,7 +26,7 @@ describe API::AwardEmoji do
       it "returns a 404 error when issue id not found" do
         get api("/projects/#{project.id}/issues/12345/award_emoji", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -34,7 +34,7 @@ describe API::AwardEmoji do
       it "returns an array of award_emoji" do
         get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/award_emoji", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(downvote.name)
@@ -48,7 +48,7 @@ describe API::AwardEmoji do
       it 'returns the awarded emoji' do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/award_emoji", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(award.name)
       end
@@ -60,7 +60,7 @@ describe API::AwardEmoji do
 
         get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/award_emoji", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -71,7 +71,7 @@ describe API::AwardEmoji do
     it 'returns an array of award emoji' do
       get api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{note.id}/award_emoji", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.first['name']).to eq(rocket.name)
     end
@@ -82,7 +82,7 @@ describe API::AwardEmoji do
       it "returns the award emoji" do
         get api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji/#{award_emoji.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(award_emoji.name)
         expect(json_response['awardable_id']).to eq(issue.id)
         expect(json_response['awardable_type']).to eq("Issue")
@@ -91,7 +91,7 @@ describe API::AwardEmoji do
       it "returns a 404 error if the award is not found" do
         get api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -99,7 +99,7 @@ describe API::AwardEmoji do
       it 'returns the award emoji' do
         get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/award_emoji/#{downvote.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(downvote.name)
         expect(json_response['awardable_id']).to eq(merge_request.id)
         expect(json_response['awardable_type']).to eq("MergeRequest")
@@ -113,7 +113,7 @@ describe API::AwardEmoji do
       it 'returns the awarded emoji' do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/award_emoji/#{award.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(award.name)
         expect(json_response['awardable_id']).to eq(snippet.id)
         expect(json_response['awardable_type']).to eq("Snippet")
@@ -126,7 +126,7 @@ describe API::AwardEmoji do
 
         get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/award_emoji/#{downvote.id}", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -137,7 +137,7 @@ describe API::AwardEmoji do
     it 'returns an award emoji' do
       get api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{note.id}/award_emoji/#{rocket.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).not_to be_an Array
       expect(json_response['name']).to eq(rocket.name)
     end
@@ -150,7 +150,7 @@ describe API::AwardEmoji do
       it "creates a new award emoji" do
         post api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji", user), name: 'blowfish'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['name']).to eq('blowfish')
         expect(json_response['user']['username']).to eq(user.username)
       end
@@ -158,19 +158,19 @@ describe API::AwardEmoji do
       it "returns a 400 bad request error if the name is not given" do
         post api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns a 401 unauthorized error if the user is not authenticated" do
         post api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji"), name: 'thumbsup'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       it "returns a 404 error if the user authored issue" do
         post api("/projects/#{project.id}/issues/#{issue2.id}/award_emoji", user), name: 'thumbsup'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "normalizes +1 as thumbsup award" do
@@ -184,7 +184,7 @@ describe API::AwardEmoji do
           post api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji", user), name: 'thumbsup'
           post api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji", user), name: 'thumbsup'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
           expect(json_response["message"]).to match("has already been taken")
         end
       end
@@ -196,7 +196,7 @@ describe API::AwardEmoji do
 
         post api("/projects/#{project.id}/snippets/#{snippet.id}/award_emoji", user), name: 'blowfish'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['name']).to eq('blowfish')
         expect(json_response['user']['username']).to eq(user.username)
       end
@@ -211,14 +211,14 @@ describe API::AwardEmoji do
         post api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{note.id}/award_emoji", user), name: 'rocket'
       end.to change { note.award_emoji.count }.from(0).to(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['user']['username']).to eq(user.username)
     end
 
     it "it returns 404 error when user authored note" do
       post api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{note2.id}/award_emoji", user), name: 'thumbsup'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "normalizes +1 as thumbsup award" do
@@ -232,7 +232,7 @@ describe API::AwardEmoji do
         post api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{note.id}/award_emoji", user), name: 'rocket'
         post api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{note.id}/award_emoji", user), name: 'rocket'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response["message"]).to match("has already been taken")
       end
     end
@@ -244,14 +244,14 @@ describe API::AwardEmoji do
         expect do
           delete api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji/#{award_emoji.id}", user)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change { issue.award_emoji.count }.from(1).to(0)
       end
 
       it 'returns a 404 error when the award emoji can not be found' do
         delete api("/projects/#{project.id}/issues/#{issue.iid}/award_emoji/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it_behaves_like '412 response' do
@@ -264,14 +264,14 @@ describe API::AwardEmoji do
         expect do
           delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/award_emoji/#{downvote.id}", user)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change { merge_request.award_emoji.count }.from(1).to(0)
       end
 
       it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it_behaves_like '412 response' do
@@ -287,7 +287,7 @@ describe API::AwardEmoji do
         expect do
           delete api("/projects/#{project.id}/snippets/#{snippet.id}/award_emoji/#{award.id}", user)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change { snippet.award_emoji.count }.from(1).to(0)
       end
 
@@ -304,7 +304,7 @@ describe API::AwardEmoji do
       expect do
         delete api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{note.id}/award_emoji/#{rocket.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { note.award_emoji.count }.from(1).to(0)
     end
 
diff --git a/spec/requests/api/boards_spec.rb b/spec/requests/api/boards_spec.rb
index fcfa4ddfbfe..546a1697e56 100644
--- a/spec/requests/api/boards_spec.rb
+++ b/spec/requests/api/boards_spec.rb
@@ -44,7 +44,7 @@ describe API::Boards do
       it "returns authentication error" do
         get api(base_url)
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -52,7 +52,7 @@ describe API::Boards do
       it "returns the project issue board" do
         get api(base_url, user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -70,7 +70,7 @@ describe API::Boards do
     it 'returns issue board lists' do
       get api(base_url, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
@@ -80,7 +80,7 @@ describe API::Boards do
     it 'returns 404 if board not found' do
       get api("/projects/#{project.id}/boards/22343/lists", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -90,7 +90,7 @@ describe API::Boards do
     it 'returns a list' do
       get api("#{base_url}/#{dev_list.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['id']).to eq(dev_list.id)
       expect(json_response['label']['name']).to eq(dev_label.title)
       expect(json_response['position']).to eq(1)
@@ -99,7 +99,7 @@ describe API::Boards do
     it 'returns 404 if list not found' do
       get api("#{base_url}/5324", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -113,7 +113,7 @@ describe API::Boards do
 
       post api(base_url, user), label_id: group_label.id
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['label']['name']).to eq(group_label.title)
       expect(json_response['position']).to eq(3)
     end
@@ -121,7 +121,7 @@ describe API::Boards do
     it 'creates a new issue board list for project labels' do
       post api(base_url, user), label_id: ux_label.id
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['label']['name']).to eq(ux_label.title)
       expect(json_response['position']).to eq(3)
     end
@@ -129,13 +129,13 @@ describe API::Boards do
     it 'returns 400 when creating a new list if label_id is invalid' do
       post api(base_url, user), label_id: 23423
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 403 for project members with guest role' do
       put api("#{base_url}/#{test_list.id}", guest), position: 1
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 
@@ -146,7 +146,7 @@ describe API::Boards do
       put api("#{base_url}/#{test_list.id}", user),
         position: 1
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['position']).to eq(1)
     end
 
@@ -154,14 +154,14 @@ describe API::Boards do
       put api("#{base_url}/44444", user),
         position: 1
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns 403 for project members with guest role" do
       put api("#{base_url}/#{test_list.id}", guest),
         position: 1
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 
@@ -171,19 +171,19 @@ describe API::Boards do
     it "rejects a non member from deleting a list" do
       delete api("#{base_url}/#{dev_list.id}", non_member)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it "rejects a user with guest role from deleting a list" do
       delete api("#{base_url}/#{dev_list.id}", guest)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it "returns 404 error if list id not found" do
       delete api("#{base_url}/44444", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context "when the user is project owner" do
@@ -196,7 +196,7 @@ describe API::Boards do
       it "deletes the list if an admin requests it" do
         delete api("#{base_url}/#{dev_list.id}", owner)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end
 
       it_behaves_like '412 response' do
diff --git a/spec/requests/api/broadcast_messages_spec.rb b/spec/requests/api/broadcast_messages_spec.rb
index eacc575d97f..fe8a14fae9e 100644
--- a/spec/requests/api/broadcast_messages_spec.rb
+++ b/spec/requests/api/broadcast_messages_spec.rb
@@ -9,13 +9,13 @@ describe API::BroadcastMessages do
     it 'returns a 401 for anonymous users' do
       get api('/broadcast_messages')
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 403 for users' do
       get api('/broadcast_messages', user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it 'returns an Array of BroadcastMessages for admins' do
@@ -23,7 +23,7 @@ describe API::BroadcastMessages do
 
       get api('/broadcast_messages', admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_kind_of(Array)
       expect(json_response.first.keys)
@@ -35,19 +35,19 @@ describe API::BroadcastMessages do
     it 'returns a 401 for anonymous users' do
       get api("/broadcast_messages/#{message.id}")
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 403 for users' do
       get api("/broadcast_messages/#{message.id}", user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it 'returns the specified message for admins' do
       get api("/broadcast_messages/#{message.id}", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['id']).to eq message.id
       expect(json_response.keys)
         .to match_array(%w(id message starts_at ends_at color font active))
@@ -58,13 +58,13 @@ describe API::BroadcastMessages do
     it 'returns a 401 for anonymous users' do
       post api('/broadcast_messages'), attributes_for(:broadcast_message)
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 403 for users' do
       post api('/broadcast_messages', user), attributes_for(:broadcast_message)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     context 'as an admin' do
@@ -74,7 +74,7 @@ describe API::BroadcastMessages do
 
         post api('/broadcast_messages', admin), attrs
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq 'message is missing'
       end
 
@@ -83,7 +83,7 @@ describe API::BroadcastMessages do
         travel_to(time) do
           post api('/broadcast_messages', admin), message: 'Test message'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['starts_at']).to eq '2016-07-02T10:11:12.000Z'
           expect(json_response['ends_at']).to   eq '2016-07-02T11:11:12.000Z'
         end
@@ -94,7 +94,7 @@ describe API::BroadcastMessages do
 
         post api('/broadcast_messages', admin), attrs
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['color']).to eq attrs[:color]
         expect(json_response['font']).to eq attrs[:font]
       end
@@ -106,14 +106,14 @@ describe API::BroadcastMessages do
       put api("/broadcast_messages/#{message.id}"),
         attributes_for(:broadcast_message)
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 403 for users' do
       put api("/broadcast_messages/#{message.id}", user),
         attributes_for(:broadcast_message)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     context 'as an admin' do
@@ -122,7 +122,7 @@ describe API::BroadcastMessages do
 
         put api("/broadcast_messages/#{message.id}", admin), attrs
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['color']).to eq attrs[:color]
         expect(json_response['font']).to eq attrs[:font]
       end
@@ -134,7 +134,7 @@ describe API::BroadcastMessages do
 
           put api("/broadcast_messages/#{message.id}", admin), attrs
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['starts_at']).to eq '2016-07-02T10:11:12.000Z'
           expect(json_response['ends_at']).to   eq '2016-07-02T13:11:12.000Z'
         end
@@ -145,7 +145,7 @@ describe API::BroadcastMessages do
 
         put api("/broadcast_messages/#{message.id}", admin), attrs
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect { message.reload }.to change { message.message }.to('new message')
       end
     end
@@ -156,14 +156,14 @@ describe API::BroadcastMessages do
       delete api("/broadcast_messages/#{message.id}"),
         attributes_for(:broadcast_message)
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 403 for users' do
       delete api("/broadcast_messages/#{message.id}", user),
         attributes_for(:broadcast_message)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it_behaves_like '412 response' do
@@ -174,7 +174,7 @@ describe API::BroadcastMessages do
       expect do
         delete api("/broadcast_messages/#{message.id}", admin)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { BroadcastMessage.count }.by(-1)
     end
   end
diff --git a/spec/requests/api/circuit_breakers_spec.rb b/spec/requests/api/circuit_breakers_spec.rb
index 76521e55994..3b858c40fd6 100644
--- a/spec/requests/api/circuit_breakers_spec.rb
+++ b/spec/requests/api/circuit_breakers_spec.rb
@@ -8,13 +8,13 @@ describe API::CircuitBreakers do
     it 'returns a 401 for anonymous users' do
       get api('/circuit_breakers/repository_storage')
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 403 for users' do
       get api('/circuit_breakers/repository_storage', user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it 'returns an Array of storages' do
@@ -24,7 +24,7 @@ describe API::CircuitBreakers do
 
       get api('/circuit_breakers/repository_storage', admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_kind_of(Array)
       expect(json_response.first['storage_name']).to eq('broken')
       expect(json_response.first['failing_on_hosts']).to eq(['web01'])
@@ -39,7 +39,7 @@ describe API::CircuitBreakers do
 
         get api('/circuit_breakers/repository_storage/failing', admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_kind_of(Array)
       end
     end
@@ -51,7 +51,7 @@ describe API::CircuitBreakers do
 
       delete api('/circuit_breakers/repository_storage', admin)
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
     end
   end
 end
diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index e4c73583545..ffa17d296e8 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -39,7 +39,7 @@ describe API::CommitStatuses do
           end
 
           it 'returns latest commit statuses' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
 
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
@@ -55,7 +55,7 @@ describe API::CommitStatuses do
           end
 
           it 'returns all commit statuses' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(statuses_id).to contain_exactly(status1.id, status2.id,
@@ -70,7 +70,7 @@ describe API::CommitStatuses do
           end
 
           it 'returns latest commit statuses for specific ref' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(statuses_id).to contain_exactly(status3.id, status5.id)
@@ -83,7 +83,7 @@ describe API::CommitStatuses do
           end
 
           it 'return latest commit statuses for specific name' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(statuses_id).to contain_exactly(status4.id, status5.id)
@@ -110,7 +110,7 @@ describe API::CommitStatuses do
       end
 
       it "does not return project commits" do
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -120,7 +120,7 @@ describe API::CommitStatuses do
       end
 
       it "does not return project commits" do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -135,7 +135,7 @@ describe API::CommitStatuses do
             it 'creates commit status' do
               post api(post_url, developer), state: status
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
               expect(json_response['sha']).to eq(commit.id)
               expect(json_response['status']).to eq(status)
               expect(json_response['name']).to eq('default')
@@ -159,7 +159,7 @@ describe API::CommitStatuses do
           it "to #{status}" do
             expect { post api(post_url, developer), state: status }.not_to change { CommitStatus.count }
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
             expect(json_response['status']).to eq(status)
           end
         end
@@ -181,7 +181,7 @@ describe API::CommitStatuses do
           it 'creates commit status' do
             subject
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
             expect(json_response['sha']).to eq(commit.id)
             expect(json_response['status']).to eq('success')
             expect(json_response['name']).to eq('coverage')
@@ -197,7 +197,7 @@ describe API::CommitStatuses do
             it 'sets head pipeline' do
               subject
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
               expect(merge_request.reload.head_pipeline).not_to be_nil
             end
           end
@@ -224,7 +224,7 @@ describe API::CommitStatuses do
           end
 
           it 'updates a commit status' do
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
             expect(json_response['sha']).to eq(commit.id)
             expect(json_response['status']).to eq('success')
             expect(json_response['name']).to eq('coverage')
@@ -250,7 +250,7 @@ describe API::CommitStatuses do
         end
 
         it 'correctly posts a new commit status' do
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['sha']).to eq(commit.id)
           expect(json_response['status']).to eq('success')
         end
@@ -268,7 +268,7 @@ describe API::CommitStatuses do
         end
 
         it 'does not create commit status' do
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
         end
       end
 
@@ -278,7 +278,7 @@ describe API::CommitStatuses do
         end
 
         it 'does not create commit status' do
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
         end
       end
 
@@ -290,7 +290,7 @@ describe API::CommitStatuses do
         end
 
         it 'returns not found error' do
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
 
@@ -301,7 +301,7 @@ describe API::CommitStatuses do
         end
 
         it 'responds with bad request status and validation errors' do
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']['target_url'])
             .to include 'must be a valid URL'
         end
@@ -314,7 +314,7 @@ describe API::CommitStatuses do
       end
 
       it 'does not create commit status' do
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -324,7 +324,7 @@ describe API::CommitStatuses do
       end
 
       it 'does not create commit status' do
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -334,7 +334,7 @@ describe API::CommitStatuses do
       end
 
       it 'does not create commit status' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 94462b4572d..0d2bd3207c0 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -24,7 +24,7 @@ describe API::Commits do
 
         get api(route, current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to match_response_schema('public_api/v4/commits')
         expect(json_response.first['id']).to eq(commit.id)
         expect(json_response.first['committer_name']).to eq(commit.committer_name)
@@ -119,7 +119,7 @@ describe API::Commits do
         it "returns an invalid parameter error message" do
           get api("/projects/#{project_id}/repository/commits?since=invalid-date", user)
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['error']).to eq('since is invalid')
         end
       end
@@ -198,13 +198,13 @@ describe API::Commits do
     it 'returns a 403 unauthorized for user without permissions' do
       post api(url, guest)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it 'returns a 400 bad request if no params are given' do
       post api(url, user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     describe 'create' do
@@ -248,7 +248,7 @@ describe API::Commits do
       it 'returns a 400 bad request if file exists' do
         post api(url, user), invalid_c_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       context 'with project path containing a dot in URL' do
@@ -257,7 +257,7 @@ describe API::Commits do
         it 'a new file in project repo' do
           post api(url, user), valid_c_params
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
         end
       end
     end
@@ -292,14 +292,14 @@ describe API::Commits do
       it 'an existing file in project repo' do
         post api(url, user), valid_d_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
       end
 
       it 'returns a 400 bad request if file does not exist' do
         post api(url, user), invalid_d_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -337,14 +337,14 @@ describe API::Commits do
       it 'an existing file in project repo' do
         post api(url, user), valid_m_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
       end
 
       it 'returns a 400 bad request if file does not exist' do
         post api(url, user), invalid_m_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -380,14 +380,14 @@ describe API::Commits do
       it 'an existing file in project repo' do
         post api(url, user), valid_u_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
       end
 
       it 'returns a 400 bad request if file does not exist' do
         post api(url, user), invalid_u_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -453,14 +453,14 @@ describe API::Commits do
       it 'are commited as one in project repo' do
         post api(url, user), valid_mo_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
       end
 
       it 'return a 400 bad request if there are any issues' do
         post api(url, user), invalid_mo_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
   end
@@ -571,7 +571,7 @@ describe API::Commits do
         it 'includes a "created" status' do
           get api(route, current_user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to match_response_schema('public_api/v4/commit/detail')
           expect(json_response['status']).to eq('created')
           expect(json_response['last_pipeline']['id']).to eq(pipeline.id)
@@ -588,7 +588,7 @@ describe API::Commits do
           it 'includes a "success" status' do
             get api(route, current_user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to match_response_schema('public_api/v4/commit/detail')
             expect(json_response['status']).to eq('success')
           end
diff --git a/spec/requests/api/deploy_keys_spec.rb b/spec/requests/api/deploy_keys_spec.rb
index 684877c33c0..1f1e6ea17e4 100644
--- a/spec/requests/api/deploy_keys_spec.rb
+++ b/spec/requests/api/deploy_keys_spec.rb
@@ -48,7 +48,7 @@ describe API::DeployKeys do
     it 'returns array of ssh keys' do
       get api("/projects/#{project.id}/deploy_keys", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.first['title']).to eq(deploy_key.title)
@@ -59,14 +59,14 @@ describe API::DeployKeys do
     it 'returns a single key' do
       get api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(deploy_key.title)
     end
 
     it 'returns 404 Not Found with invalid ID' do
       get api("/projects/#{project.id}/deploy_keys/404", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -74,14 +74,14 @@ describe API::DeployKeys do
     it 'does not create an invalid ssh key' do
       post api("/projects/#{project.id}/deploy_keys", admin), { title: 'invalid key' }
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('key is missing')
     end
 
     it 'does not create a key without title' do
       post api("/projects/#{project.id}/deploy_keys", admin), key: 'some key'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('title is missing')
     end
 
@@ -98,7 +98,7 @@ describe API::DeployKeys do
         post api("/projects/#{project.id}/deploy_keys", admin), { key: deploy_key.key, title: deploy_key.title }
       end.not_to change { project.deploy_keys.count }
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it 'joins an existing ssh key to a new project' do
@@ -106,7 +106,7 @@ describe API::DeployKeys do
         post api("/projects/#{project2.id}/deploy_keys", admin), { key: deploy_key.key, title: deploy_key.title }
       end.to change { project2.deploy_keys.count }.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it 'accepts can_push parameter' do
@@ -114,7 +114,7 @@ describe API::DeployKeys do
 
       post api("/projects/#{project.id}/deploy_keys", admin), key_attrs
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['can_push']).to eq(true)
     end
   end
@@ -130,7 +130,7 @@ describe API::DeployKeys do
         put api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin), { title: 'new title' }
       end.not_to change(deploy_key, :title)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'does not update a public deploy key as non admin' do
@@ -138,7 +138,7 @@ describe API::DeployKeys do
         put api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", user), { title: 'new title' }
       end.not_to change(deploy_key, :title)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'does not update a private key with invalid title' do
@@ -148,7 +148,7 @@ describe API::DeployKeys do
         put api("/projects/#{project.id}/deploy_keys/#{private_deploy_key.id}", admin), { title: '' }
       end.not_to change(deploy_key, :title)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'updates a private ssh key with correct attributes' do
@@ -181,14 +181,14 @@ describe API::DeployKeys do
       expect do
         delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { project.deploy_keys.count }.by(-1)
     end
 
     it 'returns 404 Not Found with invalid ID' do
       delete api("/projects/#{project.id}/deploy_keys/404", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it_behaves_like '412 response' do
@@ -205,7 +205,7 @@ describe API::DeployKeys do
           post api("/projects/#{project2.id}/deploy_keys/#{deploy_key.id}/enable", admin)
         end.to change { project2.deploy_keys.count }.from(0).to(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['id']).to eq(deploy_key.id)
       end
     end
@@ -214,7 +214,7 @@ describe API::DeployKeys do
       it 'returns a 404 error' do
         post api("/projects/#{project2.id}/deploy_keys/#{deploy_key.id}/enable", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/deployments_spec.rb b/spec/requests/api/deployments_spec.rb
index 90d78d060ca..c7977e624ff 100644
--- a/spec/requests/api/deployments_spec.rb
+++ b/spec/requests/api/deployments_spec.rb
@@ -15,7 +15,7 @@ describe API::Deployments do
       it 'returns projects deployments' do
         get api("/projects/#{project.id}/deployments", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -28,7 +28,7 @@ describe API::Deployments do
       it 'returns a 404 status code' do
         get api("/projects/#{project.id}/deployments", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -38,7 +38,7 @@ describe API::Deployments do
       it 'returns the projects deployment' do
         get api("/projects/#{project.id}/deployments/#{deployment.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['sha']).to match /\A\h{40}\z/
         expect(json_response['id']).to eq(deployment.id)
       end
@@ -48,7 +48,7 @@ describe API::Deployments do
       it 'returns a 404 status code' do
         get api("/projects/#{project.id}/deployments/#{deployment.id}", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/doorkeeper_access_spec.rb b/spec/requests/api/doorkeeper_access_spec.rb
index 868fef65c1c..de7ce848a31 100644
--- a/spec/requests/api/doorkeeper_access_spec.rb
+++ b/spec/requests/api/doorkeeper_access_spec.rb
@@ -8,7 +8,7 @@ describe 'doorkeeper access' do
   describe "unauthenticated" do
     it "returns authentication success" do
       get api("/user"), access_token: token.token
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     include_examples 'user login request with unique ip limit' do
@@ -21,14 +21,14 @@ describe 'doorkeeper access' do
   describe "when token invalid" do
     it "returns authentication error" do
       get api("/user"), access_token: "123a"
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
   end
 
   describe "authorization by private token" do
     it "returns authentication success" do
       get api("/user", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     include_examples 'user login request with unique ip limit' do
@@ -43,7 +43,7 @@ describe 'doorkeeper access' do
       user.block
       get api("/user"), access_token: token.token
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
   end
 
@@ -52,7 +52,7 @@ describe 'doorkeeper access' do
       user.ldap_block
       get api("/user"), access_token: token.token
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
   end
 end
diff --git a/spec/requests/api/environments_spec.rb b/spec/requests/api/environments_spec.rb
index f8cd529a06c..3665cfd7241 100644
--- a/spec/requests/api/environments_spec.rb
+++ b/spec/requests/api/environments_spec.rb
@@ -25,7 +25,7 @@ describe API::Environments do
 
         get api("/projects/#{project.id}/environments", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -39,7 +39,7 @@ describe API::Environments do
       it 'returns a 404 status code' do
         get api("/projects/#{project.id}/environments", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -49,7 +49,7 @@ describe API::Environments do
       it 'creates a environment with valid params' do
         post api("/projects/#{project.id}/environments", user), name: "mepmep"
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['name']).to eq('mepmep')
         expect(json_response['slug']).to eq('mepmep')
         expect(json_response['external']).to be nil
@@ -58,19 +58,19 @@ describe API::Environments do
       it 'requires name to be passed' do
         post api("/projects/#{project.id}/environments", user), external_url: 'test.gitlab.com'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns a 400 if environment already exists' do
         post api("/projects/#{project.id}/environments", user), name: environment.name
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns a 400 if slug is specified' do
         post api("/projects/#{project.id}/environments", user), name: "foo", slug: "foo"
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response["error"]).to eq("slug is automatically generated and cannot be changed")
       end
     end
@@ -79,7 +79,7 @@ describe API::Environments do
       it 'rejects the request' do
         post api("/projects/#{project.id}/environments", non_member), name: 'gitlab.com'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 400 when the required params are missing' do
@@ -94,7 +94,7 @@ describe API::Environments do
       put api("/projects/#{project.id}/environments/#{environment.id}", user),
           name: 'Mepmep', external_url: url
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['name']).to eq('Mepmep')
       expect(json_response['external_url']).to eq(url)
     end
@@ -104,7 +104,7 @@ describe API::Environments do
       api_url = api("/projects/#{project.id}/environments/#{environment.id}", user)
       put api_url, slug: slug + "-foo"
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response["error"]).to eq("slug is automatically generated and cannot be changed")
     end
 
@@ -113,7 +113,7 @@ describe API::Environments do
       put api("/projects/#{project.id}/environments/#{environment.id}", user),
           name: 'Mepmep'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['name']).to eq('Mepmep')
       expect(json_response['external_url']).to eq(url)
     end
@@ -121,7 +121,7 @@ describe API::Environments do
     it 'returns a 404 if the environment does not exist' do
       put api("/projects/#{project.id}/environments/12345", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -130,13 +130,13 @@ describe API::Environments do
       it 'returns a 200 for an existing environment' do
         delete api("/projects/#{project.id}/environments/#{environment.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end
 
       it 'returns a 404 for non existing id' do
         delete api("/projects/#{project.id}/environments/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Not found')
       end
 
@@ -149,7 +149,7 @@ describe API::Environments do
       it 'rejects the request' do
         delete api("/projects/#{project.id}/environments/#{environment.id}", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -164,7 +164,7 @@ describe API::Environments do
         end
 
         it 'returns a 200' do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         it 'actually stops the environment' do
@@ -175,7 +175,7 @@ describe API::Environments do
       it 'returns a 404 for non existing id' do
         post api("/projects/#{project.id}/environments/12345/stop", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Not found')
       end
     end
@@ -184,7 +184,7 @@ describe API::Environments do
       it 'rejects the request' do
         post api("/projects/#{project.id}/environments/#{environment.id}/stop", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/events_spec.rb b/spec/requests/api/events_spec.rb
index a23d28994ce..962c845f36d 100644
--- a/spec/requests/api/events_spec.rb
+++ b/spec/requests/api/events_spec.rb
@@ -14,7 +14,7 @@ describe API::Events do
       it 'returns authentication error' do
         get api('/events')
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -22,7 +22,7 @@ describe API::Events do
       it 'returns users events' do
         get api('/events?action=closed&target_type=issue&after=2016-12-1&before=2016-12-31', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -35,7 +35,7 @@ describe API::Events do
       it 'returns no events' do
         get api("/users/#{user.id}/events", other_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_empty
       end
     end
@@ -44,7 +44,7 @@ describe API::Events do
       it 'accepts a username' do
         get api("/users/#{user.username}/events", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -53,7 +53,7 @@ describe API::Events do
       it 'returns the events' do
         get api("/users/#{user.id}/events", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -72,7 +72,7 @@ describe API::Events do
         end
 
         it 'responds with HTTP 200 OK' do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         it 'includes the push payload as a Hash' do
@@ -120,7 +120,7 @@ describe API::Events do
     it 'returns a 404 error if not found' do
       get api('/users/42/events', user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
   end
@@ -130,7 +130,7 @@ describe API::Events do
       it 'returns 404 for private project' do
         get api("/projects/#{private_project.id}/events")
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns 200 status for a public project' do
@@ -138,7 +138,7 @@ describe API::Events do
 
         get api("/projects/#{public_project.id}/events")
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -146,7 +146,7 @@ describe API::Events do
       it 'returns 404' do
         get api("/projects/#{private_project.id}/events", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -154,7 +154,7 @@ describe API::Events do
       it 'returns project events' do
         get api("/projects/#{private_project.id}/events?action=closed&target_type=issue&after=2016-12-1&before=2016-12-31", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -163,7 +163,7 @@ describe API::Events do
       it 'returns 404 if project does not exist' do
         get api("/projects/1234/events", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
diff --git a/spec/requests/api/features_spec.rb b/spec/requests/api/features_spec.rb
index 7e21006b254..267058d98ee 100644
--- a/spec/requests/api/features_spec.rb
+++ b/spec/requests/api/features_spec.rb
@@ -44,19 +44,19 @@ describe API::Features do
     it 'returns a 401 for anonymous users' do
       get api('/features')
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 403 for users' do
       get api('/features', user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it 'returns the feature list for admins' do
       get api('/features', admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to match_array(expected_features)
     end
   end
@@ -68,20 +68,20 @@ describe API::Features do
       it 'returns a 401 for anonymous users' do
         post api("/features/#{feature_name}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       it 'returns a 403 for users' do
         post api("/features/#{feature_name}", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       context 'when passed value=true' do
         it 'creates an enabled feature' do
           post api("/features/#{feature_name}", admin), value: 'true'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'on',
@@ -91,7 +91,7 @@ describe API::Features do
         it 'creates an enabled feature for the given Flipper group when passed feature_group=perf_team' do
           post api("/features/#{feature_name}", admin), value: 'true', feature_group: 'perf_team'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'conditional',
@@ -104,7 +104,7 @@ describe API::Features do
         it 'creates an enabled feature for the given user when passed user=username' do
           post api("/features/#{feature_name}", admin), value: 'true', user: user.username
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'conditional',
@@ -117,7 +117,7 @@ describe API::Features do
         it 'creates an enabled feature for the given user and feature group when passed user=username and feature_group=perf_team' do
           post api("/features/#{feature_name}", admin), value: 'true', user: user.username, feature_group: 'perf_team'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'conditional',
@@ -132,7 +132,7 @@ describe API::Features do
       it 'creates a feature with the given percentage if passed an integer' do
         post api("/features/#{feature_name}", admin), value: '50'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response).to eq(
           'name' => 'my_feature',
           'state' => 'conditional',
@@ -154,7 +154,7 @@ describe API::Features do
         it 'enables the feature' do
           post api("/features/#{feature_name}", admin), value: 'true'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'on',
@@ -164,7 +164,7 @@ describe API::Features do
         it 'enables the feature for the given Flipper group when passed feature_group=perf_team' do
           post api("/features/#{feature_name}", admin), value: 'true', feature_group: 'perf_team'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'conditional',
@@ -177,7 +177,7 @@ describe API::Features do
         it 'enables the feature for the given user when passed user=username' do
           post api("/features/#{feature_name}", admin), value: 'true', user: user.username
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'conditional',
@@ -195,7 +195,7 @@ describe API::Features do
 
           post api("/features/#{feature_name}", admin), value: 'false'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'off',
@@ -208,7 +208,7 @@ describe API::Features do
 
           post api("/features/#{feature_name}", admin), value: 'false', feature_group: 'perf_team'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'off',
@@ -221,7 +221,7 @@ describe API::Features do
 
           post api("/features/#{feature_name}", admin), value: 'false', user: user.username
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'off',
@@ -237,7 +237,7 @@ describe API::Features do
         it 'updates the percentage of time if passed an integer' do
           post api("/features/#{feature_name}", admin), value: '30'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to eq(
             'name' => 'my_feature',
             'state' => 'conditional',
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index 114019441a3..5d8338a3fb7 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -26,7 +26,7 @@ describe API::Files do
       it 'returns file attributes as json' do
         get api(route(file_path), current_user), params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['file_path']).to eq(CGI.unescape(file_path))
         expect(json_response['file_name']).to eq('popen.rb')
         expect(json_response['last_commit_id']).to eq('570e7b2abdd848b95f2f578043fc23bd6f6fd24d')
@@ -38,7 +38,7 @@ describe API::Files do
 
         get api(route(file_path), current_user), params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response.content_type).to eq('application/json')
       end
 
@@ -49,7 +49,7 @@ describe API::Files do
 
         get api(route(file_path), current_user), params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['file_name']).to eq('commit.js.coffee')
         expect(Base64.decode64(json_response['content']).lines.first).to eq("class Commit\n")
       end
@@ -60,7 +60,7 @@ describe API::Files do
 
         get api(url, current_user), params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       context 'when mandatory params are not given' do
@@ -122,7 +122,7 @@ describe API::Files do
 
         get api(url, current_user), params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'returns raw file info for files with dots' do
@@ -131,7 +131,7 @@ describe API::Files do
 
         get api(url, current_user), params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'returns file by commit sha' do
@@ -142,7 +142,7 @@ describe API::Files do
 
         get api(route(file_path) + "/raw", current_user), params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       context 'when mandatory params are not given' do
@@ -209,7 +209,7 @@ describe API::Files do
     it "creates a new file in project repo" do
       post api(route(file_path), user), valid_params
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response["file_path"]).to eq(CGI.unescape(file_path))
       last_commit = project.repository.commit.raw
       expect(last_commit.author_email).to eq(user.email)
@@ -219,7 +219,7 @@ describe API::Files do
     it "returns a 400 bad request if no mandatory params given" do
       post api(route("any%2Etxt"), user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 400 if editor fails to create file" do
@@ -228,7 +228,7 @@ describe API::Files do
 
       post api(route("any%2Etxt"), user), valid_params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context "when specifying an author" do
@@ -237,7 +237,7 @@ describe API::Files do
 
         post api(route("new_file_with_author%2Etxt"), user), valid_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(response.content_type).to eq('application/json')
         last_commit = project.repository.commit.raw
         expect(last_commit.author_email).to eq(author_email)
@@ -251,7 +251,7 @@ describe API::Files do
       it "creates a new file in project repo" do
         post api(route("newfile%2Erb"), user), valid_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['file_path']).to eq('newfile.rb')
         last_commit = project.repository.commit.raw
         expect(last_commit.author_email).to eq(user.email)
@@ -272,7 +272,7 @@ describe API::Files do
     it "updates existing file in project repo" do
       put api(route(file_path), user), valid_params
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['file_path']).to eq(CGI.unescape(file_path))
       last_commit = project.repository.commit.raw
       expect(last_commit.author_email).to eq(user.email)
@@ -284,7 +284,7 @@ describe API::Files do
 
       put api(route(file_path), user), params_with_stale_id
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']).to eq('You are attempting to update a file that has changed since you started editing it.')
     end
 
@@ -295,13 +295,13 @@ describe API::Files do
 
       put api(route(file_path), user), params_with_correct_id
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it "returns a 400 bad request if no params given" do
       put api(route(file_path), user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context "when specifying an author" do
@@ -310,7 +310,7 @@ describe API::Files do
 
         put api(route(file_path), user), valid_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         last_commit = project.repository.commit.raw
         expect(last_commit.author_email).to eq(author_email)
         expect(last_commit.author_name).to eq(author_name)
@@ -329,13 +329,13 @@ describe API::Files do
     it "deletes existing file in project repo" do
       delete api(route(file_path), user), valid_params
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
     end
 
     it "returns a 400 bad request if no params given" do
       delete api(route(file_path), user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 400 if fails to delete file" do
@@ -343,7 +343,7 @@ describe API::Files do
 
       delete api(route(file_path), user), valid_params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context "when specifying an author" do
@@ -352,7 +352,7 @@ describe API::Files do
 
         delete api(route(file_path), user), valid_params
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end
     end
   end
@@ -380,7 +380,7 @@ describe API::Files do
     it "remains unchanged" do
       get api(route(file_path), user), get_params
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['file_path']).to eq(CGI.unescape(file_path))
       expect(json_response['file_name']).to eq(CGI.unescape(file_path))
       expect(json_response['content']).to eq(put_params[:content])
diff --git a/spec/requests/api/group_variables_spec.rb b/spec/requests/api/group_variables_spec.rb
index 93b9cf85c1d..a4f198eb5c9 100644
--- a/spec/requests/api/group_variables_spec.rb
+++ b/spec/requests/api/group_variables_spec.rb
@@ -15,7 +15,7 @@ describe API::GroupVariables do
       it 'returns group variables' do
         get api("/groups/#{group.id}/variables", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_a(Array)
       end
     end
@@ -24,7 +24,7 @@ describe API::GroupVariables do
       it 'does not return group variables' do
         get api("/groups/#{group.id}/variables", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -32,7 +32,7 @@ describe API::GroupVariables do
       it 'does not return group variables' do
         get api("/groups/#{group.id}/variables")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -48,7 +48,7 @@ describe API::GroupVariables do
       it 'returns group variable details' do
         get api("/groups/#{group.id}/variables/#{variable.key}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['value']).to eq(variable.value)
         expect(json_response['protected']).to eq(variable.protected?)
       end
@@ -56,7 +56,7 @@ describe API::GroupVariables do
       it 'responds with 404 Not Found if requesting non-existing variable' do
         get api("/groups/#{group.id}/variables/non_existing_variable", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -64,7 +64,7 @@ describe API::GroupVariables do
       it 'does not return group variable details' do
         get api("/groups/#{group.id}/variables/#{variable.key}", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -72,7 +72,7 @@ describe API::GroupVariables do
       it 'does not return group variable details' do
         get api("/groups/#{group.id}/variables/#{variable.key}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -90,7 +90,7 @@ describe API::GroupVariables do
           post api("/groups/#{group.id}/variables", user), key: 'TEST_VARIABLE_2', value: 'VALUE_2', protected: true
         end.to change {group.variables.count}.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['key']).to eq('TEST_VARIABLE_2')
         expect(json_response['value']).to eq('VALUE_2')
         expect(json_response['protected']).to be_truthy
@@ -101,7 +101,7 @@ describe API::GroupVariables do
           post api("/groups/#{group.id}/variables", user), key: 'TEST_VARIABLE_2', value: 'VALUE_2'
         end.to change {group.variables.count}.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['key']).to eq('TEST_VARIABLE_2')
         expect(json_response['value']).to eq('VALUE_2')
         expect(json_response['protected']).to be_falsey
@@ -112,7 +112,7 @@ describe API::GroupVariables do
           post api("/groups/#{group.id}/variables", user), key: variable.key, value: 'VALUE_2'
         end.to change {group.variables.count}.by(0)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -120,7 +120,7 @@ describe API::GroupVariables do
       it 'does not create variable' do
         post api("/groups/#{group.id}/variables", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -128,7 +128,7 @@ describe API::GroupVariables do
       it 'does not create variable' do
         post api("/groups/#{group.id}/variables")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -149,7 +149,7 @@ describe API::GroupVariables do
 
         updated_variable = group.variables.first
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(value_before).to eq(variable.value)
         expect(updated_variable.value).to eq('VALUE_1_UP')
         expect(updated_variable).to be_protected
@@ -158,7 +158,7 @@ describe API::GroupVariables do
       it 'responds with 404 Not Found if requesting non-existing variable' do
         put api("/groups/#{group.id}/variables/non_existing_variable", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -166,7 +166,7 @@ describe API::GroupVariables do
       it 'does not update variable' do
         put api("/groups/#{group.id}/variables/#{variable.key}", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -174,7 +174,7 @@ describe API::GroupVariables do
       it 'does not update variable' do
         put api("/groups/#{group.id}/variables/#{variable.key}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -191,14 +191,14 @@ describe API::GroupVariables do
         expect do
           delete api("/groups/#{group.id}/variables/#{variable.key}", user)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change {group.variables.count}.by(-1)
       end
 
       it 'responds with 404 Not Found if requesting non-existing variable' do
         delete api("/groups/#{group.id}/variables/non_existing_variable", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it_behaves_like '412 response' do
@@ -210,7 +210,7 @@ describe API::GroupVariables do
       it 'does not delete variable' do
         delete api("/groups/#{group.id}/variables/#{variable.key}", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -218,7 +218,7 @@ describe API::GroupVariables do
       it 'does not delete variable' do
         delete api("/groups/#{group.id}/variables/#{variable.key}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 1671a046fdf..8ce9fcc80bf 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -23,7 +23,7 @@ describe API::Groups do
       it "returns public groups" do
         get api("/groups")
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -36,7 +36,7 @@ describe API::Groups do
       it "normal user: returns an array of groups of user1" do
         get api("/groups", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -47,7 +47,7 @@ describe API::Groups do
       it "does not include statistics" do
         get api("/groups", user1), statistics: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first).not_to include 'statistics'
@@ -58,7 +58,7 @@ describe API::Groups do
       it "admin: returns an array of all groups" do
         get api("/groups", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(2)
@@ -67,7 +67,7 @@ describe API::Groups do
       it "does not include statistics by default" do
         get api("/groups", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first).not_to include('statistics')
@@ -87,7 +87,7 @@ describe API::Groups do
 
         get api("/groups", admin), statistics: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response)
@@ -99,7 +99,7 @@ describe API::Groups do
       it "returns all groups excluding skipped groups" do
         get api("/groups", admin), skip_groups: [group2.id]
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -114,7 +114,7 @@ describe API::Groups do
 
         get api("/groups", user1), all_available: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(response_groups).to contain_exactly(public_group.name, group1.name)
@@ -132,7 +132,7 @@ describe API::Groups do
       it "sorts by name ascending by default" do
         get api("/groups", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(response_groups).to eq([group3.name, group1.name])
@@ -141,7 +141,7 @@ describe API::Groups do
       it "sorts in descending order when passed" do
         get api("/groups", user1), sort: "desc"
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(response_groups).to eq([group1.name, group3.name])
@@ -150,7 +150,7 @@ describe API::Groups do
       it "sorts by the order_by param" do
         get api("/groups", user1), order_by: "path"
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(response_groups).to eq([group1.name, group3.name])
@@ -163,7 +163,7 @@ describe API::Groups do
 
         get api('/groups', user2), owned: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -176,12 +176,12 @@ describe API::Groups do
     context 'when unauthenticated' do
       it 'returns 404 for a private group' do
         get api("/groups/#{group2.id}")
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns 200 for a public group' do
         get api("/groups/#{group1.id}")
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -192,7 +192,7 @@ describe API::Groups do
 
         get api("/groups/#{group1.id}", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['id']).to eq(group1.id)
         expect(json_response['name']).to eq(group1.name)
         expect(json_response['path']).to eq(group1.path)
@@ -214,13 +214,13 @@ describe API::Groups do
       it "does not return a non existing group" do
         get api("/groups/1328", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "does not return a group not attached to user1" do
         get api("/groups/#{group2.id}", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -228,14 +228,14 @@ describe API::Groups do
       it "returns any existing group" do
         get api("/groups/#{group2.id}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(group2.name)
       end
 
       it "does not return a non existing group" do
         get api("/groups/1328", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -243,20 +243,20 @@ describe API::Groups do
       it 'returns any existing group' do
         get api("/groups/#{group1.path}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(group1.name)
       end
 
       it 'does not return a non existing group' do
         get api('/groups/unknown', admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'does not return a group not attached to user1' do
         get api("/groups/#{group2.path}", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -268,7 +268,7 @@ describe API::Groups do
       it 'updates the group' do
         put api("/groups/#{group1.id}", user1), name: new_group_name, request_access_enabled: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(new_group_name)
         expect(json_response['request_access_enabled']).to eq(true)
       end
@@ -276,7 +276,7 @@ describe API::Groups do
       it 'returns 404 for a non existing group' do
         put api('/groups/1328', user1), name: new_group_name
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -284,7 +284,7 @@ describe API::Groups do
       it 'updates the group' do
         put api("/groups/#{group1.id}", admin), name: new_group_name
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(new_group_name)
       end
     end
@@ -293,7 +293,7 @@ describe API::Groups do
       it 'does not updates the group' do
         put api("/groups/#{group1.id}", user2), name: new_group_name
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -301,7 +301,7 @@ describe API::Groups do
       it 'returns 404 when trying to update the group' do
         put api("/groups/#{group2.id}", user1), name: new_group_name
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -311,7 +311,7 @@ describe API::Groups do
       it "returns the group's projects" do
         get api("/groups/#{group1.id}/projects", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response.length).to eq(2)
         project_names = json_response.map { |proj| proj['name'] }
@@ -322,7 +322,7 @@ describe API::Groups do
       it "returns the group's projects with simple representation" do
         get api("/groups/#{group1.id}/projects", user1), simple: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response.length).to eq(2)
         project_names = json_response.map { |proj| proj['name'] }
@@ -335,7 +335,7 @@ describe API::Groups do
 
         get api("/groups/#{group1.id}/projects", user1), visibility: 'public'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an(Array)
         expect(json_response.length).to eq(1)
@@ -345,13 +345,13 @@ describe API::Groups do
       it "does not return a non existing group" do
         get api("/groups/1328/projects", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "does not return a group not attached to user1" do
         get api("/groups/#{group2.id}/projects", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "only returns projects to which user has access" do
@@ -359,7 +359,7 @@ describe API::Groups do
 
         get api("/groups/#{group1.id}/projects", user3)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(project3.name)
@@ -370,7 +370,7 @@ describe API::Groups do
 
         get api("/groups/#{project2.group.id}/projects", user3), owned: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(project2.name)
       end
@@ -380,7 +380,7 @@ describe API::Groups do
 
         get api("/groups/#{group1.id}/projects", user1), starred: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(project1.name)
       end
@@ -390,7 +390,7 @@ describe API::Groups do
       it "returns any existing group" do
         get api("/groups/#{group2.id}/projects", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(project2.name)
@@ -399,7 +399,7 @@ describe API::Groups do
       it "does not return a non existing group" do
         get api("/groups/1328/projects", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -407,7 +407,7 @@ describe API::Groups do
       it 'returns any existing group' do
         get api("/groups/#{group1.path}/projects", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         project_names = json_response.map { |proj| proj['name'] }
         expect(project_names).to match_array([project1.name, project3.name])
@@ -416,13 +416,13 @@ describe API::Groups do
       it 'does not return a non existing group' do
         get api('/groups/unknown/projects', admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'does not return a group not attached to user1' do
         get api("/groups/#{group2.path}/projects", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -432,7 +432,7 @@ describe API::Groups do
       it "does not create group" do
         post api("/groups", user1), attributes_for(:group)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       context 'as owner', :nested_groups do
@@ -443,7 +443,7 @@ describe API::Groups do
         it 'can create subgroups' do
           post api("/groups", user1), parent_id: group2.id, name: 'foo', path: 'foo'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
         end
       end
 
@@ -455,7 +455,7 @@ describe API::Groups do
         it 'cannot create subgroups' do
           post api("/groups", user1), parent_id: group2.id, name: 'foo', path: 'foo'
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
     end
@@ -466,7 +466,7 @@ describe API::Groups do
 
         post api("/groups", user3), group
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
 
         expect(json_response["name"]).to eq(group[:name])
         expect(json_response["path"]).to eq(group[:path])
@@ -481,7 +481,7 @@ describe API::Groups do
 
         post api("/groups", user3), group
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
 
         expect(json_response["full_path"]).to eq("#{parent.path}/#{group[:path]}")
         expect(json_response["parent_id"]).to eq(parent.id)
@@ -490,20 +490,20 @@ describe API::Groups do
       it "does not create group, duplicate" do
         post api("/groups", user3), { name: 'Duplicate Test', path: group2.path }
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(response.message).to eq("Bad Request")
       end
 
       it "returns 400 bad request error if name not given" do
         post api("/groups", user3), { path: group2.path }
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns 400 bad request error if path not given" do
         post api("/groups", user3), { name: 'test' }
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
   end
@@ -513,7 +513,7 @@ describe API::Groups do
       it "removes group" do
         delete api("/groups/#{group1.id}", user1)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end
 
       it_behaves_like '412 response' do
@@ -526,19 +526,19 @@ describe API::Groups do
 
         delete api("/groups/#{group1.id}", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it "does not remove a non existing group" do
         delete api("/groups/1328", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "does not remove a group not attached to user1" do
         delete api("/groups/#{group2.id}", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -546,13 +546,13 @@ describe API::Groups do
       it "removes any existing group" do
         delete api("/groups/#{group2.id}", admin)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end
 
       it "does not remove a non existing group" do
         delete api("/groups/1328", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -570,7 +570,7 @@ describe API::Groups do
       it "does not transfer project to group" do
         post api("/groups/#{group1.id}/projects/#{project.id}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -578,7 +578,7 @@ describe API::Groups do
       it "transfers project to group" do
         post api("/groups/#{group1.id}/projects/#{project.id}", admin)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       context 'when using project path in URL' do
@@ -586,7 +586,7 @@ describe API::Groups do
           it "transfers project to group" do
             post api("/groups/#{group1.id}/projects/#{project_path}", admin)
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
           end
         end
 
@@ -594,7 +594,7 @@ describe API::Groups do
           it "does not transfer project to group" do
             post api("/groups/#{group1.id}/projects/nogroup%2Fnoproject", admin)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -604,7 +604,7 @@ describe API::Groups do
           it "transfers project to group" do
             post api("/groups/#{group1.path}/projects/#{project_path}", admin)
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
           end
         end
 
@@ -612,7 +612,7 @@ describe API::Groups do
           it "does not transfer project to group" do
             post api("/groups/noexist/projects/#{project_path}", admin)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index 1274e66bb4c..d919899282d 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -14,7 +14,7 @@ describe API::Internal do
 
       get api("/internal/check"), secret_token: secret_token
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['api_version']).to eq(API::API.version)
       expect(json_response['redis']).to be(true)
     end
@@ -35,7 +35,7 @@ describe API::Internal do
       it 'returns one broadcast message'  do
         get api('/internal/broadcast_message'), secret_token: secret_token
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['message']).to eq(broadcast_message.message)
       end
     end
@@ -44,7 +44,7 @@ describe API::Internal do
       it 'returns nothing'  do
         get api('/internal/broadcast_message'), secret_token: secret_token
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_empty
       end
     end
@@ -55,7 +55,7 @@ describe API::Internal do
 
         get api('/internal/broadcast_message'), secret_token: secret_token
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_empty
       end
     end
@@ -68,7 +68,7 @@ describe API::Internal do
       it 'returns active broadcast message(s)' do
         get api('/internal/broadcast_messages'), secret_token: secret_token
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response[0]['message']).to eq(broadcast_message.message)
       end
     end
@@ -77,7 +77,7 @@ describe API::Internal do
       it 'returns nothing' do
         get api('/internal/broadcast_messages'), secret_token: secret_token
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_empty
       end
     end
@@ -154,7 +154,7 @@ describe API::Internal do
       it 'returns the correct information about the key' do
         lfs_auth(key.id, project)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['username']).to eq(user.username)
         expect(json_response['lfs_token']).to eq(Gitlab::LfsToken.new(key).token)
 
@@ -164,7 +164,7 @@ describe API::Internal do
       it 'returns a 404 when the wrong key is provided' do
         lfs_auth(nil, project)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -174,7 +174,7 @@ describe API::Internal do
       it 'returns the correct information about the key' do
         lfs_auth(key.id, project)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['username']).to eq("lfs+deploy-key-#{key.id}")
         expect(json_response['lfs_token']).to eq(Gitlab::LfsToken.new(key).token)
         expect(json_response['repository_http_path']).to eq(project.http_url_to_repo)
@@ -186,7 +186,7 @@ describe API::Internal do
     it do
       get(api("/internal/discover"), key_id: key.id, secret_token: secret_token)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['name']).to eq(user.name)
     end
@@ -214,7 +214,7 @@ describe API::Internal do
             GIT_ALTERNATE_OBJECT_DIRECTORIES: 'bar'
           }.to_json)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
 
@@ -222,7 +222,7 @@ describe API::Internal do
         it 'responds with success' do
           push(key, project.wiki)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_truthy
           expect(json_response["repository_path"]).to eq(project.wiki.repository.path_to_repo)
           expect(json_response["gl_repository"]).to eq("wiki-#{project.id}")
@@ -234,7 +234,7 @@ describe API::Internal do
         it 'responds with success' do
           pull(key, project.wiki)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_truthy
           expect(json_response["repository_path"]).to eq(project.wiki.repository.path_to_repo)
           expect(json_response["gl_repository"]).to eq("wiki-#{project.id}")
@@ -248,7 +248,7 @@ describe API::Internal do
             allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(:ssh_upload_pack).and_return(false)
             pull(key, project)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response["status"]).to be_truthy
             expect(json_response["repository_path"]).to eq(project.repository.path_to_repo)
             expect(json_response["gl_repository"]).to eq("project-#{project.id}")
@@ -262,7 +262,7 @@ describe API::Internal do
             allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(:ssh_upload_pack).and_return(true)
             pull(key, project)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response["status"]).to be_truthy
             expect(json_response["repository_path"]).to eq(project.repository.path_to_repo)
             expect(json_response["gl_repository"]).to eq("project-#{project.id}")
@@ -283,7 +283,7 @@ describe API::Internal do
             allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(:ssh_receive_pack).and_return(false)
             push(key, project)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response["status"]).to be_truthy
             expect(json_response["repository_path"]).to eq(project.repository.path_to_repo)
             expect(json_response["gl_repository"]).to eq("project-#{project.id}")
@@ -297,7 +297,7 @@ describe API::Internal do
             allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(:ssh_receive_pack).and_return(true)
             push(key, project)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response["status"]).to be_truthy
             expect(json_response["repository_path"]).to eq(project.repository.path_to_repo)
             expect(json_response["gl_repository"]).to eq("project-#{project.id}")
@@ -315,7 +315,7 @@ describe API::Internal do
           it do
             pull(key, project_with_repo_path('/' + project.full_path))
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response["status"]).to be_truthy
             expect(json_response["repository_path"]).to eq(project.repository.path_to_repo)
             expect(json_response["gl_repository"]).to eq("project-#{project.id}")
@@ -326,7 +326,7 @@ describe API::Internal do
           it do
             pull(key, project_with_repo_path(project.full_path))
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response["status"]).to be_truthy
             expect(json_response["repository_path"]).to eq(project.repository.path_to_repo)
             expect(json_response["gl_repository"]).to eq("project-#{project.id}")
@@ -344,7 +344,7 @@ describe API::Internal do
         it do
           pull(key, project)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_falsey
           expect(user).not_to have_an_activity_record
         end
@@ -354,7 +354,7 @@ describe API::Internal do
         it do
           push(key, project)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_falsey
           expect(user).not_to have_an_activity_record
         end
@@ -372,7 +372,7 @@ describe API::Internal do
         it do
           pull(key, personal_project)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_falsey
           expect(user).not_to have_an_activity_record
         end
@@ -382,7 +382,7 @@ describe API::Internal do
         it do
           push(key, personal_project)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_falsey
           expect(user).not_to have_an_activity_record
         end
@@ -399,7 +399,7 @@ describe API::Internal do
         it do
           pull(key, project)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_truthy
         end
       end
@@ -408,7 +408,7 @@ describe API::Internal do
         it do
           push(key, project)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_falsey
         end
       end
@@ -425,7 +425,7 @@ describe API::Internal do
         it do
           archive(key, project)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_truthy
         end
       end
@@ -434,7 +434,7 @@ describe API::Internal do
         it do
           archive(key, project)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response["status"]).to be_falsey
         end
       end
@@ -444,7 +444,7 @@ describe API::Internal do
       it do
         pull(key, project_with_repo_path('gitlab/notexist'))
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response["status"]).to be_falsey
       end
     end
@@ -453,7 +453,7 @@ describe API::Internal do
       it do
         pull(OpenStruct.new(id: 0), project)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response["status"]).to be_falsey
       end
     end
@@ -535,7 +535,7 @@ describe API::Internal do
       it 'rejects the push' do
         push_with_path(key, old_path_to_repo)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to be_falsey
         expect(json_response['message']).to eq(project_moved_message)
       end
@@ -543,7 +543,7 @@ describe API::Internal do
       it 'rejects the SSH pull' do
         pull_with_path(key, old_path_to_repo)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to be_falsey
         expect(json_response['message']).to eq(project_moved_message)
       end
@@ -614,7 +614,7 @@ describe API::Internal do
   #
   #     post api("/internal/notify_post_receive"), valid_params
   #
-  #     expect(response).to have_http_status(200)
+  #     expect(response).to have_gitlab_http_status(200)
   #   end
   #
   #   it "calls the Gitaly client with the wiki's repository if it's a wiki" do
@@ -626,7 +626,7 @@ describe API::Internal do
   #
   #     post api("/internal/notify_post_receive"), valid_wiki_params
   #
-  #     expect(response).to have_http_status(200)
+  #     expect(response).to have_gitlab_http_status(200)
   #   end
   #
   #   it "returns 500 if the gitaly call fails" do
@@ -635,7 +635,7 @@ describe API::Internal do
   #
   #     post api("/internal/notify_post_receive"), valid_params
   #
-  #     expect(response).to have_http_status(500)
+  #     expect(response).to have_gitlab_http_status(500)
   #   end
   #
   #   context 'with a gl_repository parameter' do
@@ -656,7 +656,7 @@ describe API::Internal do
   #
   #       post api("/internal/notify_post_receive"), valid_params
   #
-  #       expect(response).to have_http_status(200)
+  #       expect(response).to have_gitlab_http_status(200)
   #     end
   #
   #     it "calls the Gitaly client with the wiki's repository if it's a wiki" do
@@ -668,7 +668,7 @@ describe API::Internal do
   #
   #       post api("/internal/notify_post_receive"), valid_wiki_params
   #
-  #       expect(response).to have_http_status(200)
+  #       expect(response).to have_gitlab_http_status(200)
   #     end
   #   end
   # end
@@ -734,7 +734,7 @@ describe API::Internal do
       it 'returns one broadcast message'  do
         post api("/internal/post_receive"), valid_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['broadcast_message']).to eq(broadcast_message.message)
       end
     end
@@ -743,7 +743,7 @@ describe API::Internal do
       it 'returns empty string'  do
         post api("/internal/post_receive"), valid_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['broadcast_message']).to eq(nil)
       end
     end
@@ -754,7 +754,7 @@ describe API::Internal do
 
         post api("/internal/post_receive"), valid_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['broadcast_message']).to eq(nil)
       end
     end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 972e57bc373..99525cd0a6a 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -67,7 +67,7 @@ describe API::Issues, :mailer do
       it "returns authentication error" do
         get api("/issues")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
     context "when authenticated" do
@@ -297,7 +297,7 @@ describe API::Issues, :mailer do
       it 'matches V4 response schema' do
         get api('/issues', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to match_response_schema('public_api/v4/issues')
       end
     end
@@ -474,7 +474,7 @@ describe API::Issues, :mailer do
     it 'returns an array of issues with no milestone' do
       get api("#{base_url}?milestone=#{no_milestone_title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect_paginated_array_response(size: 1)
       expect(json_response.first['id']).to eq(group_confidential_issue.id)
@@ -535,7 +535,7 @@ describe API::Issues, :mailer do
     it 'returns 404 when project does not exist' do
       get api('/projects/1000/issues', non_member)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns 404 on private projects for other users" do
@@ -544,7 +544,7 @@ describe API::Issues, :mailer do
 
       get api("/projects/#{private_project.id}/issues", non_member)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns no issues when user has access to project but not issues' do
@@ -732,7 +732,7 @@ describe API::Issues, :mailer do
     it 'exposes known attributes' do
       get api("/projects/#{project.id}/issues/#{issue.iid}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['id']).to eq(issue.id)
       expect(json_response['iid']).to eq(issue.iid)
       expect(json_response['project_id']).to eq(issue.project.id)
@@ -753,7 +753,7 @@ describe API::Issues, :mailer do
     it "exposes the 'closed_at' attribute" do
       get api("/projects/#{project.id}/issues/#{closed_issue.iid}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['closed_at']).to be_present
     end
 
@@ -773,39 +773,39 @@ describe API::Issues, :mailer do
     it "returns a project issue by internal id" do
       get api("/projects/#{project.id}/issues/#{issue.iid}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(issue.title)
       expect(json_response['iid']).to eq(issue.iid)
     end
 
     it "returns 404 if issue id not found" do
       get api("/projects/#{project.id}/issues/54321", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns 404 if the issue ID is used" do
       get api("/projects/#{project.id}/issues/#{issue.id}", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context 'confidential issues' do
       it "returns 404 for non project members" do
         get api("/projects/#{project.id}/issues/#{confidential_issue.iid}", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns 404 for project members with guest role" do
         get api("/projects/#{project.id}/issues/#{confidential_issue.iid}", guest)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns confidential issue for project members" do
         get api("/projects/#{project.id}/issues/#{confidential_issue.iid}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(confidential_issue.title)
         expect(json_response['iid']).to eq(confidential_issue.iid)
       end
@@ -813,7 +813,7 @@ describe API::Issues, :mailer do
       it "returns confidential issue for author" do
         get api("/projects/#{project.id}/issues/#{confidential_issue.iid}", author)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(confidential_issue.title)
         expect(json_response['iid']).to eq(confidential_issue.iid)
       end
@@ -821,7 +821,7 @@ describe API::Issues, :mailer do
       it "returns confidential issue for assignee" do
         get api("/projects/#{project.id}/issues/#{confidential_issue.iid}", assignee)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(confidential_issue.title)
         expect(json_response['iid']).to eq(confidential_issue.iid)
       end
@@ -829,7 +829,7 @@ describe API::Issues, :mailer do
       it "returns confidential issue for admin" do
         get api("/projects/#{project.id}/issues/#{confidential_issue.iid}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(confidential_issue.title)
         expect(json_response['iid']).to eq(confidential_issue.iid)
       end
@@ -842,7 +842,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues", user),
           title: 'new issue', assignee_id: user2.id
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq('new issue')
         expect(json_response['assignee']['name']).to eq(user2.name)
         expect(json_response['assignees'].first['name']).to eq(user2.name)
@@ -854,7 +854,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues", user),
           title: 'new issue', assignee_ids: [user2.id, guest.id]
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq('new issue')
         expect(json_response['assignees'].count).to eq(1)
       end
@@ -865,7 +865,7 @@ describe API::Issues, :mailer do
         title: 'new issue', labels: 'label, label2', weight: 3,
         assignee_ids: [user2.id]
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['description']).to be_nil
       expect(json_response['labels']).to eq(%w(label label2))
@@ -878,7 +878,7 @@ describe API::Issues, :mailer do
       post api("/projects/#{project.id}/issues", user),
         title: 'new issue', confidential: true
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['confidential']).to be_truthy
     end
@@ -887,7 +887,7 @@ describe API::Issues, :mailer do
       post api("/projects/#{project.id}/issues", user),
         title: 'new issue', confidential: 'y'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['confidential']).to be_truthy
     end
@@ -896,7 +896,7 @@ describe API::Issues, :mailer do
       post api("/projects/#{project.id}/issues", user),
         title: 'new issue', confidential: false
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['confidential']).to be_falsy
     end
@@ -905,7 +905,7 @@ describe API::Issues, :mailer do
       post api("/projects/#{project.id}/issues", user),
         title: 'new issue', confidential: 'foo'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('confidential is invalid')
     end
 
@@ -923,7 +923,7 @@ describe API::Issues, :mailer do
 
     it "returns a 400 bad request if title not given" do
       post api("/projects/#{project.id}/issues", user), labels: 'label, label2'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'allows special label names' do
@@ -941,7 +941,7 @@ describe API::Issues, :mailer do
     it 'returns 400 if title is too long' do
       post api("/projects/#{project.id}/issues", user),
            title: 'g' * 256
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['title']).to eq([
         'is too long (maximum is 255 characters)'
       ])
@@ -985,7 +985,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues", user),
           title: 'new issue', due_date: due_date
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq('new issue')
         expect(json_response['description']).to be_nil
         expect(json_response['due_date']).to eq(due_date)
@@ -998,7 +998,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues", user),
           title: 'new issue', labels: 'label, label2', created_at: creation_time
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(Time.parse(json_response['created_at'])).to be_like_time(creation_time)
       end
     end
@@ -1028,7 +1028,7 @@ describe API::Issues, :mailer do
 
     it "does not create a new project issue" do
       expect { post api("/projects/#{project.id}/issues", user), params }.not_to change(Issue, :count)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']).to eq({ "error" => "Spam detected" })
 
       spam_logs = SpamLog.all
@@ -1044,7 +1044,7 @@ describe API::Issues, :mailer do
     it "updates a project issue" do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
         title: 'updated title'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['title']).to eq('updated title')
     end
@@ -1052,13 +1052,13 @@ describe API::Issues, :mailer do
     it "returns 404 error if issue iid not found" do
       put api("/projects/#{project.id}/issues/44444", user),
         title: 'updated title'
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns 404 error if issue id is used instead of the iid" do
       put api("/projects/#{project.id}/issues/#{issue.id}", user),
           title: 'updated title'
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'allows special label names' do
@@ -1078,33 +1078,33 @@ describe API::Issues, :mailer do
       it "returns 403 for non project members" do
         put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", non_member),
           title: 'updated title'
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it "returns 403 for project members with guest role" do
         put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", guest),
           title: 'updated title'
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it "updates a confidential issue for project members" do
         put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", user),
           title: 'updated title'
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq('updated title')
       end
 
       it "updates a confidential issue for author" do
         put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", author),
           title: 'updated title'
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq('updated title')
       end
 
       it "updates a confidential issue for admin" do
         put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", admin),
           title: 'updated title'
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq('updated title')
       end
 
@@ -1112,7 +1112,7 @@ describe API::Issues, :mailer do
         put api("/projects/#{project.id}/issues/#{issue.iid}", user),
           confidential: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['confidential']).to be_truthy
       end
 
@@ -1120,7 +1120,7 @@ describe API::Issues, :mailer do
         put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", user),
           confidential: false
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['confidential']).to be_falsy
       end
 
@@ -1128,7 +1128,7 @@ describe API::Issues, :mailer do
         put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", user),
           confidential: 'foo'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('confidential is invalid')
       end
     end
@@ -1149,7 +1149,7 @@ describe API::Issues, :mailer do
 
       put api("/projects/#{project.id}/issues/#{issue.iid}", user), params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']).to eq({ "error" => "Spam detected" })
 
       spam_logs = SpamLog.all
@@ -1167,7 +1167,7 @@ describe API::Issues, :mailer do
         put api("/projects/#{project.id}/issues/#{issue.iid}", user),
           assignee_id: 0
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         expect(json_response['assignee']).to be_nil
       end
@@ -1176,7 +1176,7 @@ describe API::Issues, :mailer do
         put api("/projects/#{project.id}/issues/#{issue.iid}", user),
           assignee_id: user2.id
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         expect(json_response['assignee']['name']).to eq(user2.name)
       end
@@ -1186,7 +1186,7 @@ describe API::Issues, :mailer do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
         assignee_ids: [0]
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['assignees']).to be_empty
     end
@@ -1195,7 +1195,7 @@ describe API::Issues, :mailer do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
         assignee_ids: [user2.id]
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['assignees'].first['name']).to eq(user2.name)
     end
@@ -1205,7 +1205,7 @@ describe API::Issues, :mailer do
         put api("/projects/#{project.id}/issues/#{issue.iid}", user),
           assignee_ids: [user2.id, guest.id]
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         expect(json_response['assignees'].size).to eq(1)
       end
@@ -1219,7 +1219,7 @@ describe API::Issues, :mailer do
     it 'does not update labels if not present' do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
           title: 'updated title'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['labels']).to eq([label.title])
     end
 
@@ -1238,14 +1238,14 @@ describe API::Issues, :mailer do
     it 'removes all labels' do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user), labels: ''
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['labels']).to eq([])
     end
 
     it 'updates labels' do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
           labels: 'foo,bar'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['labels']).to include 'foo'
       expect(json_response['labels']).to include 'bar'
     end
@@ -1267,7 +1267,7 @@ describe API::Issues, :mailer do
     it 'returns 400 if title is too long' do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
           title: 'g' * 256
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['title']).to eq([
         'is too long (maximum is 255 characters)'
       ])
@@ -1278,7 +1278,7 @@ describe API::Issues, :mailer do
     it "updates a project issue" do
       put api("/projects/#{project.id}/issues/#{issue.iid}", user),
         labels: 'label2', state_event: "close"
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['labels']).to include 'label2'
       expect(json_response['state']).to eq "closed"
@@ -1287,7 +1287,7 @@ describe API::Issues, :mailer do
     it 'reopens a project isssue' do
       put api("/projects/#{project.id}/issues/#{closed_issue.iid}", user), state_event: 'reopen'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['state']).to eq 'opened'
     end
 
@@ -1297,7 +1297,7 @@ describe API::Issues, :mailer do
         put api("/projects/#{project.id}/issues/#{issue.iid}", user),
           labels: 'label3', state_event: 'close', updated_at: update_time
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['labels']).to include 'label3'
         expect(Time.parse(json_response['updated_at'])).to be_like_time(update_time)
       end
@@ -1310,7 +1310,7 @@ describe API::Issues, :mailer do
 
       put api("/projects/#{project.id}/issues/#{issue.iid}", user), due_date: due_date
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['due_date']).to eq(due_date)
     end
   end
@@ -1318,12 +1318,12 @@ describe API::Issues, :mailer do
   describe "DELETE /projects/:id/issues/:issue_iid" do
     it "rejects a non member from deleting an issue" do
       delete api("/projects/#{project.id}/issues/#{issue.iid}", non_member)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it "rejects a developer from deleting an issue" do
       delete api("/projects/#{project.id}/issues/#{issue.iid}", author)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     context "when the user is project owner" do
@@ -1333,7 +1333,7 @@ describe API::Issues, :mailer do
       it "deletes the issue if an admin requests it" do
         delete api("/projects/#{project.id}/issues/#{issue.iid}", owner)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end
 
       it_behaves_like '412 response' do
@@ -1345,14 +1345,14 @@ describe API::Issues, :mailer do
       it 'returns 404 when trying to move an issue' do
         delete api("/projects/#{project.id}/issues/123", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
     it 'returns 404 when using the issue ID instead of IID' do
       delete api("/projects/#{project.id}/issues/#{issue.id}", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1364,7 +1364,7 @@ describe API::Issues, :mailer do
       post api("/projects/#{project.id}/issues/#{issue.iid}/move", user),
                to_project_id: target_project.id
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['project_id']).to eq(target_project.id)
     end
 
@@ -1373,7 +1373,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues/#{issue.iid}/move", user),
                  to_project_id: project.id
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']).to eq('Cannot move issue to project it originates from!')
       end
     end
@@ -1383,7 +1383,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues/#{issue.iid}/move", user),
                  to_project_id: target_project2.id
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']).to eq('Cannot move issue due to insufficient permissions!')
       end
     end
@@ -1392,7 +1392,7 @@ describe API::Issues, :mailer do
       post api("/projects/#{project.id}/issues/#{issue.iid}/move", admin),
                to_project_id: target_project2.id
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['project_id']).to eq(target_project2.id)
     end
 
@@ -1401,7 +1401,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
              to_project_id: target_project.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Issue Not Found')
       end
     end
@@ -1411,7 +1411,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues/123/move", user),
                  to_project_id: target_project.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Issue Not Found')
       end
     end
@@ -1421,7 +1421,7 @@ describe API::Issues, :mailer do
         post api("/projects/123/issues/#{issue.iid}/move", user),
                  to_project_id: target_project.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
     end
@@ -1431,7 +1431,7 @@ describe API::Issues, :mailer do
         post api("/projects/#{project.id}/issues/#{issue.iid}/move", user),
                  to_project_id: 123
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -1440,32 +1440,32 @@ describe API::Issues, :mailer do
     it 'subscribes to an issue' do
       post api("/projects/#{project.id}/issues/#{issue.iid}/subscribe", user2)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['subscribed']).to eq(true)
     end
 
     it 'returns 304 if already subscribed' do
       post api("/projects/#{project.id}/issues/#{issue.iid}/subscribe", user)
 
-      expect(response).to have_http_status(304)
+      expect(response).to have_gitlab_http_status(304)
     end
 
     it 'returns 404 if the issue is not found' do
       post api("/projects/#{project.id}/issues/123/subscribe", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 404 if the issue ID is used instead of the iid' do
       post api("/projects/#{project.id}/issues/#{issue.id}/subscribe", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 404 if the issue is confidential' do
       post api("/projects/#{project.id}/issues/#{confidential_issue.iid}/subscribe", non_member)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1473,32 +1473,32 @@ describe API::Issues, :mailer do
     it 'unsubscribes from an issue' do
       post api("/projects/#{project.id}/issues/#{issue.iid}/unsubscribe", user)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['subscribed']).to eq(false)
     end
 
     it 'returns 304 if not subscribed' do
       post api("/projects/#{project.id}/issues/#{issue.iid}/unsubscribe", user2)
 
-      expect(response).to have_http_status(304)
+      expect(response).to have_gitlab_http_status(304)
     end
 
     it 'returns 404 if the issue is not found' do
       post api("/projects/#{project.id}/issues/123/unsubscribe", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 404 if using the issue ID instead of iid' do
       post api("/projects/#{project.id}/issues/#{issue.id}/unsubscribe", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 404 if the issue is confidential' do
       post api("/projects/#{project.id}/issues/#{confidential_issue.iid}/unsubscribe", non_member)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1539,7 +1539,7 @@ describe API::Issues, :mailer do
     it "returns 404 when issue doesn't exists" do
       get api("/projects/#{project.id}/issues/9999/closed_by", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1549,7 +1549,7 @@ describe API::Issues, :mailer do
     it 'exposes known attributes' do
       get api("/projects/#{project.id}/issues/#{issue.iid}/user_agent_detail", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['user_agent']).to eq(user_agent_detail.user_agent)
       expect(json_response['ip_address']).to eq(user_agent_detail.ip_address)
       expect(json_response['akismet_submitted']).to eq(user_agent_detail.submitted)
@@ -1558,12 +1558,12 @@ describe API::Issues, :mailer do
     it "returns unautorized for non-admin users" do
       get api("/projects/#{project.id}/issues/#{issue.iid}/user_agent_detail", user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 
   def expect_paginated_array_response(size: nil)
-    expect(response).to have_http_status(200)
+    expect(response).to have_gitlab_http_status(200)
     expect(response).to include_pagination_headers
     expect(json_response).to be_an Array
     expect(json_response.length).to eq(size) if size
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb
index 2d7cc1a1798..3b7b9c889e7 100644
--- a/spec/requests/api/jobs_spec.rb
+++ b/spec/requests/api/jobs_spec.rb
@@ -31,7 +31,7 @@ describe API::Jobs do
 
     context 'authorized user' do
       it 'returns project jobs' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
       end
@@ -55,7 +55,7 @@ describe API::Jobs do
         let(:query) { { 'scope' => 'pending' } }
 
         it do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
         end
       end
@@ -64,7 +64,7 @@ describe API::Jobs do
         let(:query) { { scope: %w(pending running) } }
 
         it do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
         end
       end
@@ -72,7 +72,7 @@ describe API::Jobs do
       context 'respond 400 when scope contains invalid state' do
         let(:query) { { scope: %w(unknown running) } }
 
-        it { expect(response).to have_http_status(400) }
+        it { expect(response).to have_gitlab_http_status(400) }
       end
     end
 
@@ -80,7 +80,7 @@ describe API::Jobs do
       let(:api_user) { nil }
 
       it 'does not return project jobs' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -94,7 +94,7 @@ describe API::Jobs do
 
     context 'authorized user' do
       it 'returns pipeline jobs' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
       end
@@ -118,7 +118,7 @@ describe API::Jobs do
         let(:query) { { 'scope' => 'pending' } }
 
         it do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
         end
       end
@@ -127,7 +127,7 @@ describe API::Jobs do
         let(:query) { { scope: %w(pending running) } }
 
         it do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
         end
       end
@@ -135,7 +135,7 @@ describe API::Jobs do
       context 'respond 400 when scope contains invalid state' do
         let(:query) { { scope: %w(unknown running) } }
 
-        it { expect(response).to have_http_status(400) }
+        it { expect(response).to have_gitlab_http_status(400) }
       end
 
       context 'jobs in different pipelines' do
@@ -152,7 +152,7 @@ describe API::Jobs do
       let(:api_user) { nil }
 
       it 'does not return jobs' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -164,7 +164,7 @@ describe API::Jobs do
 
     context 'authorized user' do
       it 'returns specific job data' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq('test')
       end
 
@@ -183,7 +183,7 @@ describe API::Jobs do
       let(:api_user) { nil }
 
       it 'does not return specific job data' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -207,7 +207,7 @@ describe API::Jobs do
 
             get_artifact_file(artifact)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
 
@@ -219,7 +219,7 @@ describe API::Jobs do
 
             get_artifact_file(artifact)
 
-            expect(response).to have_http_status(403)
+            expect(response).to have_gitlab_http_status(403)
           end
         end
 
@@ -231,7 +231,7 @@ describe API::Jobs do
 
             get_artifact_file(artifact)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -244,7 +244,7 @@ describe API::Jobs do
 
           get_artifact_file(artifact)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.headers)
             .to include('Content-Type' => 'application/json',
                         'Gitlab-Workhorse-Send-Data' => /artifacts-entry/)
@@ -256,7 +256,7 @@ describe API::Jobs do
       it 'does not return job artifact file' do
         get_artifact_file('some/artifact')
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -281,7 +281,7 @@ describe API::Jobs do
         end
 
         it 'returns specific job artifacts' do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.headers).to include(download_headers)
           expect(response.body).to match_file(job.artifacts_file.file.file)
         end
@@ -292,13 +292,13 @@ describe API::Jobs do
 
         it 'hides artifacts and rejects request' do
           expect(project).to be_private
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
 
     it 'does not return job artifacts if not uploaded' do
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -323,7 +323,7 @@ describe API::Jobs do
 
       it 'does not find a resource in a private project' do
         expect(project).to be_private
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -335,13 +335,13 @@ describe API::Jobs do
       end
 
       it 'gives 403' do
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
     context 'non-existing job' do
       shared_examples 'not found' do
-        it { expect(response).to have_http_status(:not_found) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
 
       context 'has no such ref' do
@@ -369,7 +369,7 @@ describe API::Jobs do
               "attachment; filename=#{job.artifacts_file.filename}" }
         end
 
-        it { expect(response).to have_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(200) }
         it { expect(response.headers).to include(download_headers) }
       end
 
@@ -410,7 +410,7 @@ describe API::Jobs do
 
     context 'authorized user' do
       it 'returns specific job trace' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response.body).to eq(job.trace.raw)
       end
     end
@@ -419,7 +419,7 @@ describe API::Jobs do
       let(:api_user) { nil }
 
       it 'does not return specific job trace' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -432,7 +432,7 @@ describe API::Jobs do
     context 'authorized user' do
       context 'user with :update_build persmission' do
         it 'cancels running or pending job' do
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(project.builds.first.status).to eq('canceled')
         end
       end
@@ -441,7 +441,7 @@ describe API::Jobs do
         let(:api_user) { reporter }
 
         it 'does not cancel job' do
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
     end
@@ -450,7 +450,7 @@ describe API::Jobs do
       let(:api_user) { nil }
 
       it 'does not cancel job' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -465,7 +465,7 @@ describe API::Jobs do
     context 'authorized user' do
       context 'user with :update_build permission' do
         it 'retries non-running job' do
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(project.builds.first.status).to eq('canceled')
           expect(json_response['status']).to eq('pending')
         end
@@ -475,7 +475,7 @@ describe API::Jobs do
         let(:api_user) { reporter }
 
         it 'does not retry job' do
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
     end
@@ -484,7 +484,7 @@ describe API::Jobs do
       let(:api_user) { nil }
 
       it 'does not retry job' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -498,7 +498,7 @@ describe API::Jobs do
       let(:job) { create(:ci_build, :trace, :artifacts, :success, project: project, pipeline: pipeline) }
 
       it 'erases job content' do
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(job).not_to have_trace
         expect(job.artifacts_file.exists?).to be_falsy
         expect(job.artifacts_metadata.exists?).to be_falsy
@@ -516,7 +516,7 @@ describe API::Jobs do
       let(:job) { create(:ci_build, :trace, project: project, pipeline: pipeline) }
 
       it 'responds with forbidden' do
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -533,7 +533,7 @@ describe API::Jobs do
       end
 
       it 'keeps artifacts' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(job.reload.artifacts_expire_at).to be_nil
       end
     end
@@ -542,7 +542,7 @@ describe API::Jobs do
       let(:job) { create(:ci_build, project: project, pipeline: pipeline) }
 
       it 'responds with not found' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -557,7 +557,7 @@ describe API::Jobs do
 
       context 'when user is authorized to trigger a manual action' do
         it 'plays the job' do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['user']['id']).to eq(user.id)
           expect(json_response['id']).to eq(job.id)
           expect(job.reload).to be_pending
@@ -570,7 +570,7 @@ describe API::Jobs do
 
           it 'does not trigger a manual action' do
             expect(job.reload).to be_manual
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -579,7 +579,7 @@ describe API::Jobs do
 
           it 'does not trigger a manual action' do
             expect(job.reload).to be_manual
-            expect(response).to have_http_status(403)
+            expect(response).to have_gitlab_http_status(403)
           end
         end
       end
@@ -587,7 +587,7 @@ describe API::Jobs do
 
     context 'on a non-playable job' do
       it 'returns a status code 400, Bad Request' do
-        expect(response).to have_http_status 400
+        expect(response).to have_gitlab_http_status 400
         expect(response.body).to match("Unplayable Job")
       end
     end
diff --git a/spec/requests/api/keys_spec.rb b/spec/requests/api/keys_spec.rb
index f534332ca6c..3c4719964b6 100644
--- a/spec/requests/api/keys_spec.rb
+++ b/spec/requests/api/keys_spec.rb
@@ -10,14 +10,14 @@ describe API::Keys do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get api("/keys/#{key.id}")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context 'when authenticated' do
       it 'returns 404 for non-existing key' do
         get api('/keys/999999', admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Not found')
       end
 
@@ -25,7 +25,7 @@ describe API::Keys do
         user.keys << key
         user.save
         get api("/keys/#{key.id}", admin)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(key.title)
         expect(json_response['user']['id']).to eq(user.id)
         expect(json_response['user']['username']).to eq(user.username)
diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb
index b231fdea2a3..3498e5bc8d9 100644
--- a/spec/requests/api/labels_spec.rb
+++ b/spec/requests/api/labels_spec.rb
@@ -27,7 +27,7 @@ describe API::Labels do
 
       get api("/projects/#{project.id}/labels", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(3)
@@ -75,7 +75,7 @@ describe API::Labels do
            description: 'test',
            priority: 2
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['name']).to eq('Foo')
       expect(json_response['color']).to eq('#FFAABB')
       expect(json_response['description']).to eq('test')
@@ -109,19 +109,19 @@ describe API::Labels do
 
     it 'returns a 400 bad request if name not given' do
       post api("/projects/#{project.id}/labels", user), color: '#FFAABB'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns a 400 bad request if color not given' do
       post api("/projects/#{project.id}/labels", user), name: 'Foobar'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 400 for invalid color' do
       post api("/projects/#{project.id}/labels", user),
            name: 'Foo',
            color: '#FFAA'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['color']).to eq(['must be a valid color code'])
     end
 
@@ -129,7 +129,7 @@ describe API::Labels do
       post api("/projects/#{project.id}/labels", user),
            name: 'Foo',
            color: '#FFAAFFFF'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['color']).to eq(['must be a valid color code'])
     end
 
@@ -137,7 +137,7 @@ describe API::Labels do
       post api("/projects/#{project.id}/labels", user),
            name: ',',
            color: '#FFAABB'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['title']).to eq(['is invalid'])
     end
 
@@ -150,7 +150,7 @@ describe API::Labels do
            name: group_label.name,
            color: '#FFAABB'
 
-      expect(response).to have_http_status(409)
+      expect(response).to have_gitlab_http_status(409)
       expect(json_response['message']).to eq('Label already exists')
     end
 
@@ -160,14 +160,14 @@ describe API::Labels do
            color: '#FFAAFFFF',
            priority: 'foo'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 409 if label already exists in project' do
       post api("/projects/#{project.id}/labels", user),
            name: 'label1',
            color: '#FFAABB'
-      expect(response).to have_http_status(409)
+      expect(response).to have_gitlab_http_status(409)
       expect(json_response['message']).to eq('Label already exists')
     end
   end
@@ -176,18 +176,18 @@ describe API::Labels do
     it 'returns 204 for existing label' do
       delete api("/projects/#{project.id}/labels", user), name: 'label1'
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
     end
 
     it 'returns 404 for non existing label' do
       delete api("/projects/#{project.id}/labels", user), name: 'label2'
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Label Not Found')
     end
 
     it 'returns 400 for wrong parameters' do
       delete api("/projects/#{project.id}/labels", user)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it_behaves_like '412 response' do
@@ -203,7 +203,7 @@ describe API::Labels do
           new_name: 'New Label',
           color: '#FFFFFF',
           description: 'test'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['name']).to eq('New Label')
       expect(json_response['color']).to eq('#FFFFFF')
       expect(json_response['description']).to eq('test')
@@ -213,7 +213,7 @@ describe API::Labels do
       put api("/projects/#{project.id}/labels", user),
           name: 'label1',
           new_name: 'New Label'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['name']).to eq('New Label')
       expect(json_response['color']).to eq(label1.color)
     end
@@ -222,7 +222,7 @@ describe API::Labels do
       put api("/projects/#{project.id}/labels", user),
           name: 'label1',
           color: '#FFFFFF'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['name']).to eq(label1.name)
       expect(json_response['color']).to eq('#FFFFFF')
     end
@@ -232,7 +232,7 @@ describe API::Labels do
           name: 'bug',
           description: 'test'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['name']).to eq(priority_label.name)
       expect(json_response['description']).to eq('test')
       expect(json_response['priority']).to eq(3)
@@ -272,18 +272,18 @@ describe API::Labels do
       put api("/projects/#{project.id}/labels", user),
           name: 'label2',
           new_name: 'label3'
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 400 if no label name given' do
       put api("/projects/#{project.id}/labels", user), new_name: 'label2'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('name is missing')
     end
 
     it 'returns 400 if no new parameters given' do
       put api("/projects/#{project.id}/labels", user), name: 'label1'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('new_name, color, description, priority are missing, '\
                                            'at least one parameter must be provided')
     end
@@ -293,7 +293,7 @@ describe API::Labels do
           name: 'label1',
           new_name: ',',
           color: '#FFFFFF'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['title']).to eq(['is invalid'])
     end
 
@@ -301,7 +301,7 @@ describe API::Labels do
       put api("/projects/#{project.id}/labels", user),
           name: 'label1',
           color: '#FF'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['color']).to eq(['must be a valid color code'])
     end
 
@@ -309,7 +309,7 @@ describe API::Labels do
       post api("/projects/#{project.id}/labels", user),
            name: 'Foo',
            color: '#FFAAFFFF'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['color']).to eq(['must be a valid color code'])
     end
 
@@ -318,7 +318,7 @@ describe API::Labels do
            name: 'Foo',
            priority: 'foo'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 
@@ -327,7 +327,7 @@ describe API::Labels do
       it "subscribes to the label" do
         post api("/projects/#{project.id}/labels/#{label1.title}/subscribe", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response["name"]).to eq(label1.title)
         expect(json_response["subscribed"]).to be_truthy
       end
@@ -337,7 +337,7 @@ describe API::Labels do
       it "subscribes to the label" do
         post api("/projects/#{project.id}/labels/#{label1.id}/subscribe", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response["name"]).to eq(label1.title)
         expect(json_response["subscribed"]).to be_truthy
       end
@@ -351,7 +351,7 @@ describe API::Labels do
       it "returns 304" do
         post api("/projects/#{project.id}/labels/#{label1.id}/subscribe", user)
 
-        expect(response).to have_http_status(304)
+        expect(response).to have_gitlab_http_status(304)
       end
     end
 
@@ -359,7 +359,7 @@ describe API::Labels do
       it "returns 404 error" do
         post api("/projects/#{project.id}/labels/1234/subscribe", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -373,7 +373,7 @@ describe API::Labels do
       it "unsubscribes from the label" do
         post api("/projects/#{project.id}/labels/#{label1.title}/unsubscribe", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response["name"]).to eq(label1.title)
         expect(json_response["subscribed"]).to be_falsey
       end
@@ -383,7 +383,7 @@ describe API::Labels do
       it "unsubscribes from the label" do
         post api("/projects/#{project.id}/labels/#{label1.id}/unsubscribe", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response["name"]).to eq(label1.title)
         expect(json_response["subscribed"]).to be_falsey
       end
@@ -397,7 +397,7 @@ describe API::Labels do
       it "returns 304" do
         post api("/projects/#{project.id}/labels/#{label1.id}/unsubscribe", user)
 
-        expect(response).to have_http_status(304)
+        expect(response).to have_gitlab_http_status(304)
       end
     end
 
@@ -405,7 +405,7 @@ describe API::Labels do
       it "returns 404 error" do
         post api("/projects/#{project.id}/labels/1234/unsubscribe", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/lint_spec.rb b/spec/requests/api/lint_spec.rb
index df7c91b5bc1..e3065840e6f 100644
--- a/spec/requests/api/lint_spec.rb
+++ b/spec/requests/api/lint_spec.rb
@@ -10,7 +10,7 @@ describe API::Lint do
       it 'passes validation' do
         post api('/ci/lint'), { content: yaml_content }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Hash
         expect(json_response['status']).to eq('valid')
         expect(json_response['errors']).to eq([])
@@ -21,7 +21,7 @@ describe API::Lint do
       it 'responds with errors about invalid syntax' do
         post api('/ci/lint'), { content: 'invalid content' }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to eq('invalid')
         expect(json_response['errors']).to eq(['Invalid configuration format'])
       end
@@ -29,7 +29,7 @@ describe API::Lint do
       it "responds with errors about invalid configuration" do
         post api('/ci/lint'), { content: '{ image: "ruby:2.1",  services: ["postgres"] }' }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to eq('invalid')
         expect(json_response['errors']).to eq(['jobs config should contain at least one visible job'])
       end
@@ -39,7 +39,7 @@ describe API::Lint do
       it 'responds with validation error about missing content' do
         post api('/ci/lint')
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('content is missing')
       end
     end
diff --git a/spec/requests/api/members_spec.rb b/spec/requests/api/members_spec.rb
index d3bae8d2888..3349e396ab8 100644
--- a/spec/requests/api/members_spec.rb
+++ b/spec/requests/api/members_spec.rb
@@ -35,7 +35,7 @@ describe API::Members do
 
             get api("/#{source_type.pluralize}/#{source.id}/members", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response.size).to eq(2)
@@ -49,7 +49,7 @@ describe API::Members do
 
         get api("/#{source_type.pluralize}/#{source.id}/members", developer)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(2)
@@ -59,7 +59,7 @@ describe API::Members do
       it 'finds members with query string' do
         get api("/#{source_type.pluralize}/#{source.id}/members", developer), query: master.username
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.count).to eq(1)
@@ -81,7 +81,7 @@ describe API::Members do
               user = public_send(type)
               get api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", user)
 
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
               # User attributes
               expect(json_response['id']).to eq(developer.id)
               expect(json_response['name']).to eq(developer.name)
@@ -116,7 +116,7 @@ describe API::Members do
               post api("/#{source_type.pluralize}/#{source.id}/members", user),
                    user_id: access_requester.id, access_level: Member::MASTER
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -129,7 +129,7 @@ describe API::Members do
               post api("/#{source_type.pluralize}/#{source.id}/members", master),
                    user_id: access_requester.id, access_level: Member::MASTER
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
             end.to change { source.members.count }.by(1)
             expect(source.requesters.count).to eq(0)
             expect(json_response['id']).to eq(access_requester.id)
@@ -142,7 +142,7 @@ describe API::Members do
             post api("/#{source_type.pluralize}/#{source.id}/members", master),
                  user_id: stranger.id, access_level: Member::DEVELOPER, expires_at: '2016-08-05'
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
           end.to change { source.members.count }.by(1)
           expect(json_response['id']).to eq(stranger.id)
           expect(json_response['access_level']).to eq(Member::DEVELOPER)
@@ -154,28 +154,28 @@ describe API::Members do
         post api("/#{source_type.pluralize}/#{source.id}/members", master),
              user_id: master.id, access_level: Member::MASTER
 
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
       end
 
       it 'returns 400 when user_id is not given' do
         post api("/#{source_type.pluralize}/#{source.id}/members", master),
              access_level: Member::MASTER
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns 400 when access_level is not given' do
         post api("/#{source_type.pluralize}/#{source.id}/members", master),
              user_id: stranger.id
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns 400  when access_level is not valid' do
         post api("/#{source_type.pluralize}/#{source.id}/members", master),
              user_id: stranger.id, access_level: 1234
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
   end
@@ -197,7 +197,7 @@ describe API::Members do
               put api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", user),
                   access_level: Member::MASTER
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -208,7 +208,7 @@ describe API::Members do
           put api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", master),
               access_level: Member::MASTER, expires_at: '2016-08-05'
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['id']).to eq(developer.id)
           expect(json_response['access_level']).to eq(Member::MASTER)
           expect(json_response['expires_at']).to eq('2016-08-05')
@@ -219,20 +219,20 @@ describe API::Members do
         put api("/#{source_type.pluralize}/#{source.id}/members/123", master),
             access_level: Member::MASTER
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns 400 when access_level is not given' do
         put api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", master)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns 400  when access level is not valid' do
         put api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", master),
             access_level: 1234
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
   end
@@ -250,7 +250,7 @@ describe API::Members do
               user = public_send(type)
               delete api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", user)
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -261,7 +261,7 @@ describe API::Members do
           expect do
             delete api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", developer)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { source.members.count }.by(-1)
         end
       end
@@ -272,7 +272,7 @@ describe API::Members do
             expect do
               delete api("/#{source_type.pluralize}/#{source.id}/members/#{access_requester.id}", master)
 
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end.not_to change { source.requesters.count }
           end
         end
@@ -281,7 +281,7 @@ describe API::Members do
           expect do
             delete api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", master)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { source.members.count }.by(-1)
         end
 
@@ -293,7 +293,7 @@ describe API::Members do
       it 'returns 404 if member does not exist' do
         delete api("/#{source_type.pluralize}/#{source.id}/members/123", master)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -344,7 +344,7 @@ describe API::Members do
         post api("/projects/#{project.id}/members", master),
              user_id: stranger.id, access_level: Member::OWNER
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end.to change { project.members.count }.by(0)
     end
   end
diff --git a/spec/requests/api/merge_request_diffs_spec.rb b/spec/requests/api/merge_request_diffs_spec.rb
index d9da94d4713..bf4c8443b23 100644
--- a/spec/requests/api/merge_request_diffs_spec.rb
+++ b/spec/requests/api/merge_request_diffs_spec.rb
@@ -26,12 +26,12 @@ describe API::MergeRequestDiffs, 'MergeRequestDiffs' do
 
     it 'returns a 404 when merge_request id is used instead of the iid' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/versions", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 404 when merge_request_iid not found' do
       get api("/projects/#{project.id}/merge_requests/999/versions", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -49,17 +49,17 @@ describe API::MergeRequestDiffs, 'MergeRequestDiffs' do
 
     it 'returns a 404 when merge_request id is used instead of the iid' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/versions/#{merge_request_diff.id}", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 404 when merge_request version_id is not found' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/versions/999", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 404 when merge_request_iid is not found' do
       get api("/projects/#{project.id}/merge_requests/12345/versions/#{merge_request_diff.id}", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 5e66e1607ba..28b1404a4f7 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -33,26 +33,26 @@ describe API::MergeRequests do
       it 'returns an array of all merge requests' do
         get api('/merge_requests', user), scope: 'all'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
       end
 
       it "returns authentication error without any scope" do
         get api("/merge_requests")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       it "returns authentication error  when scope is assigned-to-me" do
         get api("/merge_requests"), scope: 'assigned-to-me'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       it "returns authentication error  when scope is created-by-me" do
         get api("/merge_requests"), scope: 'created-by-me'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -158,7 +158,7 @@ describe API::MergeRequests do
       it 'returns merge requests for public projects' do
         get api("/projects/#{project.id}/merge_requests")
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
       end
 
@@ -166,7 +166,7 @@ describe API::MergeRequests do
         project = create(:project, :private)
         get api("/projects/#{project.id}/merge_requests")
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
diff --git a/spec/requests/api/namespaces_spec.rb b/spec/requests/api/namespaces_spec.rb
index 26cf653ca8e..e60716d46d7 100644
--- a/spec/requests/api/namespaces_spec.rb
+++ b/spec/requests/api/namespaces_spec.rb
@@ -10,7 +10,7 @@ describe API::Namespaces do
     context "when unauthenticated" do
       it "returns authentication error" do
         get api("/namespaces")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -21,7 +21,7 @@ describe API::Namespaces do
         group_kind_json_response = json_response.find { |resource| resource['kind'] == 'group' }
         user_kind_json_response = json_response.find { |resource| resource['kind'] == 'user' }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(group_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
                                                                  'parent_id', 'members_count_with_descendants')
@@ -32,7 +32,7 @@ describe API::Namespaces do
       it "admin: returns an array of all namespaces" do
         get api("/namespaces", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(Namespace.count)
@@ -41,7 +41,7 @@ describe API::Namespaces do
       it "admin: returns an array of matched namespaces" do
         get api("/namespaces?search=#{group2.name}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -75,7 +75,7 @@ describe API::Namespaces do
       it "user: returns an array of namespaces" do
         get api("/namespaces", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -84,7 +84,7 @@ describe API::Namespaces do
       it "admin: returns an array of matched namespaces" do
         get api("/namespaces?search=#{user.username}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index fb440fa551c..784070db173 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -37,7 +37,7 @@ describe API::Notes do
       it "returns an array of issue notes" do
         get api("/projects/#{project.id}/issues/#{issue.iid}/notes", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(issue_note.note)
@@ -46,14 +46,14 @@ describe API::Notes do
       it "returns a 404 error when issue id not found" do
         get api("/projects/#{project.id}/issues/12345/notes", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       context "and current user cannot view the notes" do
         it "returns an empty array" do
           get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response).to be_empty
@@ -67,7 +67,7 @@ describe API::Notes do
           it "returns 404" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes", user)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -75,7 +75,7 @@ describe API::Notes do
           it "returns an empty array" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes", private_user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response.first['body']).to eq(cross_reference_note.note)
@@ -88,7 +88,7 @@ describe API::Notes do
       it "returns an array of snippet notes" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(snippet_note.note)
@@ -97,13 +97,13 @@ describe API::Notes do
       it "returns a 404 error when snippet id not found" do
         get api("/projects/#{project.id}/snippets/42/notes", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns 404 when not authorized" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes", private_user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -111,7 +111,7 @@ describe API::Notes do
       it "returns an array of merge_requests notes" do
         get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/notes", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(merge_request_note.note)
@@ -120,13 +120,13 @@ describe API::Notes do
       it "returns a 404 error if merge request id not found" do
         get api("/projects/#{project.id}/merge_requests/4444/notes", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns 404 when not authorized" do
         get api("/projects/#{project.id}/merge_requests/4444/notes", private_user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -136,21 +136,21 @@ describe API::Notes do
       it "returns an issue note by id" do
         get api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{issue_note.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq(issue_note.note)
       end
 
       it "returns a 404 error if issue note not found" do
         get api("/projects/#{project.id}/issues/#{issue.iid}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       context "and current user cannot view the note" do
         it "returns a 404 error" do
           get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes/#{cross_reference_note.id}", user)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
 
         context "when issue is confidential" do
@@ -161,7 +161,7 @@ describe API::Notes do
           it "returns 404" do
             get api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{issue_note.id}", private_user)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -169,7 +169,7 @@ describe API::Notes do
           it "returns an issue note by id" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes/#{cross_reference_note.id}", private_user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response['body']).to eq(cross_reference_note.note)
           end
         end
@@ -180,14 +180,14 @@ describe API::Notes do
       it "returns a snippet note by id" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes/#{snippet_note.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq(snippet_note.note)
       end
 
       it "returns a 404 error if snippet note not found" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -197,7 +197,7 @@ describe API::Notes do
       it "creates a new issue note" do
         post api("/projects/#{project.id}/issues/#{issue.iid}/notes", user), body: 'hi!'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['body']).to eq('hi!')
         expect(json_response['author']['username']).to eq(user.username)
       end
@@ -205,13 +205,13 @@ describe API::Notes do
       it "returns a 400 bad request error if body not given" do
         post api("/projects/#{project.id}/issues/#{issue.iid}/notes", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns a 401 unauthorized error if user not authenticated" do
         post api("/projects/#{project.id}/issues/#{issue.iid}/notes"), body: 'hi!'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       context 'when an admin or owner makes the request' do
@@ -220,7 +220,7 @@ describe API::Notes do
           post api("/projects/#{project.id}/issues/#{issue.iid}/notes", user),
             body: 'hi!', created_at: creation_time
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['body']).to eq('hi!')
           expect(json_response['author']['username']).to eq(user.username)
           expect(Time.parse(json_response['created_at'])).to be_like_time(creation_time)
@@ -233,7 +233,7 @@ describe API::Notes do
         it 'creates a new issue note' do
           post api("/projects/#{project.id}/issues/#{issue2.iid}/notes", user), body: ':+1:'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['body']).to eq(':+1:')
         end
       end
@@ -242,7 +242,7 @@ describe API::Notes do
         it 'creates a new issue note' do
           post api("/projects/#{project.id}/issues/#{issue.iid}/notes", user), body: ':+1:'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['body']).to eq(':+1:')
         end
       end
@@ -252,7 +252,7 @@ describe API::Notes do
       it "creates a new snippet note" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user), body: 'hi!'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['body']).to eq('hi!')
         expect(json_response['author']['username']).to eq(user.username)
       end
@@ -260,13 +260,13 @@ describe API::Notes do
       it "returns a 400 bad request error if body not given" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns a 401 unauthorized error if user not authenticated" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes"), body: 'hi!'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -278,7 +278,7 @@ describe API::Notes do
         post api("/projects/#{project.id}/issues/#{issue.iid}/notes", user),
           body: 'Foo'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -314,7 +314,7 @@ describe API::Notes do
         it 'returns 200 status' do
           subject
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
         end
 
         it 'creates a new note' do
@@ -328,7 +328,7 @@ describe API::Notes do
         it 'returns 403 status' do
           subject
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'does not create a new note' do
@@ -352,7 +352,7 @@ describe API::Notes do
         put api("/projects/#{project.id}/issues/#{issue.iid}/"\
                   "notes/#{issue_note.id}", user), body: 'Hello!'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -360,14 +360,14 @@ describe API::Notes do
         put api("/projects/#{project.id}/issues/#{issue.iid}/notes/12345", user),
                 body: 'Hello!'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 400 bad request error if body not given' do
         put api("/projects/#{project.id}/issues/#{issue.iid}/"\
                   "notes/#{issue_note.id}", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -376,7 +376,7 @@ describe API::Notes do
         put api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                   "notes/#{snippet_note.id}", user), body: 'Hello!'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -384,7 +384,7 @@ describe API::Notes do
         put api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                   "notes/12345", user), body: "Hello!"
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -393,7 +393,7 @@ describe API::Notes do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/"\
                   "notes/#{merge_request_note.id}", user), body: 'Hello!'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -401,7 +401,7 @@ describe API::Notes do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/"\
                   "notes/12345", user), body: "Hello!"
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -412,17 +412,17 @@ describe API::Notes do
         delete api("/projects/#{project.id}/issues/#{issue.iid}/"\
                    "notes/#{issue_note.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
         # Check if note is really deleted
         delete api("/projects/#{project.id}/issues/#{issue.iid}/"\
                    "notes/#{issue_note.id}", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/issues/#{issue.iid}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it_behaves_like '412 response' do
@@ -435,18 +435,18 @@ describe API::Notes do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/#{snippet_note.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
         # Check if note is really deleted
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/#{snippet_note.id}", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it_behaves_like '412 response' do
@@ -459,18 +459,18 @@ describe API::Notes do
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.iid}/notes/#{merge_request_note.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
         # Check if note is really deleted
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.iid}/notes/#{merge_request_note.id}", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.iid}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it_behaves_like '412 response' do
diff --git a/spec/requests/api/notification_settings_spec.rb b/spec/requests/api/notification_settings_spec.rb
index 7968659a1ec..3273cd26690 100644
--- a/spec/requests/api/notification_settings_spec.rb
+++ b/spec/requests/api/notification_settings_spec.rb
@@ -9,7 +9,7 @@ describe API::NotificationSettings do
     it "returns global notification settings for the current user" do
       get api("/notification_settings", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_a Hash
       expect(json_response['notification_email']).to eq(user.notification_email)
       expect(json_response['level']).to eq(user.global_notification_setting.level)
@@ -22,7 +22,7 @@ describe API::NotificationSettings do
     it "updates global notification settings for the current user" do
       put api("/notification_settings", user), { level: 'watch', notification_email: email.email }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['notification_email']).to eq(email.email)
       expect(user.reload.notification_email).to eq(email.email)
       expect(json_response['level']).to eq(user.reload.global_notification_setting.level)
@@ -33,7 +33,7 @@ describe API::NotificationSettings do
     it "fails on non-user email address" do
       put api("/notification_settings", user), { notification_email: 'invalid@example.com' }
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 
@@ -41,7 +41,7 @@ describe API::NotificationSettings do
     it "returns group level notification settings for the current user" do
       get api("/groups/#{group.id}/notification_settings", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_a Hash
       expect(json_response['level']).to eq(user.notification_settings_for(group).level)
     end
@@ -51,7 +51,7 @@ describe API::NotificationSettings do
     it "updates group level notification settings for the current user" do
       put api("/groups/#{group.id}/notification_settings", user), { level: 'watch' }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['level']).to eq(user.reload.notification_settings_for(group).level)
     end
   end
@@ -60,7 +60,7 @@ describe API::NotificationSettings do
     it "returns project level notification settings for the current user" do
       get api("/projects/#{project.id}/notification_settings", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_a Hash
       expect(json_response['level']).to eq(user.notification_settings_for(project).level)
     end
@@ -70,7 +70,7 @@ describe API::NotificationSettings do
     it "updates project level notification settings for the current user" do
       put api("/projects/#{project.id}/notification_settings", user), { level: 'custom', new_note: true }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['level']).to eq(user.reload.notification_settings_for(project).level)
       expect(json_response['events']['new_note']).to be_truthy
       expect(json_response['events']['new_issue']).to be_falsey
@@ -81,7 +81,7 @@ describe API::NotificationSettings do
     it "fails on invalid level" do
       put api("/projects/#{project.id}/notification_settings", user), { level: 'invalid' }
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 end
diff --git a/spec/requests/api/oauth_tokens_spec.rb b/spec/requests/api/oauth_tokens_spec.rb
index 0d56e1f732e..bdda80cc229 100644
--- a/spec/requests/api/oauth_tokens_spec.rb
+++ b/spec/requests/api/oauth_tokens_spec.rb
@@ -12,7 +12,7 @@ describe 'OAuth tokens' do
 
         request_oauth_token(user)
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
         expect(json_response['error']).to eq('invalid_grant')
       end
     end
@@ -23,7 +23,7 @@ describe 'OAuth tokens' do
 
         request_oauth_token(user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['access_token']).not_to be_nil
       end
     end
@@ -35,7 +35,7 @@ describe 'OAuth tokens' do
 
         request_oauth_token(user)
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -46,7 +46,7 @@ describe 'OAuth tokens' do
 
         request_oauth_token(user)
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/pages_domains_spec.rb b/spec/requests/api/pages_domains_spec.rb
new file mode 100644
index 00000000000..d13b3a958c9
--- /dev/null
+++ b/spec/requests/api/pages_domains_spec.rb
@@ -0,0 +1,440 @@
+require 'rails_helper'
+
+describe API::PagesDomains do
+  set(:project) { create(:project) }
+  set(:user) { create(:user) }
+
+  set(:pages_domain) { create(:pages_domain, domain: 'www.domain.test', project: project) }
+  set(:pages_domain_secure) { create(:pages_domain, :with_certificate, :with_key, domain: 'ssl.domain.test', project: project) }
+  set(:pages_domain_expired) { create(:pages_domain, :with_expired_certificate, :with_key, domain: 'expired.domain.test', project: project) }
+
+  let(:pages_domain_params) { build(:pages_domain, domain: 'www.other-domain.test').slice(:domain) }
+  let(:pages_domain_secure_params) { build(:pages_domain, :with_certificate, :with_key, domain: 'ssl.other-domain.test', project: project).slice(:domain, :certificate, :key) }
+  let(:pages_domain_secure_key_missmatch_params) {build(:pages_domain, :with_trusted_chain, :with_key, project: project).slice(:domain, :certificate, :key) }
+  let(:pages_domain_secure_missing_chain_params) {build(:pages_domain, :with_missing_chain, project: project).slice(:certificate) }
+
+  let(:route) { "/projects/#{project.id}/pages/domains" }
+  let(:route_domain) { "/projects/#{project.id}/pages/domains/#{pages_domain.domain}" }
+  let(:route_secure_domain) { "/projects/#{project.id}/pages/domains/#{pages_domain_secure.domain}" }
+  let(:route_expired_domain) { "/projects/#{project.id}/pages/domains/#{pages_domain_expired.domain}" }
+  let(:route_vacant_domain) { "/projects/#{project.id}/pages/domains/www.vacant-domain.test" }
+
+  before do
+    allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
+  end
+
+  describe 'GET /projects/:project_id/pages/domains' do
+    shared_examples_for 'get pages domains' do
+      it 'returns paginated pages domains' do
+        get api(route, user)
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+        expect(json_response.size).to eq(3)
+        expect(json_response.map { |pages_domain| pages_domain['domain'] }).to include(pages_domain.domain)
+        expect(json_response.last).to have_key('domain')
+      end
+    end
+
+    context 'when pages is disabled' do
+      before do
+        allow(Gitlab.config.pages).to receive(:enabled).and_return(false)
+        project.add_master(user)
+      end
+
+      it_behaves_like '404 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+
+    context 'when user is a master' do
+      before do
+        project.add_master(user)
+      end
+
+      it_behaves_like 'get pages domains'
+    end
+
+    context 'when user is a developer' do
+      before do
+        project.add_developer(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+
+    context 'when user is a reporter' do
+      before do
+        project.add_reporter(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+
+    context 'when user is a guest' do
+      before do
+        project.add_guest(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+
+    context 'when user is not a member' do
+      it_behaves_like '404 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+  end
+
+  describe 'GET /projects/:project_id/pages/domains/:domain' do
+    shared_examples_for 'get pages domain' do
+      it 'returns pages domain' do
+        get api(route_domain, user)
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response['domain']).to eq(pages_domain.domain)
+        expect(json_response['url']).to eq(pages_domain.url)
+        expect(json_response['certificate']).to be_nil
+      end
+
+      it 'returns pages domain with a certificate' do
+        get api(route_secure_domain, user)
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response['domain']).to eq(pages_domain_secure.domain)
+        expect(json_response['url']).to eq(pages_domain_secure.url)
+        expect(json_response['certificate']['subject']).to eq(pages_domain_secure.subject)
+        expect(json_response['certificate']['expired']).to be false
+      end
+
+      it 'returns pages domain with an expired certificate' do
+        get api(route_expired_domain, user)
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response['certificate']['expired']).to be true
+      end
+    end
+
+    context 'when domain is vacant' do
+      before do
+        project.add_master(user)
+      end
+
+      it_behaves_like '404 response' do
+        let(:request) { get api(route_vacant_domain, user) }
+      end
+    end
+
+    context 'when user is a master' do
+      before do
+        project.add_master(user)
+      end
+
+      it_behaves_like 'get pages domain'
+    end
+
+    context 'when user is a developer' do
+      before do
+        project.add_developer(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+
+    context 'when user is a reporter' do
+      before do
+        project.add_reporter(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+
+    context 'when user is a guest' do
+      before do
+        project.add_guest(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+
+    context 'when user is not a member' do
+      it_behaves_like '404 response' do
+        let(:request) { get api(route, user) }
+      end
+    end
+  end
+
+  describe 'POST /projects/:project_id/pages/domains' do
+    let(:params) { pages_domain_params.slice(:domain) }
+    let(:params_secure) { pages_domain_secure_params.slice(:domain, :certificate, :key) }
+
+    shared_examples_for 'post pages domains' do
+      it 'creates a new pages domain' do
+        post api(route, user), params
+        pages_domain = PagesDomain.find_by(domain: json_response['domain'])
+
+        expect(response).to have_gitlab_http_status(201)
+        expect(pages_domain.domain).to eq(params[:domain])
+        expect(pages_domain.certificate).to be_nil
+        expect(pages_domain.key).to be_nil
+      end
+
+      it 'creates a new secure pages domain' do
+        post api(route, user), params_secure
+        pages_domain = PagesDomain.find_by(domain: json_response['domain'])
+
+        expect(response).to have_gitlab_http_status(201)
+        expect(pages_domain.domain).to eq(params_secure[:domain])
+        expect(pages_domain.certificate).to eq(params_secure[:certificate])
+        expect(pages_domain.key).to eq(params_secure[:key])
+      end
+
+      it 'fails to create pages domain without key' do
+        post api(route, user), pages_domain_secure_params.slice(:domain, :certificate)
+
+        expect(response).to have_gitlab_http_status(400)
+      end
+
+      it 'fails to create pages domain with key missmatch' do
+        post api(route, user), pages_domain_secure_key_missmatch_params.slice(:domain, :certificate, :key)
+
+        expect(response).to have_gitlab_http_status(400)
+      end
+    end
+
+    context 'when user is a master' do
+      before do
+        project.add_master(user)
+      end
+
+      it_behaves_like 'post pages domains'
+    end
+
+    context 'when user is a developer' do
+      before do
+        project.add_developer(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { post api(route, user), params }
+      end
+    end
+
+    context 'when user is a reporter' do
+      before do
+        project.add_reporter(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { post api(route, user), params }
+      end
+    end
+
+    context 'when user is a guest' do
+      before do
+        project.add_guest(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { post api(route, user), params }
+      end
+    end
+
+    context 'when user is not a member' do
+      it_behaves_like '404 response' do
+        let(:request) { post api(route, user), params }
+      end
+    end
+  end
+
+  describe 'PUT /projects/:project_id/pages/domains/:domain' do
+    let(:params_secure) { pages_domain_secure_params.slice(:certificate, :key) }
+    let(:params_secure_nokey) { pages_domain_secure_params.slice(:certificate) }
+
+    shared_examples_for 'put pages domain' do
+      it 'updates pages domain removing certificate' do
+        put api(route_secure_domain, user)
+        pages_domain_secure.reload
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(pages_domain_secure.certificate).to be_nil
+        expect(pages_domain_secure.key).to be_nil
+      end
+
+      it 'updates pages domain adding certificate' do
+        put api(route_domain, user), params_secure
+        pages_domain.reload
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(pages_domain.certificate).to eq(params_secure[:certificate])
+        expect(pages_domain.key).to eq(params_secure[:key])
+      end
+
+      it 'updates pages domain with expired certificate' do
+        put api(route_expired_domain, user), params_secure
+        pages_domain_expired.reload
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(pages_domain_expired.certificate).to eq(params_secure[:certificate])
+        expect(pages_domain_expired.key).to eq(params_secure[:key])
+      end
+
+      it 'updates pages domain with expired certificate not updating key' do
+        put api(route_secure_domain, user), params_secure_nokey
+        pages_domain_secure.reload
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(pages_domain_secure.certificate).to eq(params_secure_nokey[:certificate])
+      end
+
+      it 'fails to update pages domain adding certificate without key' do
+        put api(route_domain, user), params_secure_nokey
+
+        expect(response).to have_gitlab_http_status(400)
+      end
+
+      it 'fails to update pages domain adding certificate with missing chain' do
+        put api(route_domain, user), pages_domain_secure_missing_chain_params.slice(:certificate)
+
+        expect(response).to have_gitlab_http_status(400)
+      end
+
+      it 'fails to update pages domain with key missmatch' do
+        put api(route_secure_domain, user), pages_domain_secure_key_missmatch_params.slice(:certificate, :key)
+
+        expect(response).to have_gitlab_http_status(400)
+      end
+    end
+
+    context 'when domain is vacant' do
+      before do
+        project.add_master(user)
+      end
+
+      it_behaves_like '404 response' do
+        let(:request) { put api(route_vacant_domain, user) }
+      end
+    end
+
+    context 'when user is a master' do
+      before do
+        project.add_master(user)
+      end
+
+      it_behaves_like 'put pages domain'
+    end
+
+    context 'when user is a developer' do
+      before do
+        project.add_developer(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { put api(route_domain, user) }
+      end
+    end
+
+    context 'when user is a reporter' do
+      before do
+        project.add_reporter(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { put api(route_domain, user) }
+      end
+    end
+
+    context 'when user is a guest' do
+      before do
+        project.add_guest(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { put api(route_domain, user) }
+      end
+    end
+
+    context 'when user is not a member' do
+      it_behaves_like '404 response' do
+        let(:request) { put api(route_domain, user) }
+      end
+    end
+  end
+
+  describe 'DELETE /projects/:project_id/pages/domains/:domain' do
+    shared_examples_for 'delete pages domain' do
+      it 'deletes a pages domain' do
+        delete api(route_domain, user)
+
+        expect(response).to have_gitlab_http_status(204)
+      end
+    end
+
+    context 'when domain is vacant' do
+      before do
+        project.add_master(user)
+      end
+
+      it_behaves_like '404 response' do
+        let(:request) { delete api(route_vacant_domain, user) }
+      end
+    end
+
+    context 'when user is a master' do
+      before do
+        project.add_master(user)
+      end
+
+      it_behaves_like 'delete pages domain'
+    end
+
+    context 'when user is a developer' do
+      before do
+        project.add_developer(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { delete api(route_domain, user) }
+      end
+    end
+
+    context 'when user is a reporter' do
+      before do
+        project.add_reporter(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { delete api(route_domain, user) }
+      end
+    end
+
+    context 'when user is a guest' do
+      before do
+        project.add_guest(user)
+      end
+
+      it_behaves_like '403 response' do
+        let(:request) { delete api(route_domain, user) }
+      end
+    end
+
+    context 'when user is not a member' do
+      it_behaves_like '404 response' do
+        let(:request) { delete api(route_domain, user) }
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/pipeline_schedules_spec.rb b/spec/requests/api/pipeline_schedules_spec.rb
index f650df57383..7ea25059756 100644
--- a/spec/requests/api/pipeline_schedules_spec.rb
+++ b/spec/requests/api/pipeline_schedules_spec.rb
@@ -20,7 +20,7 @@ describe API::PipelineSchedules do
       it 'returns list of pipeline_schedules' do
         get api("/projects/#{project.id}/pipeline_schedules", developer)
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(response).to match_response_schema('pipeline_schedules')
       end
@@ -67,7 +67,7 @@ describe API::PipelineSchedules do
       it 'does not return pipeline_schedules list' do
         get api("/projects/#{project.id}/pipeline_schedules", user)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -75,7 +75,7 @@ describe API::PipelineSchedules do
       it 'does not return pipeline_schedules list' do
         get api("/projects/#{project.id}/pipeline_schedules")
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -91,14 +91,14 @@ describe API::PipelineSchedules do
       it 'returns pipeline_schedule details' do
         get api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", developer)
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('pipeline_schedule')
       end
 
       it 'responds with 404 Not Found if requesting non-existing pipeline_schedule' do
         get api("/projects/#{project.id}/pipeline_schedules/-5", developer)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -106,7 +106,7 @@ describe API::PipelineSchedules do
       it 'does not return pipeline_schedules list' do
         get api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", user)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -118,7 +118,7 @@ describe API::PipelineSchedules do
       it 'does not return pipeline_schedules list' do
         get api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", user)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -126,7 +126,7 @@ describe API::PipelineSchedules do
       it 'does not return pipeline_schedules list' do
         get api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}")
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -142,7 +142,7 @@ describe API::PipelineSchedules do
               params
           end.to change { project.pipeline_schedules.count }.by(1)
 
-          expect(response).to have_http_status(:created)
+          expect(response).to have_gitlab_http_status(:created)
           expect(response).to match_response_schema('pipeline_schedule')
           expect(json_response['description']).to eq(params[:description])
           expect(json_response['ref']).to eq(params[:ref])
@@ -156,7 +156,7 @@ describe API::PipelineSchedules do
         it 'does not create pipeline_schedule' do
           post api("/projects/#{project.id}/pipeline_schedules", developer)
 
-          expect(response).to have_http_status(:bad_request)
+          expect(response).to have_gitlab_http_status(:bad_request)
         end
       end
 
@@ -165,7 +165,7 @@ describe API::PipelineSchedules do
           post api("/projects/#{project.id}/pipeline_schedules", developer),
             params.merge('cron' => 'invalid-cron')
 
-          expect(response).to have_http_status(:bad_request)
+          expect(response).to have_gitlab_http_status(:bad_request)
           expect(json_response['message']).to have_key('cron')
         end
       end
@@ -175,7 +175,7 @@ describe API::PipelineSchedules do
       it 'does not create pipeline_schedule' do
         post api("/projects/#{project.id}/pipeline_schedules", user), params
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -183,7 +183,7 @@ describe API::PipelineSchedules do
       it 'does not create pipeline_schedule' do
         post api("/projects/#{project.id}/pipeline_schedules"), params
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -198,7 +198,7 @@ describe API::PipelineSchedules do
         put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", developer),
           cron: '1 2 3 4 *'
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('pipeline_schedule')
         expect(json_response['cron']).to eq('1 2 3 4 *')
       end
@@ -208,7 +208,7 @@ describe API::PipelineSchedules do
           put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", developer),
             cron: 'invalid-cron'
 
-          expect(response).to have_http_status(:bad_request)
+          expect(response).to have_gitlab_http_status(:bad_request)
           expect(json_response['message']).to have_key('cron')
         end
       end
@@ -218,7 +218,7 @@ describe API::PipelineSchedules do
       it 'does not update pipeline_schedule' do
         put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", user)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -226,7 +226,7 @@ describe API::PipelineSchedules do
       it 'does not update pipeline_schedule' do
         put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}")
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -240,7 +240,7 @@ describe API::PipelineSchedules do
       it 'updates owner' do
         post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/take_ownership", developer)
 
-        expect(response).to have_http_status(:created)
+        expect(response).to have_gitlab_http_status(:created)
         expect(response).to match_response_schema('pipeline_schedule')
       end
     end
@@ -249,7 +249,7 @@ describe API::PipelineSchedules do
       it 'does not update owner' do
         post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/take_ownership", user)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -257,7 +257,7 @@ describe API::PipelineSchedules do
       it 'does not update owner' do
         post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/take_ownership")
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -279,13 +279,13 @@ describe API::PipelineSchedules do
           delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", master)
         end.to change { project.pipeline_schedules.count }.by(-1)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end
 
       it 'responds with 404 Not Found if requesting non-existing pipeline_schedule' do
         delete api("/projects/#{project.id}/pipeline_schedules/-5", master)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
 
       it_behaves_like '412 response' do
@@ -299,7 +299,7 @@ describe API::PipelineSchedules do
       it 'does not delete pipeline_schedule' do
         delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}", developer)
 
-        expect(response).to have_http_status(:forbidden)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
 
@@ -307,7 +307,7 @@ describe API::PipelineSchedules do
       it 'does not delete pipeline_schedule' do
         delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}")
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -327,7 +327,7 @@ describe API::PipelineSchedules do
               params
           end.to change { pipeline_schedule.variables.count }.by(1)
 
-          expect(response).to have_http_status(:created)
+          expect(response).to have_gitlab_http_status(:created)
           expect(response).to match_response_schema('pipeline_schedule_variable')
           expect(json_response['key']).to eq(params[:key])
           expect(json_response['value']).to eq(params[:value])
@@ -338,7 +338,7 @@ describe API::PipelineSchedules do
         it 'does not create pipeline_schedule_variable' do
           post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables", developer)
 
-          expect(response).to have_http_status(:bad_request)
+          expect(response).to have_gitlab_http_status(:bad_request)
         end
       end
 
@@ -347,7 +347,7 @@ describe API::PipelineSchedules do
           post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables", developer),
             params.merge('key' => '!?!?')
 
-          expect(response).to have_http_status(:bad_request)
+          expect(response).to have_gitlab_http_status(:bad_request)
           expect(json_response['message']).to have_key('key')
         end
       end
@@ -357,7 +357,7 @@ describe API::PipelineSchedules do
       it 'does not create pipeline_schedule_variable' do
         post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables", user), params
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -365,7 +365,7 @@ describe API::PipelineSchedules do
       it 'does not create pipeline_schedule_variable' do
         post api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables"), params
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -384,7 +384,7 @@ describe API::PipelineSchedules do
         put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}", developer),
           value: 'updated_value'
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('pipeline_schedule_variable')
         expect(json_response['value']).to eq('updated_value')
       end
@@ -394,7 +394,7 @@ describe API::PipelineSchedules do
       it 'does not update pipeline_schedule_variable' do
         put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}", user)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -402,7 +402,7 @@ describe API::PipelineSchedules do
       it 'does not update pipeline_schedule_variable' do
         put api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}")
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -428,14 +428,14 @@ describe API::PipelineSchedules do
           delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}", master)
         end.to change { Ci::PipelineScheduleVariable.count }.by(-1)
 
-        expect(response).to have_http_status(:accepted)
+        expect(response).to have_gitlab_http_status(:accepted)
         expect(response).to match_response_schema('pipeline_schedule_variable')
       end
 
       it 'responds with 404 Not Found if requesting non-existing pipeline_schedule_variable' do
         delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/____", master)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -445,7 +445,7 @@ describe API::PipelineSchedules do
       it 'does not delete pipeline_schedule_variable' do
         delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}", developer)
 
-        expect(response).to have_http_status(:forbidden)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
 
@@ -453,7 +453,7 @@ describe API::PipelineSchedules do
       it 'does not delete pipeline_schedule_variable' do
         delete api("/projects/#{project.id}/pipeline_schedules/#{pipeline_schedule.id}/variables/#{pipeline_schedule_variable.key}")
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
diff --git a/spec/requests/api/pipelines_spec.rb b/spec/requests/api/pipelines_spec.rb
index 258085e503f..e4dcc9252fa 100644
--- a/spec/requests/api/pipelines_spec.rb
+++ b/spec/requests/api/pipelines_spec.rb
@@ -19,7 +19,7 @@ describe API::Pipelines do
       it 'returns project pipelines' do
         get api("/projects/#{project.id}/pipelines", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['sha']).to match /\A\h{40}\z/
@@ -37,7 +37,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), scope: target
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).not_to be_empty
               json_response.each { |r| expect(r['status']).to eq(target) }
@@ -55,7 +55,7 @@ describe API::Pipelines do
           it 'returns matched pipelines' do
             get api("/projects/#{project.id}/pipelines", user), scope: 'finished'
 
-            expect(response).to have_http_status(:ok)
+            expect(response).to have_gitlab_http_status(:ok)
             expect(response).to include_pagination_headers
             expect(json_response).not_to be_empty
             json_response.each { |r| expect(r['status']).to be_in(%w[success failed canceled]) }
@@ -70,7 +70,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), scope: 'branches'
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).not_to be_empty
               expect(json_response.last['id']).to eq(pipeline_branch.id)
@@ -81,7 +81,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), scope: 'tags'
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).not_to be_empty
               expect(json_response.last['id']).to eq(pipeline_tag.id)
@@ -93,7 +93,7 @@ describe API::Pipelines do
           it 'returns bad_request' do
             get api("/projects/#{project.id}/pipelines", user), scope: 'invalid-scope'
 
-            expect(response).to have_http_status(:bad_request)
+            expect(response).to have_gitlab_http_status(:bad_request)
           end
         end
 
@@ -108,7 +108,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), status: target
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).not_to be_empty
               json_response.each { |r| expect(r['status']).to eq(target) }
@@ -120,7 +120,7 @@ describe API::Pipelines do
           it 'returns bad_request' do
             get api("/projects/#{project.id}/pipelines", user), status: 'invalid-status'
 
-            expect(response).to have_http_status(:bad_request)
+            expect(response).to have_gitlab_http_status(:bad_request)
           end
         end
 
@@ -133,7 +133,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), ref: 'master'
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).not_to be_empty
               json_response.each { |r| expect(r['ref']).to eq('master') }
@@ -144,7 +144,7 @@ describe API::Pipelines do
             it 'returns empty' do
               get api("/projects/#{project.id}/pipelines", user), ref: 'invalid-ref'
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).to be_empty
             end
@@ -158,7 +158,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), name: user.name
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response.first['id']).to eq(pipeline.id)
             end
@@ -168,7 +168,7 @@ describe API::Pipelines do
             it 'returns empty' do
               get api("/projects/#{project.id}/pipelines", user), name: 'invalid-name'
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).to be_empty
             end
@@ -182,7 +182,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), username: user.username
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response.first['id']).to eq(pipeline.id)
             end
@@ -192,7 +192,7 @@ describe API::Pipelines do
             it 'returns empty' do
               get api("/projects/#{project.id}/pipelines", user), username: 'invalid-username'
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).to be_empty
             end
@@ -207,7 +207,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), yaml_errors: true
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response.first['id']).to eq(pipeline1.id)
             end
@@ -217,7 +217,7 @@ describe API::Pipelines do
             it 'returns matched pipelines' do
               get api("/projects/#{project.id}/pipelines", user), yaml_errors: false
 
-              expect(response).to have_http_status(:ok)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response.first['id']).to eq(pipeline2.id)
             end
@@ -227,7 +227,7 @@ describe API::Pipelines do
             it 'returns bad_request' do
               get api("/projects/#{project.id}/pipelines", user), yaml_errors: 'invalid-yaml_errors'
 
-              expect(response).to have_http_status(:bad_request)
+              expect(response).to have_gitlab_http_status(:bad_request)
             end
           end
         end
@@ -244,7 +244,7 @@ describe API::Pipelines do
               it 'sorts as user_id: :desc' do
                 get api("/projects/#{project.id}/pipelines", user), order_by: 'user_id', sort: 'desc'
 
-                expect(response).to have_http_status(:ok)
+                expect(response).to have_gitlab_http_status(:ok)
                 expect(response).to include_pagination_headers
                 expect(json_response).not_to be_empty
 
@@ -257,7 +257,7 @@ describe API::Pipelines do
               it 'returns bad_request' do
                 get api("/projects/#{project.id}/pipelines", user), order_by: 'user_id', sort: 'invalid_sort'
 
-                expect(response).to have_http_status(:bad_request)
+                expect(response).to have_gitlab_http_status(:bad_request)
               end
             end
           end
@@ -266,7 +266,7 @@ describe API::Pipelines do
             it 'returns bad_request' do
               get api("/projects/#{project.id}/pipelines", user), order_by: 'lock_version', sort: 'asc'
 
-              expect(response).to have_http_status(:bad_request)
+              expect(response).to have_gitlab_http_status(:bad_request)
             end
           end
         end
@@ -277,7 +277,7 @@ describe API::Pipelines do
       it 'does not return project pipelines' do
         get api("/projects/#{project.id}/pipelines", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Project Not Found'
         expect(json_response).not_to be_an Array
       end
@@ -296,7 +296,7 @@ describe API::Pipelines do
             post api("/projects/#{project.id}/pipeline", user), ref: project.default_branch
           end.to change { Ci::Pipeline.count }.by(1)
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to be_a Hash
           expect(json_response['sha']).to eq project.commit.id
         end
@@ -304,7 +304,7 @@ describe API::Pipelines do
         it 'fails when using an invalid ref' do
           post api("/projects/#{project.id}/pipeline", user), ref: 'invalid_ref'
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']['base'].first).to eq 'Reference not found'
           expect(json_response).not_to be_an Array
         end
@@ -314,7 +314,7 @@ describe API::Pipelines do
         it 'fails to create pipeline' do
           post api("/projects/#{project.id}/pipeline", user), ref: project.default_branch
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']['base'].first).to eq 'Missing .gitlab-ci.yml file'
           expect(json_response).not_to be_an Array
         end
@@ -325,7 +325,7 @@ describe API::Pipelines do
       it 'does not create pipeline' do
         post api("/projects/#{project.id}/pipeline", non_member), ref: project.default_branch
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Project Not Found'
         expect(json_response).not_to be_an Array
       end
@@ -337,14 +337,14 @@ describe API::Pipelines do
       it 'returns project pipelines' do
         get api("/projects/#{project.id}/pipelines/#{pipeline.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['sha']).to match /\A\h{40}\z/
       end
 
       it 'returns 404 when it does not exist' do
         get api("/projects/#{project.id}/pipelines/123456", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Not found'
         expect(json_response['id']).to be nil
       end
@@ -366,7 +366,7 @@ describe API::Pipelines do
       it 'should not return a project pipeline' do
         get api("/projects/#{project.id}/pipelines/#{pipeline.id}", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Project Not Found'
         expect(json_response['id']).to be nil
       end
@@ -387,7 +387,7 @@ describe API::Pipelines do
           post api("/projects/#{project.id}/pipelines/#{pipeline.id}/retry", user)
         end.to change { pipeline.builds.count }.from(1).to(2)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(build.reload.retried?).to be true
       end
     end
@@ -396,7 +396,7 @@ describe API::Pipelines do
       it 'should not return a project pipeline' do
         post api("/projects/#{project.id}/pipelines/#{pipeline.id}/retry", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Project Not Found'
         expect(json_response['id']).to be nil
       end
@@ -415,7 +415,7 @@ describe API::Pipelines do
       it 'retries failed builds' do
         post api("/projects/#{project.id}/pipelines/#{pipeline.id}/cancel", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to eq('canceled')
       end
     end
@@ -430,7 +430,7 @@ describe API::Pipelines do
       it 'rejects the action' do
         post api("/projects/#{project.id}/pipelines/#{pipeline.id}/cancel", reporter)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
         expect(pipeline.reload.status).to eq('pending')
       end
     end
diff --git a/spec/requests/api/project_hooks_spec.rb b/spec/requests/api/project_hooks_spec.rb
index ac3bab09c4c..f31344a6238 100644
--- a/spec/requests/api/project_hooks_spec.rb
+++ b/spec/requests/api/project_hooks_spec.rb
@@ -22,7 +22,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       it "returns project hooks" do
         get api("/projects/#{project.id}/hooks", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response).to include_pagination_headers
         expect(json_response.count).to eq(1)
@@ -43,7 +43,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       it "does not access project hooks" do
         get api("/projects/#{project.id}/hooks", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -53,7 +53,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       it "returns a project hook" do
         get api("/projects/#{project.id}/hooks/#{hook.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['url']).to eq(hook.url)
         expect(json_response['issues_events']).to eq(hook.issues_events)
         expect(json_response['push_events']).to eq(hook.push_events)
@@ -69,20 +69,20 @@ describe API::ProjectHooks, 'ProjectHooks' do
       it "returns a 404 error if hook id is not available" do
         get api("/projects/#{project.id}/hooks/1234", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
     context "unauthorized user" do
       it "does not access an existing hook" do
         get api("/projects/#{project.id}/hooks/#{hook.id}", user3)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
     it "returns a 404 error if hook id is not available" do
       get api("/projects/#{project.id}/hooks/1234", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -94,7 +94,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
           job_events: true
       end.to change {project.hooks.count}.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['url']).to eq('http://example.com')
       expect(json_response['issues_events']).to eq(true)
       expect(json_response['push_events']).to eq(true)
@@ -115,7 +115,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
         post api("/projects/#{project.id}/hooks", user), url: "http://example.com", token: token
       end.to change {project.hooks.count}.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response["url"]).to eq("http://example.com")
       expect(json_response).not_to include("token")
 
@@ -127,12 +127,12 @@ describe API::ProjectHooks, 'ProjectHooks' do
 
     it "returns a 400 error if url not given" do
       post api("/projects/#{project.id}/hooks", user)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 422 error if url not valid" do
       post api("/projects/#{project.id}/hooks", user), "url" => "ftp://example.com"
-      expect(response).to have_http_status(422)
+      expect(response).to have_gitlab_http_status(422)
     end
   end
 
@@ -141,7 +141,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       put api("/projects/#{project.id}/hooks/#{hook.id}", user),
         url: 'http://example.org', push_events: false, job_events: true
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['url']).to eq('http://example.org')
       expect(json_response['issues_events']).to eq(hook.issues_events)
       expect(json_response['push_events']).to eq(false)
@@ -159,7 +159,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
 
       put api("/projects/#{project.id}/hooks/#{hook.id}", user), url: "http://example.org", token: token
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response["url"]).to eq("http://example.org")
       expect(json_response).not_to include("token")
 
@@ -169,17 +169,17 @@ describe API::ProjectHooks, 'ProjectHooks' do
 
     it "returns 404 error if hook id not found" do
       put api("/projects/#{project.id}/hooks/1234", user), url: 'http://example.org'
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns 400 error if url is not given" do
       put api("/projects/#{project.id}/hooks/#{hook.id}", user)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 422 error if url is not valid" do
       put api("/projects/#{project.id}/hooks/#{hook.id}", user), url: 'ftp://example.com'
-      expect(response).to have_http_status(422)
+      expect(response).to have_gitlab_http_status(422)
     end
   end
 
@@ -188,19 +188,19 @@ describe API::ProjectHooks, 'ProjectHooks' do
       expect do
         delete api("/projects/#{project.id}/hooks/#{hook.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change {project.hooks.count}.by(-1)
     end
 
     it "returns a 404 error when deleting non existent hook" do
       delete api("/projects/#{project.id}/hooks/42", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns a 404 error if hook id not given" do
       delete api("/projects/#{project.id}/hooks", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns a 404 if a user attempts to delete project hooks he/she does not own" do
@@ -209,7 +209,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       other_project.team << [test_user, :master]
 
       delete api("/projects/#{other_project.id}/hooks/#{hook.id}", test_user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(WebHook.exists?(hook.id)).to be_truthy
     end
 
diff --git a/spec/requests/api/project_snippets_spec.rb b/spec/requests/api/project_snippets_spec.rb
index db34149eb73..e741ac4b7bd 100644
--- a/spec/requests/api/project_snippets_spec.rb
+++ b/spec/requests/api/project_snippets_spec.rb
@@ -12,7 +12,7 @@ describe API::ProjectSnippets do
     it 'exposes known attributes' do
       get api("/projects/#{project.id}/snippets/#{snippet.id}/user_agent_detail", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['user_agent']).to eq(user_agent_detail.user_agent)
       expect(json_response['ip_address']).to eq(user_agent_detail.ip_address)
       expect(json_response['akismet_submitted']).to eq(user_agent_detail.submitted)
@@ -21,7 +21,7 @@ describe API::ProjectSnippets do
     it "returns unautorized for non-admin users" do
       get api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/user_agent_detail", user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 
@@ -36,7 +36,7 @@ describe API::ProjectSnippets do
 
       get api("/projects/#{project.id}/snippets", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(3)
@@ -49,7 +49,7 @@ describe API::ProjectSnippets do
 
       get api("/projects/#{project.id}/snippets/", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(0)
@@ -63,7 +63,7 @@ describe API::ProjectSnippets do
     it 'returns snippet json' do
       get api("/projects/#{project.id}/snippets/#{snippet.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['title']).to eq(snippet.title)
       expect(json_response['description']).to eq(snippet.description)
@@ -73,7 +73,7 @@ describe API::ProjectSnippets do
     it 'returns 404 for invalid snippet id' do
       get api("/projects/#{project.id}/snippets/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Not found')
     end
   end
@@ -92,7 +92,7 @@ describe API::ProjectSnippets do
     it 'creates a new snippet' do
       post api("/projects/#{project.id}/snippets/", admin), params
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       snippet = ProjectSnippet.find(json_response['id'])
       expect(snippet.content).to eq(params[:code])
       expect(snippet.description).to eq(params[:description])
@@ -106,7 +106,7 @@ describe API::ProjectSnippets do
 
       post api("/projects/#{project.id}/snippets/", admin), params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context 'when the snippet is spam' do
@@ -132,7 +132,7 @@ describe API::ProjectSnippets do
           expect { create_snippet(project, visibility: 'public') }
             .not_to change { Snippet.count }
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']).to eq({ "error" => "Spam detected" })
         end
 
@@ -154,7 +154,7 @@ describe API::ProjectSnippets do
 
       put api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/", admin), code: new_content, description: new_description
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       snippet.reload
       expect(snippet.content).to eq(new_content)
       expect(snippet.description).to eq(new_description)
@@ -163,14 +163,14 @@ describe API::ProjectSnippets do
     it 'returns 404 for invalid snippet id' do
       put api("/projects/#{snippet.project.id}/snippets/1234", admin), title: 'foo'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
 
     it 'returns 400 for missing parameters' do
       put api("/projects/#{project.id}/snippets/1234", admin)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context 'when the snippet is spam' do
@@ -212,7 +212,7 @@ describe API::ProjectSnippets do
           expect { update_snippet(title: 'Foo', visibility: 'public') }
             .not_to change { snippet.reload.title }
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']).to eq({ "error" => "Spam detected" })
         end
 
@@ -230,13 +230,13 @@ describe API::ProjectSnippets do
     it 'deletes snippet' do
       delete api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/", admin)
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
     end
 
     it 'returns 404 for invalid snippet id' do
       delete api("/projects/#{snippet.project.id}/snippets/1234", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
 
@@ -251,7 +251,7 @@ describe API::ProjectSnippets do
     it 'returns raw text' do
       get api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/raw", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response.content_type).to eq 'text/plain'
       expect(response.body).to eq(snippet.content)
     end
@@ -259,7 +259,7 @@ describe API::ProjectSnippets do
     it 'returns 404 for invalid snippet id' do
       get api("/projects/#{snippet.project.id}/snippets/1234/raw", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
   end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 5964244f8c5..e095ba2af5d 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -45,7 +45,7 @@ describe API::Projects do
       it 'returns an array of projects' do
         get api('/projects', current_user), filter
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.map { |p| p['id'] }).to contain_exactly(*projects.map(&:id))
@@ -147,7 +147,7 @@ describe API::Projects do
       it "does not include statistics by default" do
         get api('/projects', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first).not_to include('statistics')
@@ -156,7 +156,7 @@ describe API::Projects do
       it "includes statistics if requested" do
         get api('/projects', user), statistics: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first).to include 'statistics'
@@ -201,7 +201,7 @@ describe API::Projects do
 
           get api('/projects?simple=true', user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.first.keys).to match_array expected_keys
@@ -228,7 +228,7 @@ describe API::Projects do
         it 'filters based on private visibility param' do
           get api('/projects', user), { visibility: 'private' }
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.map { |p| p['id'] }).to contain_exactly(project.id, project2.id, project3.id)
@@ -239,7 +239,7 @@ describe API::Projects do
 
           get api('/projects', user), { visibility: 'internal' }
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.map { |p| p['id'] }).to contain_exactly(project2.id)
@@ -248,7 +248,7 @@ describe API::Projects do
         it 'filters based on public visibility param' do
           get api('/projects', user), { visibility: 'public' }
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.map { |p| p['id'] }).to contain_exactly(public_project.id)
@@ -259,7 +259,7 @@ describe API::Projects do
         it 'returns the correct order when sorted by id' do
           get api('/projects', user), { order_by: 'id', sort: 'desc' }
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.first['id']).to eq(project3.id)
@@ -270,7 +270,7 @@ describe API::Projects do
         it 'returns an array of projects the user owns' do
           get api('/projects', user4), owned: true
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.first['name']).to eq(project4.name)
@@ -289,7 +289,7 @@ describe API::Projects do
         it 'returns the starred projects viewable by the user' do
           get api('/projects', user3), starred: true
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.map { |project| project['id'] }).to contain_exactly(project.id, public_project.id)
@@ -311,7 +311,7 @@ describe API::Projects do
           it 'returns only projects that satisfy all query parameters' do
             get api('/projects', user), { visibility: 'public', owned: true, starred: true, search: 'gitlab' }
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response.size).to eq(1)
@@ -330,7 +330,7 @@ describe API::Projects do
           it 'returns only projects that satisfy all query parameters' do
             get api('/projects', user), { visibility: 'public', membership: true, starred: true, search: 'gitlab' }
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response.size).to eq(2)
@@ -363,14 +363,14 @@ describe API::Projects do
         allow_any_instance_of(User).to receive(:projects_limit_left).and_return(0)
         expect { post api('/projects', user2), name: 'foo' }
           .to change {Project.count}.by(0)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
     it 'creates new project without path but with name and returns 201' do
       expect { post api('/projects', user), name: 'Foo Project' }
         .to change { Project.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project = Project.first
 
@@ -381,7 +381,7 @@ describe API::Projects do
     it 'creates new project without name but with path and returns 201' do
       expect { post api('/projects', user), path: 'foo_project' }
         .to change { Project.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project = Project.first
 
@@ -392,7 +392,7 @@ describe API::Projects do
     it 'creates new project with name and path and returns 201' do
       expect { post api('/projects', user), path: 'path-project-Foo', name: 'Foo Project' }
         .to change { Project.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project = Project.first
 
@@ -403,12 +403,12 @@ describe API::Projects do
     it 'creates last project before reaching project limit' do
       allow_any_instance_of(User).to receive(:projects_limit_left).and_return(1)
       post api('/projects', user2), name: 'foo'
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it 'does not create new project without name or path and returns 400' do
       expect { post api('/projects', user) }.not_to change { Project.count }
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "assigns attributes to project" do
@@ -427,7 +427,7 @@ describe API::Projects do
 
       post api('/projects', user), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project.each_pair do |k, v|
         next if %i[has_external_issue_tracker issues_enabled merge_requests_enabled wiki_enabled].include?(k)
@@ -543,7 +543,7 @@ describe API::Projects do
 
       post api('/projects', user), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     context 'when a visibility level is restricted' do
@@ -556,7 +556,7 @@ describe API::Projects do
       it 'does not allow a non-admin to use a restricted visibility level' do
         post api('/projects', user), project_param
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['visibility_level'].first).to(
           match('restricted by your GitLab administrator')
         )
@@ -576,14 +576,14 @@ describe API::Projects do
     it 'returns error when user not found' do
       get api('/users/9999/projects/')
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it 'returns projects filtered by user' do
       get api("/users/#{user4.id}/projects/", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.map { |project| project['id'] }).to contain_exactly(public_project.id)
@@ -597,7 +597,7 @@ describe API::Projects do
 
     it 'creates new project without path but with name and return 201' do
       expect { post api("/projects/user/#{user.id}", admin), name: 'Foo Project' }.to change {Project.count}.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project = Project.last
 
@@ -608,7 +608,7 @@ describe API::Projects do
     it 'creates new project with name and path and returns 201' do
       expect { post api("/projects/user/#{user.id}", admin), path: 'path-project-Foo', name: 'Foo Project' }
         .to change { Project.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project = Project.last
 
@@ -620,7 +620,7 @@ describe API::Projects do
       expect { post api("/projects/user/#{user.id}", admin) }
         .not_to change { Project.count }
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('name is missing')
     end
 
@@ -634,7 +634,7 @@ describe API::Projects do
 
       post api("/projects/user/#{user.id}", admin), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       project.each_pair do |k, v|
         next if %i[has_external_issue_tracker path].include?(k)
         expect(json_response[k.to_s]).to eq(v)
@@ -646,7 +646,7 @@ describe API::Projects do
 
       post api("/projects/user/#{user.id}", admin), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['visibility']).to eq('public')
     end
 
@@ -655,7 +655,7 @@ describe API::Projects do
 
       post api("/projects/user/#{user.id}", admin), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['visibility']).to eq('internal')
     end
 
@@ -720,7 +720,7 @@ describe API::Projects do
     it "uploads the file and returns its info" do
       post api("/projects/#{project.id}/uploads", user), file: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['alt']).to eq("dk")
       expect(json_response['url']).to start_with("/uploads/")
       expect(json_response['url']).to end_with("/dk.png")
@@ -734,7 +734,7 @@ describe API::Projects do
 
         get api("/projects/#{public_project.id}")
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['id']).to eq(public_project.id)
         expect(json_response['description']).to eq(public_project.description)
         expect(json_response['default_branch']).to eq(public_project.default_branch)
@@ -754,7 +754,7 @@ describe API::Projects do
 
         get api("/projects/#{project.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['id']).to eq(project.id)
         expect(json_response['description']).to eq(project.description)
         expect(json_response['default_branch']).to eq(project.default_branch)
@@ -798,20 +798,20 @@ describe API::Projects do
 
       it 'returns a project by path name' do
         get api("/projects/#{project.id}", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(project.name)
       end
 
       it 'returns a 404 error if not found' do
         get api('/projects/42', user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
 
       it 'returns a 404 error if user is not a member' do
         other_user = create(:user)
         get api("/projects/#{project.id}", other_user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'handles users with dots' do
@@ -819,14 +819,14 @@ describe API::Projects do
         project = create(:project, creator_id: dot_user.id, namespace: dot_user.namespace)
 
         get api("/projects/#{CGI.escape(project.full_path)}", dot_user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(project.name)
       end
 
       it 'exposes namespace fields' do
         get api("/projects/#{project.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['namespace']).to eq({
           'id' => user.namespace.id,
           'name' => user.namespace.name,
@@ -840,28 +840,28 @@ describe API::Projects do
       it "does not include statistics by default" do
         get api("/projects/#{project.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).not_to include 'statistics'
       end
 
       it "includes statistics if requested" do
         get api("/projects/#{project.id}", user), statistics: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to include 'statistics'
       end
 
       it "includes import_error if user can admin project" do
         get api("/projects/#{project.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to include("import_error")
       end
 
       it "does not include import_error if user cannot admin project" do
         get api("/projects/#{project.id}", user3)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).not_to include("import_error")
       end
 
@@ -906,7 +906,7 @@ describe API::Projects do
           it 'contains permission information' do
             get api("/projects", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response.first['permissions']['project_access']['access_level'])
             .to eq(Gitlab::Access::MASTER)
             expect(json_response.first['permissions']['group_access']).to be_nil
@@ -918,7 +918,7 @@ describe API::Projects do
             project.team << [user, :master]
             get api("/projects/#{project.id}", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response['permissions']['project_access']['access_level'])
             .to eq(Gitlab::Access::MASTER)
             expect(json_response['permissions']['group_access']).to be_nil
@@ -935,7 +935,7 @@ describe API::Projects do
           it 'sets the owner and return 200' do
             get api("/projects/#{project2.id}", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response['permissions']['project_access']).to be_nil
             expect(json_response['permissions']['group_access']['access_level'])
             .to eq(Gitlab::Access::OWNER)
@@ -952,7 +952,7 @@ describe API::Projects do
 
         user = project.namespace.owner
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -981,7 +981,7 @@ describe API::Projects do
       it 'returns a 404 error if not found' do
         get api('/projects/42/users', user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
 
@@ -990,7 +990,7 @@ describe API::Projects do
 
         get api("/projects/#{project.id}/users", other_user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -1003,7 +1003,7 @@ describe API::Projects do
     it 'returns an array of project snippets' do
       get api("/projects/#{project.id}/snippets", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.first['title']).to eq(snippet.title)
@@ -1013,13 +1013,13 @@ describe API::Projects do
   describe 'GET /projects/:id/snippets/:snippet_id' do
     it 'returns a project snippet' do
       get api("/projects/#{project.id}/snippets/#{snippet.id}", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(snippet.title)
     end
 
     it 'returns a 404 error if snippet id not found' do
       get api("/projects/#{project.id}/snippets/1234", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1027,7 +1027,7 @@ describe API::Projects do
     it 'creates a new project snippet' do
       post api("/projects/#{project.id}/snippets", user),
         title: 'api test', file_name: 'sample.rb', code: 'test', visibility: 'private'
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('api test')
     end
 
@@ -1041,7 +1041,7 @@ describe API::Projects do
     it 'updates an existing project snippet' do
       put api("/projects/#{project.id}/snippets/#{snippet.id}", user),
         code: 'updated code'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('example')
       expect(snippet.reload.content).to eq('updated code')
     end
@@ -1049,7 +1049,7 @@ describe API::Projects do
     it 'updates an existing project snippet with new title' do
       put api("/projects/#{project.id}/snippets/#{snippet.id}", user),
         title: 'other api test'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('other api test')
     end
   end
@@ -1063,13 +1063,13 @@ describe API::Projects do
       expect do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { Snippet.count }.by(-1)
     end
 
     it 'returns 404 when deleting unknown snippet id' do
       delete api("/projects/#{project.id}/snippets/1234", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it_behaves_like '412 response' do
@@ -1080,12 +1080,12 @@ describe API::Projects do
   describe 'GET /projects/:id/snippets/:snippet_id/raw' do
     it 'gets a raw project snippet' do
       get api("/projects/#{project.id}/snippets/#{snippet.id}/raw", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'returns a 404 error if raw project snippet not found' do
       get api("/projects/#{project.id}/snippets/5555/raw", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1098,13 +1098,13 @@ describe API::Projects do
 
       it "is not available for non admin users" do
         post api("/projects/#{project_fork_target.id}/fork/#{project_fork_source.id}", user)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it 'allows project to be forked from an existing project' do
         expect(project_fork_target.forked?).not_to be_truthy
         post api("/projects/#{project_fork_target.id}/fork/#{project_fork_source.id}", admin)
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         project_fork_target.reload
         expect(project_fork_target.forked_from_project.id).to eq(project_fork_source.id)
         expect(project_fork_target.forked_project_link).not_to be_nil
@@ -1121,7 +1121,7 @@ describe API::Projects do
 
       it 'fails if forked_from project which does not exist' do
         post api("/projects/#{project_fork_target.id}/fork/9999", admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'fails with 409 if already forked' do
@@ -1129,7 +1129,7 @@ describe API::Projects do
         project_fork_target.reload
         expect(project_fork_target.forked_from_project.id).to eq(project_fork_source.id)
         post api("/projects/#{project_fork_target.id}/fork/#{new_project_fork_source.id}", admin)
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
         project_fork_target.reload
         expect(project_fork_target.forked_from_project.id).to eq(project_fork_source.id)
         expect(project_fork_target.forked?).to be_truthy
@@ -1139,7 +1139,7 @@ describe API::Projects do
     describe 'DELETE /projects/:id/fork' do
       it "is not visible to users outside group" do
         delete api("/projects/#{project_fork_target.id}/fork", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       context 'when users belong to project group' do
@@ -1161,7 +1161,7 @@ describe API::Projects do
           it 'makes forked project unforked' do
             delete api("/projects/#{project_fork_target.id}/fork", admin)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
             project_fork_target.reload
             expect(project_fork_target.forked_from_project).to be_nil
             expect(project_fork_target.forked?).not_to be_truthy
@@ -1174,13 +1174,13 @@ describe API::Projects do
 
         it 'is forbidden to non-owner users' do
           delete api("/projects/#{project_fork_target.id}/fork", user2)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'is idempotent if not forked' do
           expect(project_fork_target.forked_from_project).to be_nil
           delete api("/projects/#{project_fork_target.id}/fork", admin)
-          expect(response).to have_http_status(304)
+          expect(response).to have_gitlab_http_status(304)
           expect(project_fork_target.reload.forked_from_project).to be_nil
         end
       end
@@ -1210,7 +1210,7 @@ describe API::Projects do
           it 'returns the forks' do
             get api("/projects/#{project_fork_source.id}/forks", member)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response.length).to eq(1)
             expect(json_response[0]['name']).to eq(private_fork.name)
@@ -1221,7 +1221,7 @@ describe API::Projects do
           it 'returns an empty array' do
             get api("/projects/#{project_fork_source.id}/forks", non_member)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response.length).to eq(0)
           end
@@ -1232,7 +1232,7 @@ describe API::Projects do
         it 'returns an empty array' do
           get api("/projects/#{project_fork_source.id}/forks")
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response.length).to eq(0)
         end
@@ -1250,7 +1250,7 @@ describe API::Projects do
         post api("/projects/#{project.id}/share", user), group_id: group.id, group_access: Gitlab::Access::DEVELOPER, expires_at: expires_at
       end.to change { ProjectGroupLink.count }.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['group_id']).to eq(group.id)
       expect(json_response['group_access']).to eq(Gitlab::Access::DEVELOPER)
       expect(json_response['expires_at']).to eq(expires_at.to_s)
@@ -1258,18 +1258,18 @@ describe API::Projects do
 
     it "returns a 400 error when group id is not given" do
       post api("/projects/#{project.id}/share", user), group_access: Gitlab::Access::DEVELOPER
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 400 error when access level is not given" do
       post api("/projects/#{project.id}/share", user), group_id: group.id
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 400 error when sharing is disabled" do
       project.namespace.update(share_with_group_lock: true)
       post api("/projects/#{project.id}/share", user), group_id: group.id, group_access: Gitlab::Access::DEVELOPER
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns a 404 error when user cannot read group' do
@@ -1277,19 +1277,19 @@ describe API::Projects do
 
       post api("/projects/#{project.id}/share", user), group_id: private_group.id, group_access: Gitlab::Access::DEVELOPER
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 404 error when group does not exist' do
       post api("/projects/#{project.id}/share", user), group_id: 1234, group_access: Gitlab::Access::DEVELOPER
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns a 400 error when wrong params passed" do
       post api("/projects/#{project.id}/share", user), group_id: group.id, group_access: 1234
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq 'group_access does not have a valid value'
     end
   end
@@ -1305,7 +1305,7 @@ describe API::Projects do
       it 'returns 204 when deleting a group share' do
         delete api("/projects/#{project.id}/share/#{group.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
         expect(project.project_group_links).to be_empty
       end
 
@@ -1317,19 +1317,19 @@ describe API::Projects do
     it 'returns a 400 when group id is not an integer' do
       delete api("/projects/#{project.id}/share/foo", user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns a 404 error when group link does not exist' do
       delete api("/projects/#{project.id}/share/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 404 error when project does not exist' do
       delete api("/projects/123/share/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1350,7 +1350,7 @@ describe API::Projects do
 
       put api("/projects/#{project.id}", user), project_param
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to match('at least one parameter must be provided')
     end
 
@@ -1360,7 +1360,7 @@ describe API::Projects do
 
         put api("/projects/#{project.id}"), project_param
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -1370,7 +1370,7 @@ describe API::Projects do
 
         put api("/projects/#{project.id}", user), project_param
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
@@ -1382,7 +1382,7 @@ describe API::Projects do
 
         put api("/projects/#{project3.id}", user), project_param
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
@@ -1395,7 +1395,7 @@ describe API::Projects do
 
         put api("/projects/#{project3.id}", user), project_param
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
@@ -1409,7 +1409,7 @@ describe API::Projects do
 
         put api("/projects/#{project.id}", user), project_param
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['name']).to eq(['has already been taken'])
       end
 
@@ -1418,7 +1418,7 @@ describe API::Projects do
 
         put api("/projects/#{project.id}", user), project_param
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['request_access_enabled']).to eq(false)
       end
 
@@ -1427,7 +1427,7 @@ describe API::Projects do
 
         put api("/projects/#{project3.id}", user), project_param
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
@@ -1439,7 +1439,7 @@ describe API::Projects do
 
         put api("/projects/#{project3.id}", user), project_param
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
@@ -1451,7 +1451,7 @@ describe API::Projects do
       it 'updates path' do
         project_param = { path: 'bar' }
         put api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
         end
@@ -1465,7 +1465,7 @@ describe API::Projects do
                           description: 'new description' }
 
         put api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
         end
@@ -1474,20 +1474,20 @@ describe API::Projects do
       it 'does not update path to existing path' do
         project_param = { path: project.path }
         put api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['path']).to eq(['has already been taken'])
       end
 
       it 'does not update name' do
         project_param = { name: 'bar' }
         put api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it 'does not update visibility_level' do
         project_param = { visibility: 'public' }
         put api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -1501,7 +1501,7 @@ describe API::Projects do
                           description: 'new description',
                           request_access_enabled: true }
         put api("/projects/#{project.id}", user3), project_param
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -1511,7 +1511,7 @@ describe API::Projects do
       it 'archives the project' do
         post api("/projects/#{project.id}/archive", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['archived']).to be_truthy
       end
     end
@@ -1524,7 +1524,7 @@ describe API::Projects do
       it 'remains archived' do
         post api("/projects/#{project.id}/archive", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['archived']).to be_truthy
       end
     end
@@ -1537,7 +1537,7 @@ describe API::Projects do
       it 'rejects the action' do
         post api("/projects/#{project.id}/archive", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -1547,7 +1547,7 @@ describe API::Projects do
       it 'remains unarchived' do
         post api("/projects/#{project.id}/unarchive", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['archived']).to be_falsey
       end
     end
@@ -1560,7 +1560,7 @@ describe API::Projects do
       it 'unarchives the project' do
         post api("/projects/#{project.id}/unarchive", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['archived']).to be_falsey
       end
     end
@@ -1573,7 +1573,7 @@ describe API::Projects do
       it 'rejects the action' do
         post api("/projects/#{project.id}/unarchive", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -1583,7 +1583,7 @@ describe API::Projects do
       it 'stars the project' do
         expect { post api("/projects/#{project.id}/star", user) }.to change { project.reload.star_count }.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['star_count']).to eq(1)
       end
     end
@@ -1597,7 +1597,7 @@ describe API::Projects do
       it 'does not modify the star count' do
         expect { post api("/projects/#{project.id}/star", user) }.not_to change { project.reload.star_count }
 
-        expect(response).to have_http_status(304)
+        expect(response).to have_gitlab_http_status(304)
       end
     end
   end
@@ -1612,7 +1612,7 @@ describe API::Projects do
       it 'unstars the project' do
         expect { post api("/projects/#{project.id}/unstar", user) }.to change { project.reload.star_count }.by(-1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['star_count']).to eq(0)
       end
     end
@@ -1621,7 +1621,7 @@ describe API::Projects do
       it 'does not modify the star count' do
         expect { post api("/projects/#{project.id}/unstar", user) }.not_to change { project.reload.star_count }
 
-        expect(response).to have_http_status(304)
+        expect(response).to have_gitlab_http_status(304)
       end
     end
   end
@@ -1631,7 +1631,7 @@ describe API::Projects do
       it 'removes project' do
         delete api("/projects/#{project.id}", user)
 
-        expect(response).to have_http_status(202)
+        expect(response).to have_gitlab_http_status(202)
         expect(json_response['message']).to eql('202 Accepted')
       end
 
@@ -1644,17 +1644,17 @@ describe API::Projects do
         user3 = create(:user)
         project.team << [user3, :developer]
         delete api("/projects/#{project.id}", user3)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it 'does not remove a non existing project' do
         delete api('/projects/1328', user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'does not remove a project not attached to user' do
         delete api("/projects/#{project.id}", user2)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -1662,13 +1662,13 @@ describe API::Projects do
       it 'removes any existing project' do
         delete api("/projects/#{project.id}", admin)
 
-        expect(response).to have_http_status(202)
+        expect(response).to have_gitlab_http_status(202)
         expect(json_response['message']).to eql('202 Accepted')
       end
 
       it 'does not remove a non existing project' do
         delete api('/projects/1328', admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it_behaves_like '412 response' do
@@ -1697,7 +1697,7 @@ describe API::Projects do
       it 'forks if user has sufficient access to project' do
         post api("/projects/#{project.id}/fork", user2)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['name']).to eq(project.name)
         expect(json_response['path']).to eq(project.path)
         expect(json_response['owner']['id']).to eq(user2.id)
@@ -1710,7 +1710,7 @@ describe API::Projects do
       it 'forks if user is admin' do
         post api("/projects/#{project.id}/fork", admin)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['name']).to eq(project.name)
         expect(json_response['path']).to eq(project.path)
         expect(json_response['owner']['id']).to eq(admin.id)
@@ -1724,14 +1724,14 @@ describe API::Projects do
         new_user = create(:user)
         post api("/projects/#{project.id}/fork", new_user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
 
       it 'fails if forked project exists in the user namespace' do
         post api("/projects/#{project.id}/fork", user)
 
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
         expect(json_response['message']['name']).to eq(['has already been taken'])
         expect(json_response['message']['path']).to eq(['has already been taken'])
       end
@@ -1739,61 +1739,61 @@ describe API::Projects do
       it 'fails if project to fork from does not exist' do
         post api('/projects/424242/fork', user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
 
       it 'forks with explicit own user namespace id' do
         post api("/projects/#{project.id}/fork", user2), namespace: user2.namespace.id
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['owner']['id']).to eq(user2.id)
       end
 
       it 'forks with explicit own user name as namespace' do
         post api("/projects/#{project.id}/fork", user2), namespace: user2.username
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['owner']['id']).to eq(user2.id)
       end
 
       it 'forks to another user when admin' do
         post api("/projects/#{project.id}/fork", admin), namespace: user2.username
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['owner']['id']).to eq(user2.id)
       end
 
       it 'fails if trying to fork to another user when not admin' do
         post api("/projects/#{project.id}/fork", user2), namespace: admin.namespace.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'fails if trying to fork to non-existent namespace' do
         post api("/projects/#{project.id}/fork", user2), namespace: 42424242
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Target Namespace Not Found')
       end
 
       it 'forks to owned group' do
         post api("/projects/#{project.id}/fork", user2), namespace: group2.name
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['namespace']['name']).to eq(group2.name)
       end
 
       it 'fails to fork to not owned group' do
         post api("/projects/#{project.id}/fork", user2), namespace: group.name
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'forks to not owned group when admin' do
         post api("/projects/#{project.id}/fork", admin), namespace: group.name
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['namespace']['name']).to eq(group.name)
       end
     end
@@ -1802,7 +1802,7 @@ describe API::Projects do
       it 'returns authentication error' do
         post api("/projects/#{project.id}/fork")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
         expect(json_response['message']).to eq('401 Unauthorized')
       end
     end
@@ -1821,7 +1821,7 @@ describe API::Projects do
 
         post api("/projects/#{project.id}/housekeeping", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       context 'when housekeeping lease is taken' do
@@ -1830,7 +1830,7 @@ describe API::Projects do
 
           post api("/projects/#{project.id}/housekeeping", user)
 
-          expect(response).to have_http_status(409)
+          expect(response).to have_gitlab_http_status(409)
           expect(json_response['message']).to match(/Somebody already triggered housekeeping for this project/)
         end
       end
@@ -1844,7 +1844,7 @@ describe API::Projects do
       it 'returns forbidden error' do
         post api("/projects/#{project.id}/housekeeping", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -1852,7 +1852,7 @@ describe API::Projects do
       it 'returns authentication error' do
         post api("/projects/#{project.id}/housekeeping")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb
index 1a0695615e3..9f2ff3b5af6 100644
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
@@ -17,7 +17,7 @@ describe API::Repositories do
       it 'returns the repository tree' do
         get api(route, current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
 
@@ -106,7 +106,7 @@ describe API::Repositories do
       it 'returns blob attributes as json' do
         get api(route, current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['size']).to eq(111)
         expect(json_response['encoding']).to eq("base64")
         expect(Base64.decode64(json_response['content']).lines.first).to eq("class Commit\n")
@@ -165,7 +165,7 @@ describe API::Repositories do
 
         get api(route, current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       context 'when sha does not exist' do
@@ -218,7 +218,7 @@ describe API::Repositories do
       it 'returns the repository archive' do
         get api(route, current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         repo_name = project.repository.name.gsub("\.git", "")
         type, params = workhorse_send_data
@@ -230,7 +230,7 @@ describe API::Repositories do
       it 'returns the repository archive archive.zip' do
         get api("/projects/#{project.id}/repository/archive.zip", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         repo_name = project.repository.name.gsub("\.git", "")
         type, params = workhorse_send_data
@@ -242,7 +242,7 @@ describe API::Repositories do
       it 'returns the repository archive archive.tar.bz2' do
         get api("/projects/#{project.id}/repository/archive.tar.bz2", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         repo_name = project.repository.name.gsub("\.git", "")
         type, params = workhorse_send_data
@@ -293,7 +293,7 @@ describe API::Repositories do
       it "compares branches" do
         get api(route, current_user), from: 'master', to: 'feature'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_present
         expect(json_response['diffs']).to be_present
       end
@@ -301,7 +301,7 @@ describe API::Repositories do
       it "compares tags" do
         get api(route, current_user), from: 'v1.0.0', to: 'v1.1.0'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_present
         expect(json_response['diffs']).to be_present
       end
@@ -309,7 +309,7 @@ describe API::Repositories do
       it "compares commits" do
         get api(route, current_user), from: sample_commit.id, to: sample_commit.parent_id
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_empty
         expect(json_response['diffs']).to be_empty
         expect(json_response['compare_same_ref']).to be_falsey
@@ -318,7 +318,7 @@ describe API::Repositories do
       it "compares commits in reverse order" do
         get api(route, current_user), from: sample_commit.parent_id, to: sample_commit.id
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_present
         expect(json_response['diffs']).to be_present
       end
@@ -326,7 +326,7 @@ describe API::Repositories do
       it "compares same refs" do
         get api(route, current_user), from: 'master', to: 'master'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_empty
         expect(json_response['diffs']).to be_empty
         expect(json_response['compare_same_ref']).to be_truthy
@@ -367,7 +367,7 @@ describe API::Repositories do
       it 'returns valid data' do
         get api(route, current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
 
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 5068df5b43a..5fd76fce7df 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -16,7 +16,7 @@ describe API::Runner do
         it 'returns 400 error' do
           post api('/runners')
 
-          expect(response).to have_http_status 400
+          expect(response).to have_gitlab_http_status 400
         end
       end
 
@@ -24,7 +24,7 @@ describe API::Runner do
         it 'returns 403 error' do
           post api('/runners'), token: 'invalid'
 
-          expect(response).to have_http_status 403
+          expect(response).to have_gitlab_http_status 403
         end
       end
 
@@ -34,7 +34,7 @@ describe API::Runner do
 
           runner = Ci::Runner.first
 
-          expect(response).to have_http_status 201
+          expect(response).to have_gitlab_http_status 201
           expect(json_response['id']).to eq(runner.id)
           expect(json_response['token']).to eq(runner.token)
           expect(runner.run_untagged).to be true
@@ -47,7 +47,7 @@ describe API::Runner do
           it 'creates runner' do
             post api('/runners'), token: project.runners_token
 
-            expect(response).to have_http_status 201
+            expect(response).to have_gitlab_http_status 201
             expect(project.runners.size).to eq(1)
             expect(Ci::Runner.first.token).not_to eq(registration_token)
             expect(Ci::Runner.first.token).not_to eq(project.runners_token)
@@ -60,7 +60,7 @@ describe API::Runner do
           post api('/runners'), token: registration_token,
                                 description: 'server.hostname'
 
-          expect(response).to have_http_status 201
+          expect(response).to have_gitlab_http_status 201
           expect(Ci::Runner.first.description).to eq('server.hostname')
         end
       end
@@ -70,7 +70,7 @@ describe API::Runner do
           post api('/runners'), token: registration_token,
                                 tag_list: 'tag1, tag2'
 
-          expect(response).to have_http_status 201
+          expect(response).to have_gitlab_http_status 201
           expect(Ci::Runner.first.tag_list.sort).to eq(%w(tag1 tag2))
         end
       end
@@ -82,7 +82,7 @@ describe API::Runner do
                                   run_untagged: false,
                                   tag_list: ['tag']
 
-            expect(response).to have_http_status 201
+            expect(response).to have_gitlab_http_status 201
             expect(Ci::Runner.first.run_untagged).to be false
             expect(Ci::Runner.first.tag_list.sort).to eq(['tag'])
           end
@@ -93,7 +93,7 @@ describe API::Runner do
             post api('/runners'), token: registration_token,
                                   run_untagged: false
 
-            expect(response).to have_http_status 404
+            expect(response).to have_gitlab_http_status 404
           end
         end
       end
@@ -103,7 +103,7 @@ describe API::Runner do
           post api('/runners'), token: registration_token,
                                 locked: true
 
-          expect(response).to have_http_status 201
+          expect(response).to have_gitlab_http_status 201
           expect(Ci::Runner.first.locked).to be true
         end
       end
@@ -116,7 +116,7 @@ describe API::Runner do
             post api('/runners'), token: registration_token,
                                   info: { param => value }
 
-            expect(response).to have_http_status 201
+            expect(response).to have_gitlab_http_status 201
             expect(Ci::Runner.first.read_attribute(param.to_sym)).to eq(value)
           end
         end
@@ -128,7 +128,7 @@ describe API::Runner do
         it 'returns 400 error' do
           delete api('/runners')
 
-          expect(response).to have_http_status 400
+          expect(response).to have_gitlab_http_status 400
         end
       end
 
@@ -136,7 +136,7 @@ describe API::Runner do
         it 'returns 403 error' do
           delete api('/runners'), token: 'invalid'
 
-          expect(response).to have_http_status 403
+          expect(response).to have_gitlab_http_status 403
         end
       end
 
@@ -146,7 +146,7 @@ describe API::Runner do
         it 'deletes Runner' do
           delete api('/runners'), token: runner.token
 
-          expect(response).to have_http_status 204
+          expect(response).to have_gitlab_http_status 204
           expect(Ci::Runner.count).to eq(0)
         end
 
@@ -164,7 +164,7 @@ describe API::Runner do
         it 'returns 400 error' do
           post api('/runners/verify')
 
-          expect(response).to have_http_status :bad_request
+          expect(response).to have_gitlab_http_status :bad_request
         end
       end
 
@@ -172,7 +172,7 @@ describe API::Runner do
         it 'returns 403 error' do
           post api('/runners/verify'), token: 'invalid-token'
 
-          expect(response).to have_http_status 403
+          expect(response).to have_gitlab_http_status 403
         end
       end
 
@@ -180,7 +180,7 @@ describe API::Runner do
         it 'verifies Runner credentials' do
           post api('/runners/verify'), token: runner.token
 
-          expect(response).to have_http_status 200
+          expect(response).to have_gitlab_http_status 200
         end
       end
     end
@@ -216,7 +216,7 @@ describe API::Runner do
         context 'when runner sends version in User-Agent' do
           context 'for stable version' do
             it 'gives 204 and set X-GitLab-Last-Update' do
-              expect(response).to have_http_status(204)
+              expect(response).to have_gitlab_http_status(204)
               expect(response.header).to have_key('X-GitLab-Last-Update')
             end
           end
@@ -225,7 +225,7 @@ describe API::Runner do
             let(:last_update) { runner.ensure_runner_queue_value }
 
             it 'gives 204 and set the same X-GitLab-Last-Update' do
-              expect(response).to have_http_status(204)
+              expect(response).to have_gitlab_http_status(204)
               expect(response.header['X-GitLab-Last-Update']).to eq(last_update)
             end
           end
@@ -235,7 +235,7 @@ describe API::Runner do
             let(:new_update) { runner.tick_runner_queue }
 
             it 'gives 204 and set a new X-GitLab-Last-Update' do
-              expect(response).to have_http_status(204)
+              expect(response).to have_gitlab_http_status(204)
               expect(response.header['X-GitLab-Last-Update']).to eq(new_update)
             end
           end
@@ -243,19 +243,19 @@ describe API::Runner do
           context 'when beta version is sent' do
             let(:user_agent) { 'gitlab-runner 9.0.0~beta.167.g2b2bacc (master; go1.7.4; linux/amd64)' }
 
-            it { expect(response).to have_http_status(204) }
+            it { expect(response).to have_gitlab_http_status(204) }
           end
 
           context 'when pre-9-0 version is sent' do
             let(:user_agent) { 'gitlab-ci-multi-runner 1.6.0 (1-6-stable; go1.6.3; linux/amd64)' }
 
-            it { expect(response).to have_http_status(204) }
+            it { expect(response).to have_gitlab_http_status(204) }
           end
 
           context 'when pre-9-0 beta version is sent' do
             let(:user_agent) { 'gitlab-ci-multi-runner 1.6.0~beta.167.g2b2bacc (master; go1.6.3; linux/amd64)' }
 
-            it { expect(response).to have_http_status(204) }
+            it { expect(response).to have_gitlab_http_status(204) }
           end
         end
       end
@@ -264,7 +264,7 @@ describe API::Runner do
         it 'returns 400 error' do
           post api('/jobs/request')
 
-          expect(response).to have_http_status 400
+          expect(response).to have_gitlab_http_status 400
         end
       end
 
@@ -272,7 +272,7 @@ describe API::Runner do
         it 'returns 403 error' do
           post api('/jobs/request'), token: 'invalid'
 
-          expect(response).to have_http_status 403
+          expect(response).to have_gitlab_http_status 403
         end
       end
 
@@ -283,7 +283,7 @@ describe API::Runner do
           it 'returns 204 error' do
             request_job
 
-            expect(response).to have_http_status 204
+            expect(response).to have_gitlab_http_status 204
           end
         end
 
@@ -365,7 +365,7 @@ describe API::Runner do
           it 'picks a job' do
             request_job info: { platform: :darwin }
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
             expect(response.headers).not_to have_key('X-GitLab-Last-Update')
             expect(runner.reload.platform).to eq('darwin')
             expect(json_response['id']).to eq(job.id)
@@ -390,7 +390,7 @@ describe API::Runner do
             it 'sets branch as ref_type' do
               request_job
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
               expect(json_response['git_info']['ref_type']).to eq('tag')
             end
           end
@@ -399,7 +399,7 @@ describe API::Runner do
             it 'sets tag as ref_type' do
               request_job
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
               expect(json_response['git_info']['ref_type']).to eq('branch')
             end
           end
@@ -415,7 +415,7 @@ describe API::Runner do
               it "updates provided Runner's parameter" do
                 request_job info: { param => value }
 
-                expect(response).to have_http_status(201)
+                expect(response).to have_gitlab_http_status(201)
                 expect(runner.reload.read_attribute(param.to_sym)).to eq(value)
               end
             end
@@ -430,7 +430,7 @@ describe API::Runner do
             it 'returns a conflict' do
               request_job
 
-              expect(response).to have_http_status(409)
+              expect(response).to have_gitlab_http_status(409)
               expect(response.headers).not_to have_key('X-GitLab-Last-Update')
             end
           end
@@ -448,7 +448,7 @@ describe API::Runner do
             it 'returns dependent jobs' do
               request_job
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
               expect(json_response['id']).to eq(test_job.id)
               expect(json_response['dependencies'].count).to eq(2)
               expect(json_response['dependencies']).to include(
@@ -468,7 +468,7 @@ describe API::Runner do
             it 'returns dependent jobs' do
               request_job
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
               expect(json_response['id']).to eq(test_job.id)
               expect(json_response['dependencies'].count).to eq(1)
               expect(json_response['dependencies']).to include(
@@ -494,7 +494,7 @@ describe API::Runner do
             it 'returns dependent jobs' do
               request_job
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
               expect(json_response['id']).to eq(test_job.id)
               expect(json_response['dependencies'].count).to eq(1)
               expect(json_response['dependencies'][0]).to include('id' => job2.id, 'name' => job2.name, 'token' => job2.token)
@@ -518,7 +518,7 @@ describe API::Runner do
             it 'returns an empty array' do
               request_job
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
               expect(json_response['id']).to eq(empty_dependencies_job.id)
               expect(json_response['dependencies'].count).to eq(0)
             end
@@ -537,7 +537,7 @@ describe API::Runner do
               it 'picks job' do
                 request_job
 
-                expect(response).to have_http_status 201
+                expect(response).to have_gitlab_http_status 201
               end
             end
 
@@ -571,7 +571,7 @@ describe API::Runner do
               it 'returns variables for triggers' do
                 request_job
 
-                expect(response).to have_http_status(201)
+                expect(response).to have_gitlab_http_status(201)
                 expect(json_response['variables']).to include(*expected_variables)
               end
             end
@@ -683,7 +683,7 @@ describe API::Runner do
         it 'updates a running build' do
           update_job(trace: 'BUILD TRACE UPDATED')
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(job.reload.trace.raw).to eq 'BUILD TRACE UPDATED'
         end
       end
@@ -702,7 +702,7 @@ describe API::Runner do
         it 'responds with forbidden' do
           update_job
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
@@ -871,7 +871,7 @@ describe API::Runner do
           it 'authorizes posting artifacts to running job' do
             authorize_artifacts_with_token_in_params
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response.content_type.to_s).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
             expect(json_response['TempPath']).not_to be_nil
           end
@@ -881,7 +881,7 @@ describe API::Runner do
 
             authorize_artifacts_with_token_in_params(filesize: 100)
 
-            expect(response).to have_http_status(413)
+            expect(response).to have_gitlab_http_status(413)
           end
         end
 
@@ -889,7 +889,7 @@ describe API::Runner do
           it 'authorizes posting artifacts to running job' do
             authorize_artifacts_with_token_in_headers
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response.content_type.to_s).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
             expect(json_response['TempPath']).not_to be_nil
           end
@@ -899,7 +899,7 @@ describe API::Runner do
 
             authorize_artifacts_with_token_in_headers(filesize: 100)
 
-            expect(response).to have_http_status(413)
+            expect(response).to have_gitlab_http_status(413)
           end
         end
 
@@ -907,7 +907,7 @@ describe API::Runner do
           it 'fails to authorize artifacts posting' do
             authorize_artifacts(token: job.project.runners_token)
 
-            expect(response).to have_http_status(403)
+            expect(response).to have_gitlab_http_status(403)
           end
         end
 
@@ -916,14 +916,14 @@ describe API::Runner do
 
           authorize_artifacts
 
-          expect(response).to have_http_status(500)
+          expect(response).to have_gitlab_http_status(500)
         end
 
         context 'authorization token is invalid' do
           it 'responds with forbidden' do
             authorize_artifacts(token: 'invalid', filesize: 100 )
 
-            expect(response).to have_http_status(403)
+            expect(response).to have_gitlab_http_status(403)
           end
         end
 
@@ -958,14 +958,14 @@ describe API::Runner do
             it 'responds with forbidden' do
               upload_artifacts(file_upload, headers_with_token)
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
 
           context 'when job is running' do
             shared_examples 'successful artifacts upload' do
               it 'updates successfully' do
-                expect(response).to have_http_status(201)
+                expect(response).to have_gitlab_http_status(201)
               end
             end
 
@@ -998,7 +998,7 @@ describe API::Runner do
               it 'responds with forbidden' do
                 upload_artifacts(file_upload, headers.merge(API::Helpers::Runner::JOB_TOKEN_HEADER => job.project.runners_token))
 
-                expect(response).to have_http_status(403)
+                expect(response).to have_gitlab_http_status(403)
               end
             end
           end
@@ -1009,7 +1009,7 @@ describe API::Runner do
 
               upload_artifacts(file_upload, headers_with_token)
 
-              expect(response).to have_http_status(413)
+              expect(response).to have_gitlab_http_status(413)
             end
           end
 
@@ -1017,7 +1017,7 @@ describe API::Runner do
             it 'fails to post artifacts without file' do
               post api("/jobs/#{job.id}/artifacts"), {}, headers_with_token
 
-              expect(response).to have_http_status(400)
+              expect(response).to have_gitlab_http_status(400)
             end
           end
 
@@ -1025,7 +1025,7 @@ describe API::Runner do
             it 'fails to post artifacts without GitLab-Workhorse' do
               post api("/jobs/#{job.id}/artifacts"), { token: job.token }, {}
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
 
@@ -1047,7 +1047,7 @@ describe API::Runner do
               let(:expire_in) { '7 days' }
 
               it 'updates when specified' do
-                expect(response).to have_http_status(201)
+                expect(response).to have_gitlab_http_status(201)
                 expect(job.reload.artifacts_expire_at).to be_within(5.minutes).of(7.days.from_now)
               end
             end
@@ -1056,7 +1056,7 @@ describe API::Runner do
               let(:expire_in) { nil }
 
               it 'ignores if not specified' do
-                expect(response).to have_http_status(201)
+                expect(response).to have_gitlab_http_status(201)
                 expect(job.reload.artifacts_expire_at).to be_nil
               end
 
@@ -1065,7 +1065,7 @@ describe API::Runner do
                   let(:default_artifacts_expire_in) { '5 days' }
 
                   it 'sets to application default' do
-                    expect(response).to have_http_status(201)
+                    expect(response).to have_gitlab_http_status(201)
                     expect(job.reload.artifacts_expire_at).to be_within(5.minutes).of(5.days.from_now)
                   end
                 end
@@ -1074,7 +1074,7 @@ describe API::Runner do
                   let(:default_artifacts_expire_in) { '0' }
 
                   it 'does not set expire_in' do
-                    expect(response).to have_http_status(201)
+                    expect(response).to have_gitlab_http_status(201)
                     expect(job.reload.artifacts_expire_at).to be_nil
                   end
                 end
@@ -1103,7 +1103,7 @@ describe API::Runner do
               end
 
               it 'stores artifacts and artifacts metadata' do
-                expect(response).to have_http_status(201)
+                expect(response).to have_gitlab_http_status(201)
                 expect(stored_artifacts_file.original_filename).to eq(artifacts.original_filename)
                 expect(stored_metadata_file.original_filename).to eq(metadata.original_filename)
                 expect(stored_artifacts_size).to eq(71759)
@@ -1116,7 +1116,7 @@ describe API::Runner do
               end
 
               it 'is expected to respond with bad request' do
-                expect(response).to have_http_status(400)
+                expect(response).to have_gitlab_http_status(400)
               end
 
               it 'does not store metadata' do
@@ -1141,7 +1141,7 @@ describe API::Runner do
           it' "fails to post artifacts for outside of tmp path"' do
             upload_artifacts(file_upload, headers_with_token)
 
-            expect(response).to have_http_status(400)
+            expect(response).to have_gitlab_http_status(400)
           end
         end
 
@@ -1171,7 +1171,7 @@ describe API::Runner do
 
           context 'when using job token' do
             it 'download artifacts' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
               expect(response.headers).to include download_headers
             end
           end
@@ -1180,14 +1180,14 @@ describe API::Runner do
             let(:token) { job.project.runners_token }
 
             it 'responds with forbidden' do
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
 
         context 'when job does not has artifacts' do
           it 'responds with not found' do
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
diff --git a/spec/requests/api/runners_spec.rb b/spec/requests/api/runners_spec.rb
index 67907579225..fe38a7b3251 100644
--- a/spec/requests/api/runners_spec.rb
+++ b/spec/requests/api/runners_spec.rb
@@ -37,7 +37,7 @@ describe API::Runners do
         get api('/runners', user)
 
         shared = json_response.any? { |r| r['is_shared'] }
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(shared).to be_falsey
@@ -47,7 +47,7 @@ describe API::Runners do
         get api('/runners?scope=active', user)
 
         shared = json_response.any? { |r| r['is_shared'] }
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(shared).to be_falsey
@@ -55,7 +55,7 @@ describe API::Runners do
 
       it 'avoids filtering if scope is invalid' do
         get api('/runners?scope=unknown', user)
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -63,7 +63,7 @@ describe API::Runners do
       it 'does not return runners' do
         get api('/runners')
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -75,7 +75,7 @@ describe API::Runners do
           get api('/runners/all', admin)
 
           shared = json_response.any? { |r| r['is_shared'] }
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(shared).to be_truthy
@@ -86,7 +86,7 @@ describe API::Runners do
         it 'does not return runners list' do
           get api('/runners/all', user)
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
@@ -94,7 +94,7 @@ describe API::Runners do
         get api('/runners/all?scope=specific', admin)
 
         shared = json_response.any? { |r| r['is_shared'] }
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(shared).to be_falsey
@@ -102,7 +102,7 @@ describe API::Runners do
 
       it 'avoids filtering if scope is invalid' do
         get api('/runners?scope=unknown', admin)
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -110,7 +110,7 @@ describe API::Runners do
       it 'does not return runners' do
         get api('/runners')
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -121,7 +121,7 @@ describe API::Runners do
         it "returns runner's details" do
           get api("/runners/#{shared_runner.id}", admin)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['description']).to eq(shared_runner.description)
         end
       end
@@ -130,7 +130,7 @@ describe API::Runners do
         it "returns runner's details" do
           get api("/runners/#{specific_runner.id}", admin)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['description']).to eq(specific_runner.description)
         end
       end
@@ -138,7 +138,7 @@ describe API::Runners do
       it 'returns 404 if runner does not exists' do
         get api('/runners/9999', admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -147,7 +147,7 @@ describe API::Runners do
         it "returns runner's details" do
           get api("/runners/#{specific_runner.id}", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['description']).to eq(specific_runner.description)
         end
       end
@@ -156,7 +156,7 @@ describe API::Runners do
         it "returns runner's details" do
           get api("/runners/#{shared_runner.id}", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['description']).to eq(shared_runner.description)
         end
       end
@@ -166,7 +166,7 @@ describe API::Runners do
       it "does not return runner's details" do
         get api("/runners/#{specific_runner.id}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -174,7 +174,7 @@ describe API::Runners do
       it "does not return runner's details" do
         get api("/runners/#{specific_runner.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -195,7 +195,7 @@ describe API::Runners do
                                                  access_level: 'ref_protected')
           shared_runner.reload
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(shared_runner.description).to eq("#{description}_updated")
           expect(shared_runner.active).to eq(!active)
           expect(shared_runner.tag_list).to include('ruby2.1', 'pgsql', 'mysql')
@@ -215,7 +215,7 @@ describe API::Runners do
           update_runner(specific_runner.id, admin, description: 'test')
           specific_runner.reload
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(specific_runner.description).to eq('test')
           expect(specific_runner.description).not_to eq(description)
           expect(specific_runner.ensure_runner_queue_value)
@@ -226,7 +226,7 @@ describe API::Runners do
       it 'returns 404 if runner does not exists' do
         update_runner(9999, admin, description: 'test')
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       def update_runner(id, user, args)
@@ -239,7 +239,7 @@ describe API::Runners do
         it 'does not update runner' do
           put api("/runners/#{shared_runner.id}", user), description: 'test'
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
@@ -247,7 +247,7 @@ describe API::Runners do
         it 'does not update runner without access to it' do
           put api("/runners/#{specific_runner.id}", user2), description: 'test'
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'updates runner with access to it' do
@@ -255,7 +255,7 @@ describe API::Runners do
           put api("/runners/#{specific_runner.id}", admin), description: 'test'
           specific_runner.reload
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(specific_runner.description).to eq('test')
           expect(specific_runner.description).not_to eq(description)
         end
@@ -266,7 +266,7 @@ describe API::Runners do
       it 'does not delete runner' do
         put api("/runners/#{specific_runner.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -278,7 +278,7 @@ describe API::Runners do
           expect do
             delete api("/runners/#{shared_runner.id}", admin)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { Ci::Runner.shared.count }.by(-1)
         end
 
@@ -292,7 +292,7 @@ describe API::Runners do
           expect do
             delete api("/runners/#{unused_specific_runner.id}", admin)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { Ci::Runner.specific.count }.by(-1)
         end
 
@@ -300,7 +300,7 @@ describe API::Runners do
           expect do
             delete api("/runners/#{specific_runner.id}", admin)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { Ci::Runner.specific.count }.by(-1)
         end
       end
@@ -308,7 +308,7 @@ describe API::Runners do
       it 'returns 404 if runner does not exists' do
         delete api('/runners/9999', admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -316,26 +316,26 @@ describe API::Runners do
       context 'when runner is shared' do
         it 'does not delete runner' do
           delete api("/runners/#{shared_runner.id}", user)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
       context 'when runner is not shared' do
         it 'does not delete runner without access to it' do
           delete api("/runners/#{specific_runner.id}", user2)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'does not delete runner with more than one associated project' do
           delete api("/runners/#{two_projects_runner.id}", user)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'deletes runner for one owned project' do
           expect do
             delete api("/runners/#{specific_runner.id}", user)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { Ci::Runner.specific.count }.by(-1)
         end
 
@@ -349,7 +349,7 @@ describe API::Runners do
       it 'does not delete runner' do
         delete api("/runners/#{specific_runner.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -360,7 +360,7 @@ describe API::Runners do
         get api("/projects/#{project.id}/runners", user)
 
         shared = json_response.any? { |r| r['is_shared'] }
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(shared).to be_truthy
@@ -371,7 +371,7 @@ describe API::Runners do
       it "does not return project's runners" do
         get api("/projects/#{project.id}/runners", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -379,7 +379,7 @@ describe API::Runners do
       it "does not return project's runners" do
         get api("/projects/#{project.id}/runners")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -396,14 +396,14 @@ describe API::Runners do
         expect do
           post api("/projects/#{project.id}/runners", user), runner_id: specific_runner2.id
         end.to change { project.runners.count }.by(+1)
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       it 'avoids changes when enabling already enabled runner' do
         expect do
           post api("/projects/#{project.id}/runners", user), runner_id: specific_runner.id
         end.to change { project.runners.count }.by(0)
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
       end
 
       it 'does not enable locked runner' do
@@ -413,13 +413,13 @@ describe API::Runners do
           post api("/projects/#{project.id}/runners", user), runner_id: specific_runner2.id
         end.to change { project.runners.count }.by(0)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it 'does not enable shared runner' do
         post api("/projects/#{project.id}/runners", user), runner_id: shared_runner.id
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       context 'user is admin' do
@@ -427,7 +427,7 @@ describe API::Runners do
           expect do
             post api("/projects/#{project.id}/runners", admin), runner_id: unused_specific_runner.id
           end.to change { project.runners.count }.by(+1)
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
         end
       end
 
@@ -435,14 +435,14 @@ describe API::Runners do
         it 'does not enable runner without access to' do
           post api("/projects/#{project.id}/runners", user), runner_id: unused_specific_runner.id
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
       it 'raises an error when no runner_id param is provided' do
         post api("/projects/#{project.id}/runners", admin)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -450,7 +450,7 @@ describe API::Runners do
       it 'does not enable runner' do
         post api("/projects/#{project.id}/runners", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -458,7 +458,7 @@ describe API::Runners do
       it 'does not enable runner' do
         post api("/projects/#{project.id}/runners")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -470,7 +470,7 @@ describe API::Runners do
           expect do
             delete api("/projects/#{project.id}/runners/#{two_projects_runner.id}", user)
 
-            expect(response).to have_http_status(204)
+            expect(response).to have_gitlab_http_status(204)
           end.to change { project.runners.count }.by(-1)
         end
 
@@ -484,14 +484,14 @@ describe API::Runners do
           expect do
             delete api("/projects/#{project.id}/runners/#{specific_runner.id}", user)
           end.to change { project.runners.count }.by(0)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
       it 'returns 404 is runner is not found' do
         delete api("/projects/#{project.id}/runners/9999", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -499,7 +499,7 @@ describe API::Runners do
       it "does not disable project's runner" do
         delete api("/projects/#{project.id}/runners/#{specific_runner.id}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -507,7 +507,7 @@ describe API::Runners do
       it "does not disable project's runner" do
         delete api("/projects/#{project.id}/runners/#{specific_runner.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/services_spec.rb b/spec/requests/api/services_spec.rb
index 7e174903918..dfe48e45d49 100644
--- a/spec/requests/api/services_spec.rb
+++ b/spec/requests/api/services_spec.rb
@@ -16,7 +16,7 @@ describe API::Services do
       it "updates #{service} settings" do
         put api("/projects/#{project.id}/services/#{dashed_service}", user), service_attrs
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         current_service = project.services.first
         event = current_service.event_names.empty? ? "foo" : current_service.event_names.first
@@ -24,7 +24,7 @@ describe API::Services do
 
         put api("/projects/#{project.id}/services/#{dashed_service}?#{event}=#{!state}", user), service_attrs
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(project.services.first[event]).not_to eq(state) unless event == "foo"
       end
 
@@ -56,7 +56,7 @@ describe API::Services do
       it "deletes #{service}" do
         delete api("/projects/#{project.id}/services/#{dashed_service}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
         project.send(service_method).reload
         expect(project.send(service_method).activated?).to be_falsey
       end
@@ -74,20 +74,20 @@ describe API::Services do
 
       it 'returns authentication error when unauthenticated' do
         get api("/projects/#{project.id}/services/#{dashed_service}")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       it "returns all properties of service #{service} when authenticated as admin" do
         get api("/projects/#{project.id}/services/#{dashed_service}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['properties'].keys.map(&:to_sym)).to match_array(service_attrs_list.map)
       end
 
       it "returns properties of service #{service} other than passwords when authenticated as project owner" do
         get api("/projects/#{project.id}/services/#{dashed_service}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['properties'].keys.map(&:to_sym)).to match_array(service_attrs_list_without_passwords)
       end
 
@@ -95,7 +95,7 @@ describe API::Services do
         project.team << [user2, :developer]
         get api("/projects/#{project.id}/services/#{dashed_service}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -108,7 +108,7 @@ describe API::Services do
         it 'returns a not found message' do
           post api("/projects/#{project.id}/services/idonotexist/trigger")
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
           expect(json_response["error"]).to eq("404 Not Found")
         end
       end
@@ -127,7 +127,7 @@ describe API::Services do
           it 'when the service is inactive' do
             post api("/projects/#{project.id}/services/#{service_name}/trigger"), params
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -142,7 +142,7 @@ describe API::Services do
           it 'returns status 200' do
             post api("/projects/#{project.id}/services/#{service_name}/trigger"), params
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
 
@@ -150,7 +150,7 @@ describe API::Services do
           it 'returns a generic 404' do
             post api("/projects/404/services/#{service_name}/trigger"), params
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
             expect(json_response["message"]).to eq("404 Service Not Found")
           end
         end
@@ -170,7 +170,7 @@ describe API::Services do
       it 'returns status 200' do
         post api("/projects/#{project.id}/services/#{service_name}/trigger"), token: 'token', text: 'help'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['response_type']).to eq("ephemeral")
       end
     end
diff --git a/spec/requests/api/session_spec.rb b/spec/requests/api/session_spec.rb
index 5e77519c867..83d09878813 100644
--- a/spec/requests/api/session_spec.rb
+++ b/spec/requests/api/session_spec.rb
@@ -7,7 +7,7 @@ describe API::Session do
     context "when valid password" do
       it "returns private token" do
         post api("/session"), email: user.email, password: '12345678'
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
 
         expect(json_response['email']).to eq(user.email)
         expect(json_response['private_token']).to eq(user.private_token)
@@ -22,7 +22,7 @@ describe API::Session do
 
           post api('/session'), email: user.email, password: user.password
 
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
           expect(response.body).to include('You have 2FA enabled.')
         end
       end
@@ -57,7 +57,7 @@ describe API::Session do
     context "when invalid password" do
       it "returns authentication error" do
         post api("/session"), email: user.email, password: '123'
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
 
         expect(json_response['email']).to be_nil
         expect(json_response['private_token']).to be_nil
@@ -68,13 +68,13 @@ describe API::Session do
       it "returns authentication error with email" do
         post api("/session"), email: user.email
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns authentication error with username" do
         post api("/session"), email: user.username
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -82,7 +82,7 @@ describe API::Session do
       it "returns authentication error" do
         post api("/session"), password: user.password
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -91,7 +91,7 @@ describe API::Session do
         user.block
         post api("/session"), email: user.username, password: user.password
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -100,7 +100,7 @@ describe API::Session do
         user.ldap_block
         post api("/session"), email: user.username, password: user.password
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index c24de58ee9d..5d3e78dd7c8 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -7,7 +7,7 @@ describe API::Settings, 'Settings' do
   describe "GET /application/settings" do
     it "returns application settings" do
       get api("/application/settings", admin)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Hash
       expect(json_response['default_projects_limit']).to eq(42)
       expect(json_response['password_authentication_enabled']).to be_truthy
@@ -56,7 +56,7 @@ describe API::Settings, 'Settings' do
           ed25519_key_restriction: 256,
           circuitbreaker_failure_wait_time: 2
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['default_projects_limit']).to eq(3)
         expect(json_response['password_authentication_enabled']).to be_falsey
         expect(json_response['repository_storages']).to eq(['custom'])
@@ -83,7 +83,7 @@ describe API::Settings, 'Settings' do
       it "returns a blank parameter error message" do
         put api("/application/settings", admin), koding_enabled: true
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('koding_url is missing')
       end
     end
@@ -92,7 +92,7 @@ describe API::Settings, 'Settings' do
       it "returns a blank parameter error message" do
         put api("/application/settings", admin), plantuml_enabled: true
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('plantuml_url is missing')
       end
     end
diff --git a/spec/requests/api/sidekiq_metrics_spec.rb b/spec/requests/api/sidekiq_metrics_spec.rb
index 83042d0cb12..fff9adb7f57 100644
--- a/spec/requests/api/sidekiq_metrics_spec.rb
+++ b/spec/requests/api/sidekiq_metrics_spec.rb
@@ -7,28 +7,28 @@ describe API::SidekiqMetrics do
     it 'defines the `queue_metrics` endpoint' do
       get api('/sidekiq/queue_metrics', admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_a Hash
     end
 
     it 'defines the `process_metrics` endpoint' do
       get api('/sidekiq/process_metrics', admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['processes']).to be_an Array
     end
 
     it 'defines the `job_stats` endpoint' do
       get api('/sidekiq/job_stats', admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_a Hash
     end
 
     it 'defines the `compound_metrics` endpoint' do
       get api('/sidekiq/compound_metrics', admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_a Hash
       expect(json_response['queues']).to be_a Hash
       expect(json_response['processes']).to be_an Array
diff --git a/spec/requests/api/snippets_spec.rb b/spec/requests/api/snippets_spec.rb
index d3905f698bd..74198c8eb4f 100644
--- a/spec/requests/api/snippets_spec.rb
+++ b/spec/requests/api/snippets_spec.rb
@@ -11,7 +11,7 @@ describe API::Snippets do
 
       get api("/snippets/", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.map { |snippet| snippet['id']} ).to contain_exactly(
@@ -27,7 +27,7 @@ describe API::Snippets do
 
       get api("/snippets/", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(0)
@@ -46,7 +46,7 @@ describe API::Snippets do
     it 'returns all snippets with public visibility from all users' do
       get api("/snippets/public", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.map { |snippet| snippet['id']} ).to contain_exactly(
@@ -67,7 +67,7 @@ describe API::Snippets do
     it 'returns raw text' do
       get api("/snippets/#{snippet.id}/raw", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response.content_type).to eq 'text/plain'
       expect(response.body).to eq(snippet.content)
     end
@@ -75,7 +75,7 @@ describe API::Snippets do
     it 'returns 404 for invalid snippet id' do
       get api("/snippets/1234/raw", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
   end
@@ -86,7 +86,7 @@ describe API::Snippets do
     it 'returns snippet json' do
       get api("/snippets/#{snippet.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['title']).to eq(snippet.title)
       expect(json_response['description']).to eq(snippet.description)
@@ -96,7 +96,7 @@ describe API::Snippets do
     it 'returns 404 for invalid snippet id' do
       get api("/snippets/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Not found')
     end
   end
@@ -117,7 +117,7 @@ describe API::Snippets do
         post api("/snippets/", user), params
       end.to change { PersonalSnippet.count }.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq(params[:title])
       expect(json_response['description']).to eq(params[:description])
       expect(json_response['file_name']).to eq(params[:file_name])
@@ -128,7 +128,7 @@ describe API::Snippets do
 
       post api("/snippets/", user), params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context 'when the snippet is spam' do
@@ -152,7 +152,7 @@ describe API::Snippets do
           expect { create_snippet(visibility: 'public') }
             .not_to change { Snippet.count }
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']).to eq({ "error" => "Spam detected" })
         end
 
@@ -177,7 +177,7 @@ describe API::Snippets do
 
       put api("/snippets/#{snippet.id}", user), content: new_content, description: new_description
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       snippet.reload
       expect(snippet.content).to eq(new_content)
       expect(snippet.description).to eq(new_description)
@@ -186,21 +186,21 @@ describe API::Snippets do
     it 'returns 404 for invalid snippet id' do
       put api("/snippets/1234", user), title: 'foo'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
 
     it "returns 404 for another user's snippet" do
       put api("/snippets/#{snippet.id}", other_user), title: 'fubar'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
 
     it 'returns 400 for missing parameters' do
       put api("/snippets/1234", user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context 'when the snippet is spam' do
@@ -228,7 +228,7 @@ describe API::Snippets do
           expect { update_snippet(title: 'Foo') }
             .not_to change { snippet.reload.title }
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']).to eq({ "error" => "Spam detected" })
         end
 
@@ -260,14 +260,14 @@ describe API::Snippets do
       expect do
         delete api("/snippets/#{public_snippet.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { PersonalSnippet.count }.by(-1)
     end
 
     it 'returns 404 for invalid snippet id' do
       delete api("/snippets/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
 
@@ -284,7 +284,7 @@ describe API::Snippets do
     it 'exposes known attributes' do
       get api("/snippets/#{snippet.id}/user_agent_detail", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['user_agent']).to eq(user_agent_detail.user_agent)
       expect(json_response['ip_address']).to eq(user_agent_detail.ip_address)
       expect(json_response['akismet_submitted']).to eq(user_agent_detail.submitted)
@@ -293,7 +293,7 @@ describe API::Snippets do
     it "returns unautorized for non-admin users" do
       get api("/snippets/#{snippet.id}/user_agent_detail", user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 end
diff --git a/spec/requests/api/system_hooks_spec.rb b/spec/requests/api/system_hooks_spec.rb
index 216d278ad21..c7a009e999e 100644
--- a/spec/requests/api/system_hooks_spec.rb
+++ b/spec/requests/api/system_hooks_spec.rb
@@ -14,7 +14,7 @@ describe API::SystemHooks do
       it "returns authentication error" do
         get api("/hooks")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -22,7 +22,7 @@ describe API::SystemHooks do
       it "returns forbidden error" do
         get api("/hooks", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -30,7 +30,7 @@ describe API::SystemHooks do
       it "returns an array of hooks" do
         get api("/hooks", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['url']).to eq(hook.url)
@@ -51,13 +51,13 @@ describe API::SystemHooks do
     it "responds with 400 if url not given" do
       post api("/hooks", admin)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "responds with 400 if url is invalid" do
       post api("/hooks", admin), url: 'hp://mep.mep'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "does not create new hook without url" do
@@ -69,7 +69,7 @@ describe API::SystemHooks do
     it 'sets default values for events' do
       post api('/hooks', admin), url: 'http://mep.mep', enable_ssl_verification: true
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['enable_ssl_verification']).to be true
       expect(json_response['tag_push_events']).to be false
     end
@@ -78,13 +78,13 @@ describe API::SystemHooks do
   describe "GET /hooks/:id" do
     it "returns hook by id" do
       get api("/hooks/#{hook.id}", admin)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['event_name']).to eq('project_create')
     end
 
     it "returns 404 on failure" do
       get api("/hooks/404", admin)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -93,14 +93,14 @@ describe API::SystemHooks do
       expect do
         delete api("/hooks/#{hook.id}", admin)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { SystemHook.count }.by(-1)
     end
 
     it 'returns 404 if the system hook does not exist' do
       delete api('/hooks/12345', admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it_behaves_like '412 response' do
diff --git a/spec/requests/api/templates_spec.rb b/spec/requests/api/templates_spec.rb
index f8af9295842..de1619f33c1 100644
--- a/spec/requests/api/templates_spec.rb
+++ b/spec/requests/api/templates_spec.rb
@@ -23,7 +23,7 @@ describe API::Templates do
     it 'returns a list of available gitignore templates' do
       get api('/templates/gitignores')
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to be > 15
@@ -34,7 +34,7 @@ describe API::Templates do
     it 'returns a list of available gitlab_ci_ymls' do
       get api('/templates/gitlab_ci_ymls')
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.first['name']).not_to be_nil
@@ -45,7 +45,7 @@ describe API::Templates do
     it 'adds a disclaimer on the top' do
       get api('/templates/gitlab_ci_ymls/Ruby')
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['content']).to start_with("# This file is a template,")
     end
   end
@@ -74,7 +74,7 @@ describe API::Templates do
     it 'returns a list of available license templates' do
       get api('/templates/licenses')
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(12)
@@ -86,7 +86,7 @@ describe API::Templates do
         it 'returns a list of available popular license templates' do
           get api('/templates/licenses?popular=1')
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response.size).to eq(3)
@@ -169,7 +169,7 @@ describe API::Templates do
         let(:license_type) { 'muth-over9000' }
 
         it 'returns a 404' do
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
diff --git a/spec/requests/api/todos_spec.rb b/spec/requests/api/todos_spec.rb
index 25d7f6dffcf..c6063a2e089 100644
--- a/spec/requests/api/todos_spec.rb
+++ b/spec/requests/api/todos_spec.rb
@@ -110,7 +110,7 @@ describe API::Todos do
       it 'returns authentication error' do
         post api("/todos/#{pending_1.id}/mark_as_done")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -118,7 +118,7 @@ describe API::Todos do
       it 'marks a todo as done' do
         post api("/todos/#{pending_1.id}/mark_as_done", john_doe)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['id']).to eq(pending_1.id)
         expect(json_response['state']).to eq('done')
         expect(pending_1.reload).to be_done
@@ -137,7 +137,7 @@ describe API::Todos do
       it 'returns authentication error' do
         post api('/todos/mark_as_done')
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -145,7 +145,7 @@ describe API::Todos do
       it 'marks all todos as done' do
         post api('/todos/mark_as_done', john_doe)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
         expect(pending_1.reload).to be_done
         expect(pending_2.reload).to be_done
         expect(pending_3.reload).to be_done
@@ -196,9 +196,9 @@ describe API::Todos do
       post api("/projects/#{project_1.id}/#{issuable_type}/#{issuable.iid}/todo", guest)
 
       if issuable_type == 'merge_requests'
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       else
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/triggers_spec.rb b/spec/requests/api/triggers_spec.rb
index 922b99a6cba..b2c56f7af2c 100644
--- a/spec/requests/api/triggers_spec.rb
+++ b/spec/requests/api/triggers_spec.rb
@@ -28,13 +28,13 @@ describe API::Triggers do
       it 'returns bad request if token is missing' do
         post api("/projects/#{project.id}/trigger/pipeline"), ref: 'master'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns not found if project is not found' do
         post api('/projects/0/trigger/pipeline'), options.merge(ref: 'master')
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -44,7 +44,7 @@ describe API::Triggers do
       it 'creates pipeline' do
         post api("/projects/#{project.id}/trigger/pipeline"), options.merge(ref: 'master')
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response).to include('id' => pipeline.id)
         pipeline.builds.reload
         expect(pipeline.builds.pending.size).to eq(2)
@@ -54,7 +54,7 @@ describe API::Triggers do
       it 'returns bad request with no pipeline created if there\'s no commit for that ref' do
         post api("/projects/#{project.id}/trigger/pipeline"), options.merge(ref: 'other-branch')
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']).to eq('base' => ["Reference not found"])
       end
 
@@ -66,21 +66,21 @@ describe API::Triggers do
         it 'validates variables to be a hash' do
           post api("/projects/#{project.id}/trigger/pipeline"), options.merge(variables: 'value', ref: 'master')
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['error']).to eq('variables is invalid')
         end
 
         it 'validates variables needs to be a map of key-valued strings' do
           post api("/projects/#{project.id}/trigger/pipeline"), options.merge(variables: { key: %w(1 2) }, ref: 'master')
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']).to eq('variables needs to be a map of key-valued strings')
         end
 
         it 'creates trigger request with variables' do
           post api("/projects/#{project.id}/trigger/pipeline"), options.merge(variables: variables, ref: 'master')
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(pipeline.variables.map { |v| { v.key => v.value } }.last).to eq(variables)
         end
       end
@@ -93,7 +93,7 @@ describe API::Triggers do
         it 'creates pipeline' do
           post api("/projects/#{project.id}/trigger/pipeline"), options.merge(ref: 'master')
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to include('id' => pipeline.id)
           pipeline.builds.reload
           expect(pipeline.builds.pending.size).to eq(2)
@@ -106,7 +106,7 @@ describe API::Triggers do
       it 'does not leak the presence of project when token is for different project' do
         post api("/projects/#{project2.id}/ref/master/trigger/pipeline?token=#{trigger_token}"), { ref: 'refs/heads/other-branch' }
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'creates builds from the ref given in the URL, not in the body' do
@@ -114,7 +114,7 @@ describe API::Triggers do
           post api("/projects/#{project.id}/ref/master/trigger/pipeline?token=#{trigger_token}"), { ref: 'refs/heads/other-branch' }
         end.to change(project.builds, :count).by(5)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       context 'when ref contains a dot' do
@@ -125,7 +125,7 @@ describe API::Triggers do
             post api("/projects/#{project.id}/ref/v.1-branch/trigger/pipeline?token=#{trigger_token}"), { ref: 'refs/heads/other-branch' }
           end.to change(project.builds, :count).by(4)
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
         end
       end
     end
@@ -136,7 +136,7 @@ describe API::Triggers do
       it 'returns list of triggers' do
         get api("/projects/#{project.id}/triggers", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_a(Array)
         expect(json_response[0]).to have_key('token')
@@ -147,7 +147,7 @@ describe API::Triggers do
       it 'does not return triggers list' do
         get api("/projects/#{project.id}/triggers", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -155,7 +155,7 @@ describe API::Triggers do
       it 'does not return triggers list' do
         get api("/projects/#{project.id}/triggers")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -165,14 +165,14 @@ describe API::Triggers do
       it 'returns trigger details' do
         get api("/projects/#{project.id}/triggers/#{trigger.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_a(Hash)
       end
 
       it 'responds with 404 Not Found if requesting non-existing trigger' do
         get api("/projects/#{project.id}/triggers/-5", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -180,7 +180,7 @@ describe API::Triggers do
       it 'does not return triggers list' do
         get api("/projects/#{project.id}/triggers/#{trigger.id}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -188,7 +188,7 @@ describe API::Triggers do
       it 'does not return triggers list' do
         get api("/projects/#{project.id}/triggers/#{trigger.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -202,7 +202,7 @@ describe API::Triggers do
               description: 'trigger'
           end.to change {project.triggers.count}.by(1)
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to include('description' => 'trigger')
         end
       end
@@ -211,7 +211,7 @@ describe API::Triggers do
         it 'does not create trigger' do
           post api("/projects/#{project.id}/triggers", user)
 
-          expect(response).to have_http_status(:bad_request)
+          expect(response).to have_gitlab_http_status(:bad_request)
         end
       end
     end
@@ -221,7 +221,7 @@ describe API::Triggers do
         post api("/projects/#{project.id}/triggers", user2),
           description: 'trigger'
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -230,7 +230,7 @@ describe API::Triggers do
         post api("/projects/#{project.id}/triggers"),
           description: 'trigger'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -243,7 +243,7 @@ describe API::Triggers do
         put api("/projects/#{project.id}/triggers/#{trigger.id}", user),
           description: new_description
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to include('description' => new_description)
         expect(trigger.reload.description).to eq(new_description)
       end
@@ -253,7 +253,7 @@ describe API::Triggers do
       it 'does not update trigger' do
         put api("/projects/#{project.id}/triggers/#{trigger.id}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -261,7 +261,7 @@ describe API::Triggers do
       it 'does not update trigger' do
         put api("/projects/#{project.id}/triggers/#{trigger.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -271,7 +271,7 @@ describe API::Triggers do
       it 'updates owner' do
         post api("/projects/#{project.id}/triggers/#{trigger.id}/take_ownership", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to include('owner')
         expect(trigger.reload.owner).to eq(user)
       end
@@ -281,7 +281,7 @@ describe API::Triggers do
       it 'does not update owner' do
         post api("/projects/#{project.id}/triggers/#{trigger.id}/take_ownership", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -289,7 +289,7 @@ describe API::Triggers do
       it 'does not update owner' do
         post api("/projects/#{project.id}/triggers/#{trigger.id}/take_ownership")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -300,14 +300,14 @@ describe API::Triggers do
         expect do
           delete api("/projects/#{project.id}/triggers/#{trigger.id}", user)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change {project.triggers.count}.by(-1)
       end
 
       it 'responds with 404 Not Found if requesting non-existing trigger' do
         delete api("/projects/#{project.id}/triggers/-5", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it_behaves_like '412 response' do
@@ -319,7 +319,7 @@ describe API::Triggers do
       it 'does not delete trigger' do
         delete api("/projects/#{project.id}/triggers/#{trigger.id}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -327,7 +327,7 @@ describe API::Triggers do
       it 'does not delete trigger' do
         delete api("/projects/#{project.id}/triggers/#{trigger.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 69c8aa4482a..4737f034f21 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -113,7 +113,7 @@ describe API::Users do
       it "returns a 403 when non-admin user searches by external UID" do
         get api("/users?extern_uid=#{omniauth_user.identities.first.extern_uid}&provider=#{omniauth_user.identities.first.provider}", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it 'does not reveal the `is_admin` flag of the user' do
@@ -130,7 +130,7 @@ describe API::Users do
           admin_personal_access_token = create(:personal_access_token, user: admin).token
           get api("/users?private_token=#{admin_personal_access_token}&sudo=#{user.id}", admin)
 
-          expect(response).to have_http_status(:success)
+          expect(response).to have_gitlab_http_status(:success)
         end
       end
 
@@ -162,13 +162,13 @@ describe API::Users do
       it "returns 400 error if provider with no extern_uid" do
         get api("/users?extern_uid=#{omniauth_user.identities.first.extern_uid}", admin)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns 400 error if provider with no extern_uid" do
         get api("/users?provider=#{omniauth_user.identities.first.provider}", admin)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns a user created before a specific date" do
@@ -240,21 +240,21 @@ describe API::Users do
 
         get api("/users/#{user.id}")
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
     it "returns a 404 error if user id not found" do
       get api("/users/9999", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it "returns a 404 for invalid ID" do
       get api("/users/1ASDF", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -271,7 +271,7 @@ describe API::Users do
 
     it "creates user with correct attributes" do
       post api('/users', admin), attributes_for(:user, admin: true, can_create_group: true)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       user_id = json_response['id']
       new_user = User.find(user_id)
       expect(new_user).not_to eq(nil)
@@ -285,12 +285,12 @@ describe API::Users do
 
       post api('/users', admin), attributes
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it "creates non-admin user" do
       post api('/users', admin), attributes_for(:user, admin: false, can_create_group: false)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       user_id = json_response['id']
       new_user = User.find(user_id)
       expect(new_user).not_to eq(nil)
@@ -300,7 +300,7 @@ describe API::Users do
 
     it "creates non-admin users by default" do
       post api('/users', admin), attributes_for(:user)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       user_id = json_response['id']
       new_user = User.find(user_id)
       expect(new_user).not_to eq(nil)
@@ -309,12 +309,12 @@ describe API::Users do
 
     it "returns 201 Created on success" do
       post api("/users", admin), attributes_for(:user, projects_limit: 3)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it 'creates non-external users by default' do
       post api("/users", admin), attributes_for(:user)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       user_id = json_response['id']
       new_user = User.find(user_id)
@@ -324,7 +324,7 @@ describe API::Users do
 
     it 'allows an external user to be created' do
       post api("/users", admin), attributes_for(:user, external: true)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       user_id = json_response['id']
       new_user = User.find(user_id)
@@ -335,7 +335,7 @@ describe API::Users do
     it "creates user with reset password" do
       post api('/users', admin), attributes_for(:user, reset_password: true).except(:password)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       user_id = json_response['id']
       new_user = User.find(user_id)
@@ -349,27 +349,27 @@ describe API::Users do
            email: 'invalid email',
            password: 'password',
            name: 'test'
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 400 error if name not given' do
       post api('/users', admin), attributes_for(:user).except(:name)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 400 error if password not given' do
       post api('/users', admin), attributes_for(:user).except(:password)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 400 error if email not given' do
       post api('/users', admin), attributes_for(:user).except(:email)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 400 error if username not given' do
       post api('/users', admin), attributes_for(:user).except(:username)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 400 error if user does not validate' do
@@ -380,7 +380,7 @@ describe API::Users do
            name: 'test',
            bio: 'g' * 256,
            projects_limit: -1
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['password'])
         .to eq(['is too short (minimum is 8 characters)'])
       expect(json_response['message']['bio'])
@@ -393,7 +393,7 @@ describe API::Users do
 
     it "is not available for non admin users" do
       post api("/users", user), attributes_for(:user)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     context 'with existing user' do
@@ -413,7 +413,7 @@ describe API::Users do
                password: 'password',
                username: 'foo'
         end.to change { User.count }.by(0)
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
         expect(json_response['message']).to eq('Email has already been taken')
       end
 
@@ -425,14 +425,14 @@ describe API::Users do
                password: 'password',
                username: 'test'
         end.to change { User.count }.by(0)
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
         expect(json_response['message']).to eq('Username has already been taken')
       end
 
       it 'creates user with new identity' do
         post api("/users", admin), attributes_for(:user, provider: 'github', extern_uid: '67890')
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['identities'].first['extern_uid']).to eq('67890')
         expect(json_response['identities'].first['provider']).to eq('github')
       end
@@ -450,7 +450,7 @@ describe API::Users do
   describe "GET /users/sign_up" do
     it "redirects to sign in page" do
       get "/users/sign_up"
-      expect(response).to have_http_status(302)
+      expect(response).to have_gitlab_http_status(302)
       expect(response).to redirect_to(new_user_session_path)
     end
   end
@@ -465,7 +465,7 @@ describe API::Users do
     it "updates user with new bio" do
       put api("/users/#{user.id}", admin), { bio: 'new test bio' }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['bio']).to eq('new test bio')
       expect(user.reload.bio).to eq('new test bio')
     end
@@ -473,14 +473,14 @@ describe API::Users do
     it "updates user with new password and forces reset on next login" do
       put api("/users/#{user.id}", admin), password: '12345678'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(user.reload.password_expires_at).to be <= Time.now
     end
 
     it "updates user with organization" do
       put api("/users/#{user.id}", admin), { organization: 'GitLab' }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['organization']).to eq('GitLab')
       expect(user.reload.organization).to eq('GitLab')
     end
@@ -491,14 +491,14 @@ describe API::Users do
       user.reload
 
       expect(user.avatar).to be_present
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['avatar_url']).to include(user.avatar_path)
     end
 
     it 'updates user with his own email' do
       put api("/users/#{user.id}", admin), email: user.email
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['email']).to eq(user.email)
       expect(user.reload.email).to eq(user.email)
     end
@@ -506,14 +506,14 @@ describe API::Users do
     it 'updates user with a new email' do
       put api("/users/#{user.id}", admin), email: 'new@email.com'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(user.reload.notification_email).to eq('new@email.com')
     end
 
     it 'updates user with his own username' do
       put api("/users/#{user.id}", admin), username: user.username
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['username']).to eq(user.username)
       expect(user.reload.username).to eq(user.username)
     end
@@ -521,14 +521,14 @@ describe API::Users do
     it "updates user's existing identity" do
       put api("/users/#{omniauth_user.id}", admin), provider: 'ldapmain', extern_uid: '654321'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(omniauth_user.reload.identities.first.extern_uid).to eq('654321')
     end
 
     it 'updates user with new identity' do
       put api("/users/#{user.id}", admin), provider: 'github', extern_uid: 'john'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(user.reload.identities.first.extern_uid).to eq('john')
       expect(user.reload.identities.first.provider).to eq('github')
     end
@@ -536,7 +536,7 @@ describe API::Users do
     it "updates admin status" do
       put api("/users/#{user.id}", admin), { admin: true }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(user.reload.admin).to eq(true)
     end
 
@@ -551,7 +551,7 @@ describe API::Users do
     it "does not update admin status" do
       put api("/users/#{admin_user.id}", admin), { can_create_group: false }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(admin_user.reload.admin).to eq(true)
       expect(admin_user.can_create_group).to eq(false)
     end
@@ -559,7 +559,7 @@ describe API::Users do
     it "does not allow invalid update" do
       put api("/users/#{user.id}", admin), { email: 'invalid email' }
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(user.reload.email).not_to eq('invalid email')
     end
 
@@ -569,21 +569,21 @@ describe API::Users do
           put api("/users/#{user.id}", user), attributes_for(:user)
         end.not_to change { user.reload.attributes }
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
     it "returns 404 for non-existing user" do
       put api("/users/999999", admin), { bio: 'update should fail' }
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it "returns a 404 if invalid ID" do
       put api("/users/ASDF", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 400 error if user does not validate' do
@@ -594,7 +594,7 @@ describe API::Users do
           name: 'test',
           bio: 'g' * 256,
           projects_limit: -1
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['password'])
         .to eq(['is too short (minimum is 8 characters)'])
       expect(json_response['message']['bio'])
@@ -608,13 +608,13 @@ describe API::Users do
     it 'returns 400 if provider is missing for identity update' do
       put api("/users/#{omniauth_user.id}", admin), extern_uid: '654321'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns 400 if external UID is missing for identity update' do
       put api("/users/#{omniauth_user.id}", admin), provider: 'ldap'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context "with existing user" do
@@ -627,7 +627,7 @@ describe API::Users do
       it 'returns 409 conflict error if email address exists' do
         put api("/users/#{@user.id}", admin), email: 'test@example.com'
 
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
         expect(@user.reload.email).to eq(@user.email)
       end
 
@@ -635,7 +635,7 @@ describe API::Users do
         @user_id = User.all.last.id
         put api("/users/#{@user.id}", admin), username: 'test'
 
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
         expect(@user.reload.username).to eq(@user.username)
       end
     end
@@ -649,14 +649,14 @@ describe API::Users do
     it "does not create invalid ssh key" do
       post api("/users/#{user.id}/keys", admin), { title: "invalid key" }
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('key is missing')
     end
 
     it 'does not create key without title' do
       post api("/users/#{user.id}/keys", admin), key: 'some key'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('title is missing')
     end
 
@@ -669,7 +669,7 @@ describe API::Users do
 
     it "returns 400 for invalid ID" do
       post api("/users/999999/keys", admin)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 
@@ -681,14 +681,14 @@ describe API::Users do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get api("/users/#{user.id}/keys")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context 'when authenticated' do
       it 'returns 404 for non-existing user' do
         get api('/users/999999/keys', admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
@@ -698,7 +698,7 @@ describe API::Users do
 
         get api("/users/#{user.id}/keys", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['title']).to eq(key.title)
@@ -714,7 +714,7 @@ describe API::Users do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         delete api("/users/#{user.id}/keys/42")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -726,7 +726,7 @@ describe API::Users do
         expect do
           delete api("/users/#{user.id}/keys/#{key.id}", admin)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change { user.keys.count }.by(-1)
       end
 
@@ -738,13 +738,13 @@ describe API::Users do
         user.keys << key
         user.save
         delete api("/users/999999/keys/#{key.id}", admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'returns 404 error if key not foud' do
         delete api("/users/#{user.id}/keys/42", admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Key Not Found')
       end
     end
@@ -758,7 +758,7 @@ describe API::Users do
     it 'does not create invalid GPG key' do
       post api("/users/#{user.id}/gpg_keys", admin)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('key is missing')
     end
 
@@ -767,14 +767,14 @@ describe API::Users do
       expect do
         post api("/users/#{user.id}/gpg_keys", admin), key_attrs
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end.to change { user.gpg_keys.count }.by(1)
     end
 
     it 'returns 400 for invalid ID' do
       post api('/users/999999/gpg_keys', admin)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 
@@ -787,7 +787,7 @@ describe API::Users do
       it 'returns authentication error' do
         get api("/users/#{user.id}/gpg_keys")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -795,14 +795,14 @@ describe API::Users do
       it 'returns 404 for non-existing user' do
         get api('/users/999999/gpg_keys', admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'returns 404 error if key not foud' do
         delete api("/users/#{user.id}/gpg_keys/42", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 GPG Key Not Found')
       end
 
@@ -812,7 +812,7 @@ describe API::Users do
 
         get api("/users/#{user.id}/gpg_keys", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['key']).to eq(gpg_key.key)
@@ -829,7 +829,7 @@ describe API::Users do
       it 'returns authentication error' do
         delete api("/users/#{user.id}/keys/42")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -841,7 +841,7 @@ describe API::Users do
         expect do
           delete api("/users/#{user.id}/gpg_keys/#{gpg_key.id}", admin)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change { user.gpg_keys.count }.by(-1)
       end
 
@@ -851,14 +851,14 @@ describe API::Users do
 
         delete api("/users/999999/gpg_keys/#{gpg_key.id}", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'returns 404 error if key not foud' do
         delete api("/users/#{user.id}/gpg_keys/42", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 GPG Key Not Found')
       end
     end
@@ -873,7 +873,7 @@ describe API::Users do
       it 'returns authentication error' do
         post api("/users/#{user.id}/gpg_keys/42/revoke")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -885,7 +885,7 @@ describe API::Users do
         expect do
           post api("/users/#{user.id}/gpg_keys/#{gpg_key.id}/revoke", admin)
 
-          expect(response).to have_http_status(:accepted)
+          expect(response).to have_gitlab_http_status(:accepted)
         end.to change { user.gpg_keys.count }.by(-1)
       end
 
@@ -895,14 +895,14 @@ describe API::Users do
 
         post api("/users/999999/gpg_keys/#{gpg_key.id}/revoke", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'returns 404 error if key not foud' do
         post api("/users/#{user.id}/gpg_keys/42/revoke", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 GPG Key Not Found')
       end
     end
@@ -916,7 +916,7 @@ describe API::Users do
     it "does not create invalid email" do
       post api("/users/#{user.id}/emails", admin), {}
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('email is missing')
     end
 
@@ -930,7 +930,7 @@ describe API::Users do
     it "returns a 400 for invalid ID" do
       post api("/users/999999/emails", admin)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 
@@ -942,14 +942,14 @@ describe API::Users do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get api("/users/#{user.id}/emails")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context 'when authenticated' do
       it 'returns 404 for non-existing user' do
         get api('/users/999999/emails', admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
@@ -959,7 +959,7 @@ describe API::Users do
 
         get api("/users/#{user.id}/emails", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['email']).to eq(email.email)
@@ -968,7 +968,7 @@ describe API::Users do
       it "returns a 404 for invalid ID" do
         get api("/users/ASDF/emails", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -981,7 +981,7 @@ describe API::Users do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         delete api("/users/#{user.id}/emails/42")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -993,7 +993,7 @@ describe API::Users do
         expect do
           delete api("/users/#{user.id}/emails/#{email.id}", admin)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change { user.emails.count }.by(-1)
       end
 
@@ -1005,20 +1005,20 @@ describe API::Users do
         user.emails << email
         user.save
         delete api("/users/999999/emails/#{email.id}", admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'returns 404 error if email not foud' do
         delete api("/users/#{user.id}/emails/42", admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Email Not Found')
       end
 
       it "returns a 404 for invalid ID" do
         delete api("/users/ASDF/emails/bar", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -1034,7 +1034,7 @@ describe API::Users do
     it "deletes user" do
       Sidekiq::Testing.inline! { delete api("/users/#{user.id}", admin) }
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
       expect { User.find(user.id) }.to raise_error ActiveRecord::RecordNotFound
       expect { Namespace.find(namespace.id) }.to raise_error ActiveRecord::RecordNotFound
     end
@@ -1045,31 +1045,31 @@ describe API::Users do
 
     it "does not delete for unauthenticated user" do
       Sidekiq::Testing.inline! { delete api("/users/#{user.id}") }
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it "is not available for non admin users" do
       Sidekiq::Testing.inline! { delete api("/users/#{user.id}", user) }
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it "returns 404 for non-existing user" do
       Sidekiq::Testing.inline! { delete api("/users/999999", admin) }
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it "returns a 404 for invalid ID" do
       Sidekiq::Testing.inline! { delete api("/users/ASDF", admin) }
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context "hard delete disabled" do
       it "moves contributions to the ghost user" do
         Sidekiq::Testing.inline! { delete api("/users/#{user.id}", admin) }
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
         expect(issue.reload).to be_persisted
         expect(issue.author.ghost?).to be_truthy
       end
@@ -1079,7 +1079,7 @@ describe API::Users do
       it "removes contributions" do
         Sidekiq::Testing.inline! { delete api("/users/#{user.id}?hard_delete=true", admin) }
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
         expect(Issue.exists?(issue.id)).to be_falsy
       end
     end
@@ -1093,7 +1093,7 @@ describe API::Users do
         it 'returns 403 without private token when sudo is defined' do
           get api("/user?private_token=#{personal_access_token}&sudo=123")
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
@@ -1101,14 +1101,14 @@ describe API::Users do
         it 'returns 403 without private token when sudo defined' do
           get api("/user?private_token=#{user.private_token}&sudo=123")
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
       it 'returns current user without private token when sudo not defined' do
         get api("/user", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to match_response_schema('public_api/v4/user/public')
         expect(json_response['id']).to eq(user.id)
       end
@@ -1128,13 +1128,13 @@ describe API::Users do
         it 'returns 403 without private token when sudo defined' do
           get api("/user?private_token=#{admin_personal_access_token}&sudo=#{user.id}")
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'returns initial current user without private token but with is_admin when sudo not defined' do
           get api("/user?private_token=#{admin_personal_access_token}")
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to match_response_schema('public_api/v4/user/admin')
           expect(json_response['id']).to eq(admin.id)
         end
@@ -1144,7 +1144,7 @@ describe API::Users do
         it 'returns sudoed user with private token when sudo defined' do
           get api("/user?private_token=#{admin.private_token}&sudo=#{user.id}")
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to match_response_schema('public_api/v4/user/login')
           expect(json_response['id']).to eq(user.id)
         end
@@ -1152,7 +1152,7 @@ describe API::Users do
         it 'returns initial current user without private token but with is_admin when sudo not defined' do
           get api("/user?private_token=#{admin.private_token}")
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to match_response_schema('public_api/v4/user/admin')
           expect(json_response['id']).to eq(admin.id)
         end
@@ -1163,7 +1163,7 @@ describe API::Users do
       it "returns 401 error if user is unauthenticated" do
         get api("/user")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -1172,7 +1172,7 @@ describe API::Users do
     context "when unauthenticated" do
       it "returns authentication error" do
         get api("/user/keys")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -1183,7 +1183,7 @@ describe API::Users do
 
         get api("/user/keys", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first["title"]).to eq(key.title)
@@ -1203,14 +1203,14 @@ describe API::Users do
       user.keys << key
       user.save
       get api("/user/keys/#{key.id}", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response["title"]).to eq(key.title)
     end
 
     it "returns 404 Not Found within invalid ID" do
       get api("/user/keys/42", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Key Not Found')
     end
 
@@ -1219,14 +1219,14 @@ describe API::Users do
       user.save
       admin
       get api("/user/keys/#{key.id}", admin)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Key Not Found')
     end
 
     it "returns 404 for invalid ID" do
       get api("/users/keys/ASDF", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context "scopes" do
@@ -1243,31 +1243,31 @@ describe API::Users do
       expect do
         post api("/user/keys", user), key_attrs
       end.to change { user.keys.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it "returns a 401 error if unauthorized" do
       post api("/user/keys"), title: 'some title', key: 'some key'
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it "does not create ssh key without key" do
       post api("/user/keys", user), title: 'title'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('key is missing')
     end
 
     it 'does not create ssh key without title' do
       post api('/user/keys', user), key: 'some key'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('title is missing')
     end
 
     it "does not create ssh key without title" do
       post api("/user/keys", user), key: "somekey"
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 
@@ -1279,7 +1279,7 @@ describe API::Users do
       expect do
         delete api("/user/keys/#{key.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { user.keys.count}.by(-1)
     end
 
@@ -1290,7 +1290,7 @@ describe API::Users do
     it "returns 404 if key ID not found" do
       delete api("/user/keys/42", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Key Not Found')
     end
 
@@ -1298,13 +1298,13 @@ describe API::Users do
       user.keys << key
       user.save
       delete api("/user/keys/#{key.id}")
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it "returns a 404 for invalid ID" do
       delete api("/users/keys/ASDF", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1313,7 +1313,7 @@ describe API::Users do
       it 'returns authentication error' do
         get api('/user/gpg_keys')
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -1324,7 +1324,7 @@ describe API::Users do
 
         get api('/user/gpg_keys', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['key']).to eq(gpg_key.key)
@@ -1346,14 +1346,14 @@ describe API::Users do
 
       get api("/user/gpg_keys/#{gpg_key.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['key']).to eq(gpg_key.key)
     end
 
     it 'returns 404 Not Found within invalid ID' do
       get api('/user/gpg_keys/42', user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 GPG Key Not Found')
     end
 
@@ -1363,14 +1363,14 @@ describe API::Users do
 
       get api("/user/gpg_keys/#{gpg_key.id}", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 GPG Key Not Found')
     end
 
     it 'returns 404 for invalid ID' do
       get api('/users/gpg_keys/ASDF', admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context 'scopes' do
@@ -1387,20 +1387,20 @@ describe API::Users do
       expect do
         post api('/user/gpg_keys', user), key_attrs
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end.to change { user.gpg_keys.count }.by(1)
     end
 
     it 'returns a 401 error if unauthorized' do
       post api('/user/gpg_keys'), key: 'some key'
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'does not create GPG key without key' do
       post api('/user/gpg_keys', user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('key is missing')
     end
   end
@@ -1413,14 +1413,14 @@ describe API::Users do
       expect do
         post api("/user/gpg_keys/#{gpg_key.id}/revoke", user)
 
-        expect(response).to have_http_status(:accepted)
+        expect(response).to have_gitlab_http_status(:accepted)
       end.to change { user.gpg_keys.count}.by(-1)
     end
 
     it 'returns 404 if key ID not found' do
       post api('/user/gpg_keys/42/revoke', user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 GPG Key Not Found')
     end
 
@@ -1430,13 +1430,13 @@ describe API::Users do
 
       post api("/user/gpg_keys/#{gpg_key.id}/revoke")
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 404 for invalid ID' do
       post api('/users/gpg_keys/ASDF/revoke', admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1448,14 +1448,14 @@ describe API::Users do
       expect do
         delete api("/user/gpg_keys/#{gpg_key.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { user.gpg_keys.count}.by(-1)
     end
 
     it 'returns 404 if key ID not found' do
       delete api('/user/gpg_keys/42', user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 GPG Key Not Found')
     end
 
@@ -1465,13 +1465,13 @@ describe API::Users do
 
       delete api("/user/gpg_keys/#{gpg_key.id}")
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 404 for invalid ID' do
       delete api('/users/gpg_keys/ASDF', admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1479,7 +1479,7 @@ describe API::Users do
     context "when unauthenticated" do
       it "returns authentication error" do
         get api("/user/emails")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -1490,7 +1490,7 @@ describe API::Users do
 
         get api("/user/emails", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first["email"]).to eq(email.email)
@@ -1510,13 +1510,13 @@ describe API::Users do
       user.emails << email
       user.save
       get api("/user/emails/#{email.id}", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response["email"]).to eq(email.email)
     end
 
     it "returns 404 Not Found within invalid ID" do
       get api("/user/emails/42", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Email Not Found')
     end
 
@@ -1525,14 +1525,14 @@ describe API::Users do
       user.save
       admin
       get api("/user/emails/#{email.id}", admin)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Email Not Found')
     end
 
     it "returns 404 for invalid ID" do
       get api("/users/emails/ASDF", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context "scopes" do
@@ -1549,18 +1549,18 @@ describe API::Users do
       expect do
         post api("/user/emails", user), email_attrs
       end.to change { user.emails.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it "returns a 401 error if unauthorized" do
       post api("/user/emails"), email: 'some email'
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it "does not create email with invalid email" do
       post api("/user/emails", user), {}
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('email is missing')
     end
   end
@@ -1573,7 +1573,7 @@ describe API::Users do
       expect do
         delete api("/user/emails/#{email.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { user.emails.count}.by(-1)
     end
 
@@ -1584,7 +1584,7 @@ describe API::Users do
     it "returns 404 if email ID not found" do
       delete api("/user/emails/42", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Email Not Found')
     end
 
@@ -1592,13 +1592,13 @@ describe API::Users do
       user.emails << email
       user.save
       delete api("/user/emails/#{email.id}")
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it "returns 400 for invalid ID" do
       delete api("/user/emails/ASDF", admin)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 
@@ -1609,25 +1609,25 @@ describe API::Users do
 
     it 'blocks existing user' do
       post api("/users/#{user.id}/block", admin)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(user.reload.state).to eq('blocked')
     end
 
     it 'does not re-block ldap blocked users' do
       post api("/users/#{ldap_blocked_user.id}/block", admin)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(ldap_blocked_user.reload.state).to eq('ldap_blocked')
     end
 
     it 'does not be available for non admin users' do
       post api("/users/#{user.id}/block", user)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(user.reload.state).to eq('active')
     end
 
     it 'returns a 404 error if user id not found' do
       post api('/users/9999/block', admin)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
   end
@@ -1641,38 +1641,38 @@ describe API::Users do
 
     it 'unblocks existing user' do
       post api("/users/#{user.id}/unblock", admin)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(user.reload.state).to eq('active')
     end
 
     it 'unblocks a blocked user' do
       post api("/users/#{blocked_user.id}/unblock", admin)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(blocked_user.reload.state).to eq('active')
     end
 
     it 'does not unblock ldap blocked users' do
       post api("/users/#{ldap_blocked_user.id}/unblock", admin)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(ldap_blocked_user.reload.state).to eq('ldap_blocked')
     end
 
     it 'does not be available for non admin users' do
       post api("/users/#{user.id}/unblock", user)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(user.reload.state).to eq('active')
     end
 
     it 'returns a 404 error if user id not found' do
       post api('/users/9999/block', admin)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it "returns a 404 for invalid ID" do
       post api("/users/ASDF/block", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1684,7 +1684,7 @@ describe API::Users do
       it 'has no permission' do
         get api("/user/activities", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -1729,21 +1729,21 @@ describe API::Users do
     it 'returns a 404 error if user not found' do
       get api("/users/#{not_existing_user_id}/impersonation_tokens", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it 'returns a 403 error when authenticated as normal user' do
       get api("/users/#{not_existing_user_id}/impersonation_tokens", user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(json_response['message']).to eq('403 Forbidden')
     end
 
     it 'returns an array of all impersonated tokens' do
       get api("/users/#{user.id}/impersonation_tokens", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(2)
@@ -1752,7 +1752,7 @@ describe API::Users do
     it 'returns an array of active impersonation tokens if state active' do
       get api("/users/#{user.id}/impersonation_tokens?state=active", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(1)
@@ -1762,7 +1762,7 @@ describe API::Users do
     it 'returns an array of inactive personal access tokens if active is set to false' do
       get api("/users/#{user.id}/impersonation_tokens?state=inactive", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(1)
       expect(json_response).to all(include('active' => false))
@@ -1778,7 +1778,7 @@ describe API::Users do
     it 'returns validation error if impersonation token misses some attributes' do
       post api("/users/#{user.id}/impersonation_tokens", admin)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('name is missing')
     end
 
@@ -1787,7 +1787,7 @@ describe API::Users do
         name: name,
         expires_at: expires_at
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
@@ -1796,7 +1796,7 @@ describe API::Users do
         name: name,
         expires_at: expires_at
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(json_response['message']).to eq('403 Forbidden')
     end
 
@@ -1807,7 +1807,7 @@ describe API::Users do
         scopes: scopes,
         impersonation: impersonation
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['name']).to eq(name)
       expect(json_response['scopes']).to eq(scopes)
       expect(json_response['expires_at']).to eq(expires_at)
@@ -1827,35 +1827,35 @@ describe API::Users do
     it 'returns 404 error if user not found' do
       get api("/users/#{not_existing_user_id}/impersonation_tokens/1", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it 'returns a 404 error if impersonation token not found' do
       get api("/users/#{user.id}/impersonation_tokens/#{not_existing_pat_id}", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Impersonation Token Not Found')
     end
 
     it 'returns a 404 error if token is not impersonation token' do
       get api("/users/#{user.id}/impersonation_tokens/#{personal_access_token.id}", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Impersonation Token Not Found')
     end
 
     it 'returns a 403 error when authenticated as normal user' do
       get api("/users/#{user.id}/impersonation_tokens/#{impersonation_token.id}", user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(json_response['message']).to eq('403 Forbidden')
     end
 
     it 'returns a personal access token' do
       get api("/users/#{user.id}/impersonation_tokens/#{impersonation_token.id}", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['token']).to be_present
       expect(json_response['impersonation']).to be_truthy
     end
@@ -1868,28 +1868,28 @@ describe API::Users do
     it 'returns a 404 error if user not found' do
       delete api("/users/#{not_existing_user_id}/impersonation_tokens/1", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it 'returns a 404 error if impersonation token not found' do
       delete api("/users/#{user.id}/impersonation_tokens/#{not_existing_pat_id}", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Impersonation Token Not Found')
     end
 
     it 'returns a 404 error if token is not impersonation token' do
       delete api("/users/#{user.id}/impersonation_tokens/#{personal_access_token.id}", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Impersonation Token Not Found')
     end
 
     it 'returns a 403 error when authenticated as normal user' do
       delete api("/users/#{user.id}/impersonation_tokens/#{impersonation_token.id}", user)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(json_response['message']).to eq('403 Forbidden')
     end
 
@@ -1900,7 +1900,7 @@ describe API::Users do
     it 'revokes a impersonation token' do
       delete api("/users/#{user.id}/impersonation_tokens/#{impersonation_token.id}", admin)
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
       expect(impersonation_token.revoked).to be_falsey
       expect(impersonation_token.reload.revoked).to be_truthy
     end
diff --git a/spec/requests/api/v3/award_emoji_spec.rb b/spec/requests/api/v3/award_emoji_spec.rb
index 36d793f505d..0cd8b70007f 100644
--- a/spec/requests/api/v3/award_emoji_spec.rb
+++ b/spec/requests/api/v3/award_emoji_spec.rb
@@ -16,7 +16,7 @@ describe API::V3::AwardEmoji do
       it "returns an array of award_emoji" do
         get v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(award_emoji.name)
       end
@@ -24,7 +24,7 @@ describe API::V3::AwardEmoji do
       it "returns a 404 error when issue id not found" do
         get v3_api("/projects/#{project.id}/issues/12345/award_emoji", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -32,7 +32,7 @@ describe API::V3::AwardEmoji do
       it "returns an array of award_emoji" do
         get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/award_emoji", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(downvote.name)
@@ -46,7 +46,7 @@ describe API::V3::AwardEmoji do
       it 'returns the awarded emoji' do
         get v3_api("/projects/#{project.id}/snippets/#{snippet.id}/award_emoji", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(award.name)
       end
@@ -58,7 +58,7 @@ describe API::V3::AwardEmoji do
 
         get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/award_emoji", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -69,7 +69,7 @@ describe API::V3::AwardEmoji do
     it 'returns an array of award emoji' do
       get v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.first['name']).to eq(rocket.name)
     end
@@ -80,7 +80,7 @@ describe API::V3::AwardEmoji do
       it "returns the award emoji" do
         get v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji/#{award_emoji.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(award_emoji.name)
         expect(json_response['awardable_id']).to eq(issue.id)
         expect(json_response['awardable_type']).to eq("Issue")
@@ -89,7 +89,7 @@ describe API::V3::AwardEmoji do
       it "returns a 404 error if the award is not found" do
         get v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -97,7 +97,7 @@ describe API::V3::AwardEmoji do
       it 'returns the award emoji' do
         get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/award_emoji/#{downvote.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(downvote.name)
         expect(json_response['awardable_id']).to eq(merge_request.id)
         expect(json_response['awardable_type']).to eq("MergeRequest")
@@ -111,7 +111,7 @@ describe API::V3::AwardEmoji do
       it 'returns the awarded emoji' do
         get v3_api("/projects/#{project.id}/snippets/#{snippet.id}/award_emoji/#{award.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(award.name)
         expect(json_response['awardable_id']).to eq(snippet.id)
         expect(json_response['awardable_type']).to eq("Snippet")
@@ -124,7 +124,7 @@ describe API::V3::AwardEmoji do
 
         get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/award_emoji/#{downvote.id}", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -135,7 +135,7 @@ describe API::V3::AwardEmoji do
     it 'returns an award emoji' do
       get v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji/#{rocket.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).not_to be_an Array
       expect(json_response['name']).to eq(rocket.name)
     end
@@ -148,7 +148,7 @@ describe API::V3::AwardEmoji do
       it "creates a new award emoji" do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji", user), name: 'blowfish'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['name']).to eq('blowfish')
         expect(json_response['user']['username']).to eq(user.username)
       end
@@ -156,19 +156,19 @@ describe API::V3::AwardEmoji do
       it "returns a 400 bad request error if the name is not given" do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns a 401 unauthorized error if the user is not authenticated" do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji"), name: 'thumbsup'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       it "returns a 404 error if the user authored issue" do
         post v3_api("/projects/#{project.id}/issues/#{issue2.id}/award_emoji", user), name: 'thumbsup'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "normalizes +1 as thumbsup award" do
@@ -182,7 +182,7 @@ describe API::V3::AwardEmoji do
           post v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji", user), name: 'thumbsup'
           post v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji", user), name: 'thumbsup'
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
           expect(json_response["message"]).to match("has already been taken")
         end
       end
@@ -194,7 +194,7 @@ describe API::V3::AwardEmoji do
 
         post v3_api("/projects/#{project.id}/snippets/#{snippet.id}/award_emoji", user), name: 'blowfish'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['name']).to eq('blowfish')
         expect(json_response['user']['username']).to eq(user.username)
       end
@@ -209,14 +209,14 @@ describe API::V3::AwardEmoji do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji", user), name: 'rocket'
       end.to change { note.award_emoji.count }.from(0).to(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['user']['username']).to eq(user.username)
     end
 
     it "it returns 404 error when user authored note" do
       post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note2.id}/award_emoji", user), name: 'thumbsup'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "normalizes +1 as thumbsup award" do
@@ -230,7 +230,7 @@ describe API::V3::AwardEmoji do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji", user), name: 'rocket'
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji", user), name: 'rocket'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response["message"]).to match("has already been taken")
       end
     end
@@ -242,14 +242,14 @@ describe API::V3::AwardEmoji do
         expect do
           delete v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji/#{award_emoji.id}", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end.to change { issue.award_emoji.count }.from(1).to(0)
       end
 
       it 'returns a 404 error when the award emoji can not be found' do
         delete v3_api("/projects/#{project.id}/issues/#{issue.id}/award_emoji/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -258,14 +258,14 @@ describe API::V3::AwardEmoji do
         expect do
           delete v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/award_emoji/#{downvote.id}", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end.to change { merge_request.award_emoji.count }.from(1).to(0)
       end
 
       it 'returns a 404 error when note id not found' do
         delete v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -277,7 +277,7 @@ describe API::V3::AwardEmoji do
         expect do
           delete v3_api("/projects/#{project.id}/snippets/#{snippet.id}/award_emoji/#{award.id}", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end.to change { snippet.award_emoji.count }.from(1).to(0)
       end
     end
@@ -290,7 +290,7 @@ describe API::V3::AwardEmoji do
       expect do
         delete v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{note.id}/award_emoji/#{rocket.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end.to change { note.award_emoji.count }.from(1).to(0)
     end
   end
diff --git a/spec/requests/api/v3/boards_spec.rb b/spec/requests/api/v3/boards_spec.rb
index ea2627142bf..14409d25544 100644
--- a/spec/requests/api/v3/boards_spec.rb
+++ b/spec/requests/api/v3/boards_spec.rb
@@ -38,7 +38,7 @@ describe API::V3::Boards do
       it "returns authentication error" do
         get v3_api(base_url)
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -46,7 +46,7 @@ describe API::V3::Boards do
       it "returns the project issue board" do
         get v3_api(base_url, user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['id']).to eq(board.id)
@@ -63,7 +63,7 @@ describe API::V3::Boards do
     it 'returns issue board lists' do
       get v3_api(base_url, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
       expect(json_response.first['label']['name']).to eq(dev_label.title)
@@ -72,7 +72,7 @@ describe API::V3::Boards do
     it 'returns 404 if board not found' do
       get v3_api("/projects/#{project.id}/boards/22343/lists", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -82,19 +82,19 @@ describe API::V3::Boards do
     it "rejects a non member from deleting a list" do
       delete v3_api("#{base_url}/#{dev_list.id}", non_member)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it "rejects a user with guest role from deleting a list" do
       delete v3_api("#{base_url}/#{dev_list.id}", guest)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it "returns 404 error if list id not found" do
       delete v3_api("#{base_url}/44444", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context "when the user is project owner" do
@@ -107,7 +107,7 @@ describe API::V3::Boards do
       it "deletes the list if an admin requests it" do
         delete v3_api("#{base_url}/#{dev_list.id}", owner)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
   end
diff --git a/spec/requests/api/v3/branches_spec.rb b/spec/requests/api/v3/branches_spec.rb
index 9cd11a67712..1e038595a1f 100644
--- a/spec/requests/api/v3/branches_spec.rb
+++ b/spec/requests/api/v3/branches_spec.rb
@@ -17,7 +17,7 @@ describe API::V3::Branches do
 
       get v3_api("/projects/#{project.id}/repository/branches", user), per_page: 100
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       branch_names = json_response.map { |x| x['name'] }
       expect(branch_names).to match_array(project.repository.branch_names)
@@ -32,20 +32,20 @@ describe API::V3::Branches do
     it "removes branch" do
       delete v3_api("/projects/#{project.id}/repository/branches/#{branch_name}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['branch_name']).to eq(branch_name)
     end
 
     it "removes a branch with dots in the branch name" do
       delete v3_api("/projects/#{project.id}/repository/branches/with.1.2.3", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['branch_name']).to eq("with.1.2.3")
     end
 
     it 'returns 404 if branch not exists' do
       delete v3_api("/projects/#{project.id}/repository/branches/foobar", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -57,13 +57,13 @@ describe API::V3::Branches do
     it 'returns 200' do
       delete v3_api("/projects/#{project.id}/repository/merged_branches", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'returns a 403 error if guest' do
       delete v3_api("/projects/#{project.id}/repository/merged_branches", user2)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 
@@ -73,7 +73,7 @@ describe API::V3::Branches do
            branch_name: 'feature1',
            ref: branch_sha
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       expect(json_response['name']).to eq('feature1')
       expect(json_response['commit']['id']).to eq(branch_sha)
@@ -83,14 +83,14 @@ describe API::V3::Branches do
       post v3_api("/projects/#{project.id}/repository/branches", user2),
            branch_name: branch_name,
            ref: branch_sha
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it 'returns 400 if branch name is invalid' do
       post v3_api("/projects/#{project.id}/repository/branches", user),
            branch_name: 'new design',
            ref: branch_sha
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']).to eq('Branch name is invalid')
     end
 
@@ -98,13 +98,13 @@ describe API::V3::Branches do
       post v3_api("/projects/#{project.id}/repository/branches", user),
            branch_name: 'new_design1',
            ref: branch_sha
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       post v3_api("/projects/#{project.id}/repository/branches", user),
            branch_name: 'new_design1',
            ref: branch_sha
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']).to eq('Branch already exists')
     end
 
@@ -113,7 +113,7 @@ describe API::V3::Branches do
            branch_name: 'new_design3',
            ref: 'foo'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']).to eq('Invalid reference name')
     end
   end
diff --git a/spec/requests/api/v3/broadcast_messages_spec.rb b/spec/requests/api/v3/broadcast_messages_spec.rb
index d04b1c72004..d9641011491 100644
--- a/spec/requests/api/v3/broadcast_messages_spec.rb
+++ b/spec/requests/api/v3/broadcast_messages_spec.rb
@@ -11,21 +11,21 @@ describe API::V3::BroadcastMessages do
       delete v3_api("/broadcast_messages/#{message.id}"),
         attributes_for(:broadcast_message)
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 403 for users' do
       delete v3_api("/broadcast_messages/#{message.id}", user),
         attributes_for(:broadcast_message)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it 'deletes the broadcast message for admins' do
       expect do
         delete v3_api("/broadcast_messages/#{message.id}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end.to change { BroadcastMessage.count }.by(-1)
     end
   end
diff --git a/spec/requests/api/v3/builds_spec.rb b/spec/requests/api/v3/builds_spec.rb
index 0a2ff1058e3..3f58b7ef384 100644
--- a/spec/requests/api/v3/builds_spec.rb
+++ b/spec/requests/api/v3/builds_spec.rb
@@ -21,7 +21,7 @@ describe API::V3::Builds do
 
     context 'authorized user' do
       it 'returns project builds' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
       end
@@ -44,7 +44,7 @@ describe API::V3::Builds do
         let(:query) { 'scope=pending' }
 
         it do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
         end
       end
@@ -54,7 +54,7 @@ describe API::V3::Builds do
         let(:json_build) { json_response.first }
 
         it 'return builds with status skipped' do
-          expect(response).to have_http_status 200
+          expect(response).to have_gitlab_http_status 200
           expect(json_response).to be_an Array
           expect(json_response.length).to eq 1
           expect(json_build['status']).to eq 'skipped'
@@ -65,7 +65,7 @@ describe API::V3::Builds do
         let(:query) { 'scope[0]=pending&scope[1]=running' }
 
         it do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
         end
       end
@@ -73,7 +73,7 @@ describe API::V3::Builds do
       context 'respond 400 when scope contains invalid state' do
         let(:query) { 'scope[0]=pending&scope[1]=unknown_status' }
 
-        it { expect(response).to have_http_status(400) }
+        it { expect(response).to have_gitlab_http_status(400) }
       end
     end
 
@@ -81,7 +81,7 @@ describe API::V3::Builds do
       let(:api_user) { nil }
 
       it 'does not return project builds' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -93,7 +93,7 @@ describe API::V3::Builds do
       end
 
       it 'responds with 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -109,7 +109,7 @@ describe API::V3::Builds do
           end
 
           it 'returns project jobs for specific commit' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response.size).to eq 2
@@ -132,7 +132,7 @@ describe API::V3::Builds do
           end
 
           it 'returns an empty array' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response).to be_an Array
             expect(json_response).to be_empty
           end
@@ -148,7 +148,7 @@ describe API::V3::Builds do
         end
 
         it 'does not return project jobs' do
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
           expect(json_response.except('message')).to be_empty
         end
       end
@@ -162,7 +162,7 @@ describe API::V3::Builds do
 
     context 'authorized user' do
       it 'returns specific job data' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq('test')
       end
 
@@ -180,7 +180,7 @@ describe API::V3::Builds do
       let(:api_user) { nil }
 
       it 'does not return specific job data' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -200,7 +200,7 @@ describe API::V3::Builds do
         end
 
         it 'returns specific job artifacts' do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response.headers).to include(download_headers)
           expect(response.body).to match_file(build.artifacts_file.file.file)
         end
@@ -210,13 +210,13 @@ describe API::V3::Builds do
         let(:api_user) { nil }
 
         it 'does not return specific job artifacts' do
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
         end
       end
     end
 
     it 'does not return job artifacts if not uploaded' do
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -240,7 +240,7 @@ describe API::V3::Builds do
       end
 
       it 'gives 401' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -252,13 +252,13 @@ describe API::V3::Builds do
       end
 
       it 'gives 403' do
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
     context 'non-existing job' do
       shared_examples 'not found' do
-        it { expect(response).to have_http_status(:not_found) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
 
       context 'has no such ref' do
@@ -286,7 +286,7 @@ describe API::V3::Builds do
               "attachment; filename=#{build.artifacts_file.filename}" }
         end
 
-        it { expect(response).to have_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(200) }
         it { expect(response.headers).to include(download_headers) }
       end
 
@@ -327,7 +327,7 @@ describe API::V3::Builds do
 
     context 'authorized user' do
       it 'returns specific job trace' do
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response.body).to eq(build.trace.raw)
       end
     end
@@ -336,7 +336,7 @@ describe API::V3::Builds do
       let(:api_user) { nil }
 
       it 'does not return specific job trace' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -349,7 +349,7 @@ describe API::V3::Builds do
     context 'authorized user' do
       context 'user with :update_build persmission' do
         it 'cancels running or pending job' do
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(project.builds.first.status).to eq('canceled')
         end
       end
@@ -358,7 +358,7 @@ describe API::V3::Builds do
         let(:api_user) { reporter.user }
 
         it 'does not cancel job' do
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
     end
@@ -367,7 +367,7 @@ describe API::V3::Builds do
       let(:api_user) { nil }
 
       it 'does not cancel job' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -382,7 +382,7 @@ describe API::V3::Builds do
     context 'authorized user' do
       context 'user with :update_build permission' do
         it 'retries non-running job' do
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(project.builds.first.status).to eq('canceled')
           expect(json_response['status']).to eq('pending')
         end
@@ -392,7 +392,7 @@ describe API::V3::Builds do
         let(:api_user) { reporter.user }
 
         it 'does not retry job' do
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
     end
@@ -401,7 +401,7 @@ describe API::V3::Builds do
       let(:api_user) { nil }
 
       it 'does not retry job' do
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -471,7 +471,7 @@ describe API::V3::Builds do
       let(:build) { create(:ci_build, :manual, project: project, pipeline: pipeline) }
 
       it 'plays the job' do
-        expect(response).to have_http_status 200
+        expect(response).to have_gitlab_http_status 200
         expect(json_response['user']['id']).to eq(user.id)
         expect(json_response['id']).to eq(build.id)
       end
@@ -479,7 +479,7 @@ describe API::V3::Builds do
 
     context 'on a non-playable job' do
       it 'returns a status code 400, Bad Request' do
-        expect(response).to have_http_status 400
+        expect(response).to have_gitlab_http_status 400
         expect(response.body).to match("Unplayable Job")
       end
     end
diff --git a/spec/requests/api/v3/commits_spec.rb b/spec/requests/api/v3/commits_spec.rb
index 6d0ca33a6fa..d31c94ddd2c 100644
--- a/spec/requests/api/v3/commits_spec.rb
+++ b/spec/requests/api/v3/commits_spec.rb
@@ -19,7 +19,7 @@ describe API::V3::Commits do
         commit = project.repository.commit
         get v3_api("/projects/#{project.id}/repository/commits", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['id']).to eq(commit.id)
         expect(json_response.first['committer_name']).to eq(commit.committer_name)
@@ -30,7 +30,7 @@ describe API::V3::Commits do
     context "unauthorized user" do
       it "does not return project commits" do
         get v3_api("/projects/#{project.id}/repository/commits")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -69,7 +69,7 @@ describe API::V3::Commits do
       it "returns an invalid parameter error message" do
         get v3_api("/projects/#{project.id}/repository/commits?since=invalid-date", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('since is invalid')
       end
     end
@@ -92,13 +92,13 @@ describe API::V3::Commits do
     it 'returns a 403 unauthorized for user without permissions' do
       post v3_api(url, user2)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it 'returns a 400 bad request if no params are given' do
       post v3_api(url, user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     describe 'create' do
@@ -133,7 +133,7 @@ describe API::V3::Commits do
       it 'a new file in project repo' do
         post v3_api(url, user), valid_c_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
         expect(json_response['committer_name']).to eq(user.name)
         expect(json_response['committer_email']).to eq(user.email)
@@ -142,7 +142,7 @@ describe API::V3::Commits do
       it 'returns a 400 bad request if file exists' do
         post v3_api(url, user), invalid_c_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       context 'with project path containing a dot in URL' do
@@ -152,7 +152,7 @@ describe API::V3::Commits do
         it 'a new file in project repo' do
           post v3_api(url, user), valid_c_params
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
         end
       end
     end
@@ -187,14 +187,14 @@ describe API::V3::Commits do
       it 'an existing file in project repo' do
         post v3_api(url, user), valid_d_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
       end
 
       it 'returns a 400 bad request if file does not exist' do
         post v3_api(url, user), invalid_d_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -232,14 +232,14 @@ describe API::V3::Commits do
       it 'an existing file in project repo' do
         post v3_api(url, user), valid_m_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
       end
 
       it 'returns a 400 bad request if file does not exist' do
         post v3_api(url, user), invalid_m_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -275,14 +275,14 @@ describe API::V3::Commits do
       it 'an existing file in project repo' do
         post v3_api(url, user), valid_u_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
       end
 
       it 'returns a 400 bad request if file does not exist' do
         post v3_api(url, user), invalid_u_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -348,14 +348,14 @@ describe API::V3::Commits do
       it 'are commited as one in project repo' do
         post v3_api(url, user), valid_mo_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(message)
       end
 
       it 'return a 400 bad request if there are any issues' do
         post v3_api(url, user), invalid_mo_params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
   end
@@ -365,7 +365,7 @@ describe API::V3::Commits do
       it "returns a commit by sha" do
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['id']).to eq(project.repository.commit.id)
         expect(json_response['title']).to eq(project.repository.commit.title)
         expect(json_response['stats']['additions']).to eq(project.repository.commit.stats.additions)
@@ -375,13 +375,13 @@ describe API::V3::Commits do
 
       it "returns a 404 error if not found" do
         get v3_api("/projects/#{project.id}/repository/commits/invalid_sha", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns nil for commit without CI" do
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to be_nil
       end
 
@@ -391,7 +391,7 @@ describe API::V3::Commits do
 
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to eq(pipeline.status)
       end
 
@@ -400,7 +400,7 @@ describe API::V3::Commits do
 
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to eq("created")
       end
     end
@@ -408,7 +408,7 @@ describe API::V3::Commits do
     context "unauthorized user" do
       it "does not return the selected commit" do
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -419,7 +419,7 @@ describe API::V3::Commits do
 
       it "returns the diff of the selected commit" do
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         expect(json_response).to be_an Array
         expect(json_response.length).to be >= 1
@@ -428,14 +428,14 @@ describe API::V3::Commits do
 
       it "returns a 404 error if invalid commit" do
         get v3_api("/projects/#{project.id}/repository/commits/invalid_sha/diff", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
     context "unauthorized user" do
       it "does not return the diff of the selected commit" do
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -444,7 +444,7 @@ describe API::V3::Commits do
     context 'authorized user' do
       it 'returns merge_request comments' do
         get v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(2)
         expect(json_response.first['note']).to eq('a comment on a commit')
@@ -453,14 +453,14 @@ describe API::V3::Commits do
 
       it 'returns a 404 error if merge_request_id not found' do
         get v3_api("/projects/#{project.id}/repository/commits/1234ab/comments", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
     context 'unauthorized user' do
       it 'does not return the diff of the selected commit' do
         get v3_api("/projects/#{project.id}/repository/commits/1234ab/comments")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -472,7 +472,7 @@ describe API::V3::Commits do
       it 'cherry picks a commit' do
         post v3_api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'master'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq(master_pickable_commit.title)
         expect(json_response['message']).to eq(master_pickable_commit.cherry_pick_message(user))
         expect(json_response['author_name']).to eq(master_pickable_commit.author_name)
@@ -482,7 +482,7 @@ describe API::V3::Commits do
       it 'returns 400 if commit is already included in the target branch' do
         post v3_api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'markdown'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']).to include('Sorry, we cannot cherry-pick this commit automatically.')
       end
 
@@ -492,35 +492,35 @@ describe API::V3::Commits do
 
         post v3_api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user2), branch: protected_branch.name
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']).to eq('You are not allowed to push into this branch')
       end
 
       it 'returns 400 for missing parameters' do
         post v3_api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('branch is missing')
       end
 
       it 'returns 404 if commit is not found' do
         post v3_api("/projects/#{project.id}/repository/commits/abcd0123/cherry_pick", user), branch: 'master'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Commit Not Found')
       end
 
       it 'returns 404 if branch is not found' do
         post v3_api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'foo'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Branch Not Found')
       end
 
       it 'returns 400 for missing parameters' do
         post v3_api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('branch is missing')
       end
     end
@@ -529,7 +529,7 @@ describe API::V3::Commits do
       it 'does not cherry pick the commit' do
         post v3_api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick"), branch: 'master'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -538,7 +538,7 @@ describe API::V3::Commits do
     context 'authorized user' do
       it 'returns comment' do
         post v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user), note: 'My comment'
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['note']).to eq('My comment')
         expect(json_response['path']).to be_nil
         expect(json_response['line']).to be_nil
@@ -548,7 +548,7 @@ describe API::V3::Commits do
       it 'returns the inline comment' do
         post v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user), note: 'My comment', path: project.repository.commit.raw_diffs.first.new_path, line: 1, line_type: 'new'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['note']).to eq('My comment')
         expect(json_response['path']).to eq(project.repository.commit.raw_diffs.first.new_path)
         expect(json_response['line']).to eq(1)
@@ -557,19 +557,19 @@ describe API::V3::Commits do
 
       it 'returns 400 if note is missing' do
         post v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns 404 if note is attached to non existent commit' do
         post v3_api("/projects/#{project.id}/repository/commits/1234ab/comments", user), note: 'My comment'
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
     context 'unauthorized user' do
       it 'does not return the diff of the selected commit' do
         post v3_api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/v3/deploy_keys_spec.rb b/spec/requests/api/v3/deploy_keys_spec.rb
index 2affd0cfa51..785bc1eb4ba 100644
--- a/spec/requests/api/v3/deploy_keys_spec.rb
+++ b/spec/requests/api/v3/deploy_keys_spec.rb
@@ -46,7 +46,7 @@ describe API::V3::DeployKeys do
       it 'should return array of ssh keys' do
         get v3_api("/projects/#{project.id}/#{path}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['title']).to eq(deploy_key.title)
       end
@@ -56,14 +56,14 @@ describe API::V3::DeployKeys do
       it 'should return a single key' do
         get v3_api("/projects/#{project.id}/#{path}/#{deploy_key.id}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(deploy_key.title)
       end
 
       it 'should return 404 Not Found with invalid ID' do
         get v3_api("/projects/#{project.id}/#{path}/404", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -71,14 +71,14 @@ describe API::V3::DeployKeys do
       it 'should not create an invalid ssh key' do
         post v3_api("/projects/#{project.id}/#{path}", admin), { title: 'invalid key' }
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('key is missing')
       end
 
       it 'should not create a key without title' do
         post v3_api("/projects/#{project.id}/#{path}", admin), key: 'some key'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('title is missing')
       end
 
@@ -95,7 +95,7 @@ describe API::V3::DeployKeys do
           post v3_api("/projects/#{project.id}/#{path}", admin), { key: deploy_key.key, title: deploy_key.title }
         end.not_to change { project.deploy_keys.count }
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       it 'joins an existing ssh key to a new project' do
@@ -103,7 +103,7 @@ describe API::V3::DeployKeys do
           post v3_api("/projects/#{project2.id}/#{path}", admin), { key: deploy_key.key, title: deploy_key.title }
         end.to change { project2.deploy_keys.count }.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       it 'accepts can_push parameter' do
@@ -111,7 +111,7 @@ describe API::V3::DeployKeys do
 
         post v3_api("/projects/#{project.id}/#{path}", admin), key_attrs
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['can_push']).to eq(true)
       end
     end
@@ -128,7 +128,7 @@ describe API::V3::DeployKeys do
       it 'should return 404 Not Found with invalid ID' do
         delete v3_api("/projects/#{project.id}/#{path}/404", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -141,7 +141,7 @@ describe API::V3::DeployKeys do
             post v3_api("/projects/#{project2.id}/#{path}/#{deploy_key.id}/enable", admin)
           end.to change { project2.deploy_keys.count }.from(0).to(1)
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['id']).to eq(deploy_key.id)
         end
       end
@@ -150,7 +150,7 @@ describe API::V3::DeployKeys do
         it 'should return a 404 error' do
           post v3_api("/projects/#{project2.id}/#{path}/#{deploy_key.id}/enable", user)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -162,7 +162,7 @@ describe API::V3::DeployKeys do
             delete v3_api("/projects/#{project.id}/#{path}/#{deploy_key.id}/disable", admin)
           end.to change { project.deploy_keys.count }.from(1).to(0)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['id']).to eq(deploy_key.id)
         end
       end
@@ -171,7 +171,7 @@ describe API::V3::DeployKeys do
         it 'should return a 404 error' do
           delete v3_api("/projects/#{project.id}/#{path}/#{deploy_key.id}/disable", user)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
diff --git a/spec/requests/api/v3/deployments_spec.rb b/spec/requests/api/v3/deployments_spec.rb
index 0389a264781..90eabda4dac 100644
--- a/spec/requests/api/v3/deployments_spec.rb
+++ b/spec/requests/api/v3/deployments_spec.rb
@@ -30,7 +30,7 @@ describe API::V3::Deployments do
       it 'returns projects deployments' do
         get v3_api("/projects/#{project.id}/deployments", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
         expect(json_response.first['iid']).to eq(deployment.iid)
@@ -42,7 +42,7 @@ describe API::V3::Deployments do
       it 'returns a 404 status code' do
         get v3_api("/projects/#{project.id}/deployments", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -52,7 +52,7 @@ describe API::V3::Deployments do
       it 'returns the projects deployment' do
         get v3_api("/projects/#{project.id}/deployments/#{deployment.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['sha']).to match /\A\h{40}\z/
         expect(json_response['id']).to eq(deployment.id)
       end
@@ -62,7 +62,7 @@ describe API::V3::Deployments do
       it 'returns a 404 status code' do
         get v3_api("/projects/#{project.id}/deployments/#{deployment.id}", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/v3/environments_spec.rb b/spec/requests/api/v3/environments_spec.rb
index 39264e819a3..937250b5219 100644
--- a/spec/requests/api/v3/environments_spec.rb
+++ b/spec/requests/api/v3/environments_spec.rb
@@ -36,7 +36,7 @@ describe API::V3::Environments do
       it 'returns project environments' do
         get v3_api("/projects/#{project.id}/environments", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
         expect(json_response.first['name']).to eq(environment.name)
@@ -50,7 +50,7 @@ describe API::V3::Environments do
       it 'returns a 404 status code' do
         get v3_api("/projects/#{project.id}/environments", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -60,7 +60,7 @@ describe API::V3::Environments do
       it 'creates a environment with valid params' do
         post v3_api("/projects/#{project.id}/environments", user), name: "mepmep"
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['name']).to eq('mepmep')
         expect(json_response['slug']).to eq('mepmep')
         expect(json_response['external']).to be nil
@@ -69,19 +69,19 @@ describe API::V3::Environments do
       it 'requires name to be passed' do
         post v3_api("/projects/#{project.id}/environments", user), external_url: 'test.gitlab.com'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns a 400 if environment already exists' do
         post v3_api("/projects/#{project.id}/environments", user), name: environment.name
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns a 400 if slug is specified' do
         post v3_api("/projects/#{project.id}/environments", user), name: "foo", slug: "foo"
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response["error"]).to eq("slug is automatically generated and cannot be changed")
       end
     end
@@ -90,7 +90,7 @@ describe API::V3::Environments do
       it 'rejects the request' do
         post v3_api("/projects/#{project.id}/environments", non_member), name: 'gitlab.com'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 400 when the required params are missing' do
@@ -105,7 +105,7 @@ describe API::V3::Environments do
       put v3_api("/projects/#{project.id}/environments/#{environment.id}", user),
           name: 'Mepmep', external_url: url
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['name']).to eq('Mepmep')
       expect(json_response['external_url']).to eq(url)
     end
@@ -115,7 +115,7 @@ describe API::V3::Environments do
       api_url = v3_api("/projects/#{project.id}/environments/#{environment.id}", user)
       put api_url, slug: slug + "-foo"
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response["error"]).to eq("slug is automatically generated and cannot be changed")
     end
 
@@ -124,7 +124,7 @@ describe API::V3::Environments do
       put v3_api("/projects/#{project.id}/environments/#{environment.id}", user),
           name: 'Mepmep'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['name']).to eq('Mepmep')
       expect(json_response['external_url']).to eq(url)
     end
@@ -132,7 +132,7 @@ describe API::V3::Environments do
     it 'returns a 404 if the environment does not exist' do
       put v3_api("/projects/#{project.id}/environments/12345", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -141,13 +141,13 @@ describe API::V3::Environments do
       it 'returns a 200 for an existing environment' do
         delete v3_api("/projects/#{project.id}/environments/#{environment.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'returns a 404 for non existing id' do
         delete v3_api("/projects/#{project.id}/environments/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Not found')
       end
     end
@@ -156,7 +156,7 @@ describe API::V3::Environments do
       it 'rejects the request' do
         delete v3_api("/projects/#{project.id}/environments/#{environment.id}", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/v3/files_spec.rb b/spec/requests/api/v3/files_spec.rb
index dc7f0eefd16..5500c1cf770 100644
--- a/spec/requests/api/v3/files_spec.rb
+++ b/spec/requests/api/v3/files_spec.rb
@@ -36,7 +36,7 @@ describe API::V3::Files do
       it "returns file info" do
         get v3_api(route, current_user), params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['file_path']).to eq(file_path)
         expect(json_response['file_name']).to eq('popen.rb')
         expect(json_response['last_commit_id']).to eq('570e7b2abdd848b95f2f578043fc23bd6f6fd24d')
@@ -112,7 +112,7 @@ describe API::V3::Files do
     it "creates a new file in project repo" do
       post v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['file_path']).to eq('newfile.rb')
       last_commit = project.repository.commit.raw
       expect(last_commit.author_email).to eq(user.email)
@@ -122,7 +122,7 @@ describe API::V3::Files do
     it "returns a 400 bad request if no params given" do
       post v3_api("/projects/#{project.id}/repository/files", user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 400 if editor fails to create file" do
@@ -131,7 +131,7 @@ describe API::V3::Files do
 
       post v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context "when specifying an author" do
@@ -140,7 +140,7 @@ describe API::V3::Files do
 
         post v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         last_commit = project.repository.commit.raw
         expect(last_commit.author_email).to eq(author_email)
         expect(last_commit.author_name).to eq(author_name)
@@ -153,7 +153,7 @@ describe API::V3::Files do
       it "creates a new file in project repo" do
         post v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['file_path']).to eq('newfile.rb')
         last_commit = project.repository.commit.raw
         expect(last_commit.author_email).to eq(user.email)
@@ -175,7 +175,7 @@ describe API::V3::Files do
     it "updates existing file in project repo" do
       put v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['file_path']).to eq(file_path)
       last_commit = project.repository.commit.raw
       expect(last_commit.author_email).to eq(user.email)
@@ -185,7 +185,7 @@ describe API::V3::Files do
     it "returns a 400 bad request if no params given" do
       put v3_api("/projects/#{project.id}/repository/files", user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context "when specifying an author" do
@@ -194,7 +194,7 @@ describe API::V3::Files do
 
         put v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         last_commit = project.repository.commit.raw
         expect(last_commit.author_email).to eq(author_email)
         expect(last_commit.author_name).to eq(author_name)
@@ -214,7 +214,7 @@ describe API::V3::Files do
     it "deletes existing file in project repo" do
       delete v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['file_path']).to eq(file_path)
       last_commit = project.repository.commit.raw
       expect(last_commit.author_email).to eq(user.email)
@@ -224,7 +224,7 @@ describe API::V3::Files do
     it "returns a 400 bad request if no params given" do
       delete v3_api("/projects/#{project.id}/repository/files", user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 400 if fails to delete file" do
@@ -232,7 +232,7 @@ describe API::V3::Files do
 
       delete v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context "when specifying an author" do
@@ -241,7 +241,7 @@ describe API::V3::Files do
 
         delete v3_api("/projects/#{project.id}/repository/files", user), valid_params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         last_commit = project.repository.commit.raw
         expect(last_commit.author_email).to eq(author_email)
         expect(last_commit.author_name).to eq(author_name)
@@ -274,7 +274,7 @@ describe API::V3::Files do
     it "remains unchanged" do
       get v3_api("/projects/#{project.id}/repository/files", user), get_params
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['file_path']).to eq(file_path)
       expect(json_response['file_name']).to eq(file_path)
       expect(json_response['content']).to eq(put_params[:content])
diff --git a/spec/requests/api/v3/groups_spec.rb b/spec/requests/api/v3/groups_spec.rb
index 778fcc73c30..498cb42fad1 100644
--- a/spec/requests/api/v3/groups_spec.rb
+++ b/spec/requests/api/v3/groups_spec.rb
@@ -23,7 +23,7 @@ describe API::V3::Groups do
       it "returns authentication error" do
         get v3_api("/groups")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -31,7 +31,7 @@ describe API::V3::Groups do
       it "normal user: returns an array of groups of user1" do
         get v3_api("/groups", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response)
@@ -41,7 +41,7 @@ describe API::V3::Groups do
       it "does not include statistics" do
         get v3_api("/groups", user1), statistics: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first).not_to include 'statistics'
       end
@@ -51,7 +51,7 @@ describe API::V3::Groups do
       it "admin: returns an array of all groups" do
         get v3_api("/groups", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(2)
       end
@@ -59,7 +59,7 @@ describe API::V3::Groups do
       it "does not include statistics by default" do
         get v3_api("/groups", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first).not_to include('statistics')
       end
@@ -76,7 +76,7 @@ describe API::V3::Groups do
 
         get v3_api("/groups", admin), statistics: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response)
           .to satisfy_one { |group| group['statistics'] == attributes }
@@ -87,7 +87,7 @@ describe API::V3::Groups do
       it "returns all groups excluding skipped groups" do
         get v3_api("/groups", admin), skip_groups: [group2.id]
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
       end
@@ -101,7 +101,7 @@ describe API::V3::Groups do
 
         get v3_api("/groups", user1), all_available: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response_groups).to contain_exactly(public_group.name, group1.name)
       end
@@ -118,7 +118,7 @@ describe API::V3::Groups do
       it "sorts by name ascending by default" do
         get v3_api("/groups", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response_groups).to eq([group3.name, group1.name])
       end
@@ -126,7 +126,7 @@ describe API::V3::Groups do
       it "sorts in descending order when passed" do
         get v3_api("/groups", user1), sort: "desc"
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response_groups).to eq([group1.name, group3.name])
       end
@@ -134,7 +134,7 @@ describe API::V3::Groups do
       it "sorts by the order_by param" do
         get v3_api("/groups", user1), order_by: "path"
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response_groups).to eq([group1.name, group3.name])
       end
@@ -146,7 +146,7 @@ describe API::V3::Groups do
       it 'returns authentication error' do
         get v3_api('/groups/owned')
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -154,7 +154,7 @@ describe API::V3::Groups do
       it 'returns an array of groups the user owns' do
         get v3_api('/groups/owned', user2)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(group2.name)
@@ -170,7 +170,7 @@ describe API::V3::Groups do
 
         get v3_api("/groups/#{group1.id}", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['id']).to eq(group1.id)
         expect(json_response['name']).to eq(group1.name)
         expect(json_response['path']).to eq(group1.path)
@@ -192,13 +192,13 @@ describe API::V3::Groups do
       it "does not return a non existing group" do
         get v3_api("/groups/1328", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "does not return a group not attached to user1" do
         get v3_api("/groups/#{group2.id}", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -206,14 +206,14 @@ describe API::V3::Groups do
       it "returns any existing group" do
         get v3_api("/groups/#{group2.id}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(group2.name)
       end
 
       it "does not return a non existing group" do
         get v3_api("/groups/1328", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -221,20 +221,20 @@ describe API::V3::Groups do
       it 'returns any existing group' do
         get v3_api("/groups/#{group1.path}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(group1.name)
       end
 
       it 'does not return a non existing group' do
         get v3_api('/groups/unknown', admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'does not return a group not attached to user1' do
         get v3_api("/groups/#{group2.path}", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -246,7 +246,7 @@ describe API::V3::Groups do
       it 'updates the group' do
         put v3_api("/groups/#{group1.id}", user1), name: new_group_name, request_access_enabled: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(new_group_name)
         expect(json_response['request_access_enabled']).to eq(true)
       end
@@ -254,7 +254,7 @@ describe API::V3::Groups do
       it 'returns 404 for a non existing group' do
         put v3_api('/groups/1328', user1), name: new_group_name
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -262,7 +262,7 @@ describe API::V3::Groups do
       it 'updates the group' do
         put v3_api("/groups/#{group1.id}", admin), name: new_group_name
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(new_group_name)
       end
     end
@@ -271,7 +271,7 @@ describe API::V3::Groups do
       it 'does not updates the group' do
         put v3_api("/groups/#{group1.id}", user2), name: new_group_name
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -279,7 +279,7 @@ describe API::V3::Groups do
       it 'returns 404 when trying to update the group' do
         put v3_api("/groups/#{group2.id}", user1), name: new_group_name
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -289,7 +289,7 @@ describe API::V3::Groups do
       it "returns the group's projects" do
         get v3_api("/groups/#{group1.id}/projects", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.length).to eq(2)
         project_names = json_response.map { |proj| proj['name'] }
         expect(project_names).to match_array([project1.name, project3.name])
@@ -299,7 +299,7 @@ describe API::V3::Groups do
       it "returns the group's projects with simple representation" do
         get v3_api("/groups/#{group1.id}/projects", user1), simple: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.length).to eq(2)
         project_names = json_response.map { |proj| proj['name'] }
         expect(project_names).to match_array([project1.name, project3.name])
@@ -311,7 +311,7 @@ describe API::V3::Groups do
 
         get v3_api("/groups/#{group1.id}/projects", user1), visibility: 'public'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an(Array)
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(public_project.name)
@@ -320,13 +320,13 @@ describe API::V3::Groups do
       it "does not return a non existing group" do
         get v3_api("/groups/1328/projects", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "does not return a group not attached to user1" do
         get v3_api("/groups/#{group2.id}/projects", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "only returns projects to which user has access" do
@@ -334,7 +334,7 @@ describe API::V3::Groups do
 
         get v3_api("/groups/#{group1.id}/projects", user3)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(project3.name)
       end
@@ -344,7 +344,7 @@ describe API::V3::Groups do
 
         get v3_api("/groups/#{project2.group.id}/projects", user3), owned: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(project2.name)
       end
@@ -354,7 +354,7 @@ describe API::V3::Groups do
 
         get v3_api("/groups/#{group1.id}/projects", user1), starred: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(project1.name)
       end
@@ -364,7 +364,7 @@ describe API::V3::Groups do
       it "returns any existing group" do
         get v3_api("/groups/#{group2.id}/projects", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(project2.name)
       end
@@ -372,7 +372,7 @@ describe API::V3::Groups do
       it "does not return a non existing group" do
         get v3_api("/groups/1328/projects", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -380,7 +380,7 @@ describe API::V3::Groups do
       it 'returns any existing group' do
         get v3_api("/groups/#{group1.path}/projects", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_names = json_response.map { |proj| proj['name'] }
         expect(project_names).to match_array([project1.name, project3.name])
       end
@@ -388,13 +388,13 @@ describe API::V3::Groups do
       it 'does not return a non existing group' do
         get v3_api('/groups/unknown/projects', admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'does not return a group not attached to user1' do
         get v3_api("/groups/#{group2.path}/projects", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -404,7 +404,7 @@ describe API::V3::Groups do
       it "does not create group" do
         post v3_api("/groups", user1), attributes_for(:group)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -414,7 +414,7 @@ describe API::V3::Groups do
 
         post v3_api("/groups", user3), group
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
 
         expect(json_response["name"]).to eq(group[:name])
         expect(json_response["path"]).to eq(group[:path])
@@ -428,7 +428,7 @@ describe API::V3::Groups do
 
         post v3_api("/groups", user3), group
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
 
         expect(json_response["full_path"]).to eq("#{parent.path}/#{group[:path]}")
         expect(json_response["parent_id"]).to eq(parent.id)
@@ -437,20 +437,20 @@ describe API::V3::Groups do
       it "does not create group, duplicate" do
         post v3_api("/groups", user3), { name: 'Duplicate Test', path: group2.path }
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(response.message).to eq("Bad Request")
       end
 
       it "returns 400 bad request error if name not given" do
         post v3_api("/groups", user3), { path: group2.path }
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns 400 bad request error if path not given" do
         post v3_api("/groups", user3), { name: 'test' }
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
   end
@@ -460,7 +460,7 @@ describe API::V3::Groups do
       it "removes group" do
         delete v3_api("/groups/#{group1.id}", user1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it "does not remove a group if not an owner" do
@@ -469,19 +469,19 @@ describe API::V3::Groups do
 
         delete v3_api("/groups/#{group1.id}", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it "does not remove a non existing group" do
         delete v3_api("/groups/1328", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "does not remove a group not attached to user1" do
         delete v3_api("/groups/#{group2.id}", user1)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -489,13 +489,13 @@ describe API::V3::Groups do
       it "removes any existing group" do
         delete v3_api("/groups/#{group2.id}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it "does not remove a non existing group" do
         delete v3_api("/groups/1328", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -513,7 +513,7 @@ describe API::V3::Groups do
       it "does not transfer project to group" do
         post v3_api("/groups/#{group1.id}/projects/#{project.id}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -521,7 +521,7 @@ describe API::V3::Groups do
       it "transfers project to group" do
         post v3_api("/groups/#{group1.id}/projects/#{project.id}", admin)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       context 'when using project path in URL' do
@@ -529,7 +529,7 @@ describe API::V3::Groups do
           it "transfers project to group" do
             post v3_api("/groups/#{group1.id}/projects/#{project_path}", admin)
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
           end
         end
 
@@ -537,7 +537,7 @@ describe API::V3::Groups do
           it "does not transfer project to group" do
             post v3_api("/groups/#{group1.id}/projects/nogroup%2Fnoproject", admin)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -547,7 +547,7 @@ describe API::V3::Groups do
           it "transfers project to group" do
             post v3_api("/groups/#{group1.path}/projects/#{project_path}", admin)
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
           end
         end
 
@@ -555,7 +555,7 @@ describe API::V3::Groups do
           it "does not transfer project to group" do
             post v3_api("/groups/noexist/projects/#{project_path}", admin)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
diff --git a/spec/requests/api/v3/issues_spec.rb b/spec/requests/api/v3/issues_spec.rb
index 86768d7397a..39a47a62f16 100644
--- a/spec/requests/api/v3/issues_spec.rb
+++ b/spec/requests/api/v3/issues_spec.rb
@@ -59,7 +59,7 @@ describe API::V3::Issues, :mailer do
       it "returns authentication error" do
         get v3_api("/issues")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -67,7 +67,7 @@ describe API::V3::Issues, :mailer do
       it "returns an array of issues" do
         get v3_api("/issues", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['title']).to eq(issue.title)
         expect(json_response.last).to have_key('web_url')
@@ -76,7 +76,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an array of closed issues' do
         get v3_api('/issues?state=closed', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['id']).to eq(closed_issue.id)
@@ -85,7 +85,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an array of opened issues' do
         get v3_api('/issues?state=opened', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['id']).to eq(issue.id)
@@ -94,7 +94,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an array of all issues' do
         get v3_api('/issues?state=all', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(2)
         expect(json_response.first['id']).to eq(issue.id)
@@ -104,7 +104,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an array of labeled issues' do
         get v3_api("/issues?labels=#{label.title}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['labels']).to eq([label.title])
@@ -113,7 +113,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an array of labeled issues when at least one label matches' do
         get v3_api("/issues?labels=#{label.title},foo,bar", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['labels']).to eq([label.title])
@@ -122,7 +122,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an empty array if no issue matches labels' do
         get v3_api('/issues?labels=foo,bar', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(0)
       end
@@ -130,7 +130,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an array of labeled issues matching given state' do
         get v3_api("/issues?labels=#{label.title}&state=opened", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['labels']).to eq([label.title])
@@ -140,7 +140,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an empty array if no issue matches labels and state filters' do
         get v3_api("/issues?labels=#{label.title}&state=closed", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(0)
       end
@@ -148,7 +148,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an empty array if no issue matches milestone' do
         get v3_api("/issues?milestone=#{empty_milestone.title}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(0)
       end
@@ -156,7 +156,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an empty array if milestone does not exist' do
         get v3_api("/issues?milestone=foo", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(0)
       end
@@ -164,7 +164,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an array of issues in given milestone' do
         get v3_api("/issues?milestone=#{milestone.title}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(2)
         expect(json_response.first['id']).to eq(issue.id)
@@ -175,7 +175,7 @@ describe API::V3::Issues, :mailer do
         get v3_api("/issues?milestone=#{milestone.title}",  user),
           '&state=closed'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['id']).to eq(closed_issue.id)
@@ -184,7 +184,7 @@ describe API::V3::Issues, :mailer do
       it 'returns an array of issues with no milestone' do
         get v3_api("/issues?milestone=#{no_milestone_title}", author)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['id']).to eq(confidential_issue.id)
@@ -195,7 +195,7 @@ describe API::V3::Issues, :mailer do
 
         response_dates = json_response.map { |issue| issue['created_at'] }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response_dates).to eq(response_dates.sort.reverse)
       end
@@ -205,7 +205,7 @@ describe API::V3::Issues, :mailer do
 
         response_dates = json_response.map { |issue| issue['created_at'] }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response_dates).to eq(response_dates.sort)
       end
@@ -215,7 +215,7 @@ describe API::V3::Issues, :mailer do
 
         response_dates = json_response.map { |issue| issue['updated_at'] }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response_dates).to eq(response_dates.sort.reverse)
       end
@@ -225,7 +225,7 @@ describe API::V3::Issues, :mailer do
 
         response_dates = json_response.map { |issue| issue['updated_at'] }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(response_dates).to eq(response_dates.sort)
       end
@@ -233,7 +233,7 @@ describe API::V3::Issues, :mailer do
       it 'matches V3 response schema' do
         get v3_api('/issues', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to match_response_schema('public_api/v3/issues')
       end
     end
@@ -285,7 +285,7 @@ describe API::V3::Issues, :mailer do
     it 'returns all group issues (including opened and closed)' do
       get v3_api(base_url, admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(3)
     end
@@ -293,7 +293,7 @@ describe API::V3::Issues, :mailer do
     it 'returns group issues without confidential issues for non project members' do
       get v3_api("#{base_url}?state=opened", non_member)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['title']).to eq(group_issue.title)
@@ -302,7 +302,7 @@ describe API::V3::Issues, :mailer do
     it 'returns group confidential issues for author' do
       get v3_api("#{base_url}?state=opened", author)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
     end
@@ -310,7 +310,7 @@ describe API::V3::Issues, :mailer do
     it 'returns group confidential issues for assignee' do
       get v3_api("#{base_url}?state=opened", assignee)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
     end
@@ -318,7 +318,7 @@ describe API::V3::Issues, :mailer do
     it 'returns group issues with confidential issues for project members' do
       get v3_api("#{base_url}?state=opened", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
     end
@@ -326,7 +326,7 @@ describe API::V3::Issues, :mailer do
     it 'returns group confidential issues for admin' do
       get v3_api("#{base_url}?state=opened", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
     end
@@ -334,7 +334,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an array of labeled group issues' do
       get v3_api("#{base_url}?labels=#{group_label.title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['labels']).to eq([group_label.title])
@@ -343,7 +343,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an array of labeled group issues where all labels match' do
       get v3_api("#{base_url}?labels=#{group_label.title},foo,bar", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -351,7 +351,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an empty array if no group issue matches labels' do
       get v3_api("#{base_url}?labels=foo,bar", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -359,7 +359,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an empty array if no issue matches milestone' do
       get v3_api("#{base_url}?milestone=#{group_empty_milestone.title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -367,7 +367,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an empty array if milestone does not exist' do
       get v3_api("#{base_url}?milestone=foo", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -375,7 +375,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an array of issues in given milestone' do
       get v3_api("#{base_url}?state=opened&milestone=#{group_milestone.title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(group_issue.id)
@@ -385,7 +385,7 @@ describe API::V3::Issues, :mailer do
       get v3_api("#{base_url}?milestone=#{group_milestone.title}", user),
         '&state=closed'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(group_closed_issue.id)
@@ -394,7 +394,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an array of issues with no milestone' do
       get v3_api("#{base_url}?milestone=#{no_milestone_title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(group_confidential_issue.id)
@@ -405,7 +405,7 @@ describe API::V3::Issues, :mailer do
 
       response_dates = json_response.map { |issue| issue['created_at'] }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(response_dates).to eq(response_dates.sort.reverse)
     end
@@ -415,7 +415,7 @@ describe API::V3::Issues, :mailer do
 
       response_dates = json_response.map { |issue| issue['created_at'] }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(response_dates).to eq(response_dates.sort)
     end
@@ -425,7 +425,7 @@ describe API::V3::Issues, :mailer do
 
       response_dates = json_response.map { |issue| issue['updated_at'] }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(response_dates).to eq(response_dates.sort.reverse)
     end
@@ -435,7 +435,7 @@ describe API::V3::Issues, :mailer do
 
       response_dates = json_response.map { |issue| issue['updated_at'] }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(response_dates).to eq(response_dates.sort)
     end
@@ -447,7 +447,7 @@ describe API::V3::Issues, :mailer do
     it 'returns 404 when project does not exist' do
       get v3_api('/projects/1000/issues', non_member)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns 404 on private projects for other users" do
@@ -456,7 +456,7 @@ describe API::V3::Issues, :mailer do
 
       get v3_api("/projects/#{private_project.id}/issues", non_member)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns no issues when user has access to project but not issues' do
@@ -471,7 +471,7 @@ describe API::V3::Issues, :mailer do
     it 'returns project issues without confidential issues for non project members' do
       get v3_api("#{base_url}/issues", non_member)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
       expect(json_response.first['title']).to eq(issue.title)
@@ -480,7 +480,7 @@ describe API::V3::Issues, :mailer do
     it 'returns project issues without confidential issues for project members with guest role' do
       get v3_api("#{base_url}/issues", guest)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
       expect(json_response.first['title']).to eq(issue.title)
@@ -489,7 +489,7 @@ describe API::V3::Issues, :mailer do
     it 'returns project confidential issues for author' do
       get v3_api("#{base_url}/issues", author)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(3)
       expect(json_response.first['title']).to eq(issue.title)
@@ -498,7 +498,7 @@ describe API::V3::Issues, :mailer do
     it 'returns project confidential issues for assignee' do
       get v3_api("#{base_url}/issues", assignee)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(3)
       expect(json_response.first['title']).to eq(issue.title)
@@ -507,7 +507,7 @@ describe API::V3::Issues, :mailer do
     it 'returns project issues with confidential issues for project members' do
       get v3_api("#{base_url}/issues", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(3)
       expect(json_response.first['title']).to eq(issue.title)
@@ -516,7 +516,7 @@ describe API::V3::Issues, :mailer do
     it 'returns project confidential issues for admin' do
       get v3_api("#{base_url}/issues", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(3)
       expect(json_response.first['title']).to eq(issue.title)
@@ -525,7 +525,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an array of labeled project issues' do
       get v3_api("#{base_url}/issues?labels=#{label.title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['labels']).to eq([label.title])
@@ -534,7 +534,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an array of labeled project issues where all labels match' do
       get v3_api("#{base_url}/issues?labels=#{label.title},foo,bar", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['labels']).to eq([label.title])
@@ -543,7 +543,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an empty array if no project issue matches labels' do
       get v3_api("#{base_url}/issues?labels=foo,bar", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -551,7 +551,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an empty array if no issue matches milestone' do
       get v3_api("#{base_url}/issues?milestone=#{empty_milestone.title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -559,7 +559,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an empty array if milestone does not exist' do
       get v3_api("#{base_url}/issues?milestone=foo", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -567,7 +567,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an array of issues in given milestone' do
       get v3_api("#{base_url}/issues?milestone=#{milestone.title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
       expect(json_response.first['id']).to eq(issue.id)
@@ -578,7 +578,7 @@ describe API::V3::Issues, :mailer do
       get v3_api("#{base_url}/issues?milestone=#{milestone.title}", user),
         '&state=closed'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(closed_issue.id)
@@ -587,7 +587,7 @@ describe API::V3::Issues, :mailer do
     it 'returns an array of issues with no milestone' do
       get v3_api("#{base_url}/issues?milestone=#{no_milestone_title}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(confidential_issue.id)
@@ -598,7 +598,7 @@ describe API::V3::Issues, :mailer do
 
       response_dates = json_response.map { |issue| issue['created_at'] }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(response_dates).to eq(response_dates.sort.reverse)
     end
@@ -608,7 +608,7 @@ describe API::V3::Issues, :mailer do
 
       response_dates = json_response.map { |issue| issue['created_at'] }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(response_dates).to eq(response_dates.sort)
     end
@@ -618,7 +618,7 @@ describe API::V3::Issues, :mailer do
 
       response_dates = json_response.map { |issue| issue['updated_at'] }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(response_dates).to eq(response_dates.sort.reverse)
     end
@@ -628,7 +628,7 @@ describe API::V3::Issues, :mailer do
 
       response_dates = json_response.map { |issue| issue['updated_at'] }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(response_dates).to eq(response_dates.sort)
     end
@@ -638,7 +638,7 @@ describe API::V3::Issues, :mailer do
     it 'exposes known attributes' do
       get v3_api("/projects/#{project.id}/issues/#{issue.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['id']).to eq(issue.id)
       expect(json_response['iid']).to eq(issue.iid)
       expect(json_response['project_id']).to eq(issue.project.id)
@@ -657,7 +657,7 @@ describe API::V3::Issues, :mailer do
     it "returns a project issue by id" do
       get v3_api("/projects/#{project.id}/issues/#{issue.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(issue.title)
       expect(json_response['iid']).to eq(issue.iid)
     end
@@ -682,26 +682,26 @@ describe API::V3::Issues, :mailer do
     it "returns 404 if issue id not found" do
       get v3_api("/projects/#{project.id}/issues/54321", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context 'confidential issues' do
       it "returns 404 for non project members" do
         get v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns 404 for project members with guest role" do
         get v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", guest)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns confidential issue for project members" do
         get v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(confidential_issue.title)
         expect(json_response['iid']).to eq(confidential_issue.iid)
       end
@@ -709,7 +709,7 @@ describe API::V3::Issues, :mailer do
       it "returns confidential issue for author" do
         get v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", author)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(confidential_issue.title)
         expect(json_response['iid']).to eq(confidential_issue.iid)
       end
@@ -717,7 +717,7 @@ describe API::V3::Issues, :mailer do
       it "returns confidential issue for assignee" do
         get v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", assignee)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(confidential_issue.title)
         expect(json_response['iid']).to eq(confidential_issue.iid)
       end
@@ -725,7 +725,7 @@ describe API::V3::Issues, :mailer do
       it "returns confidential issue for admin" do
         get v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(confidential_issue.title)
         expect(json_response['iid']).to eq(confidential_issue.iid)
       end
@@ -737,7 +737,7 @@ describe API::V3::Issues, :mailer do
       post v3_api("/projects/#{project.id}/issues", user),
         title: 'new issue', labels: 'label, label2', assignee_id: assignee.id
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['description']).to be_nil
       expect(json_response['labels']).to eq(%w(label label2))
@@ -749,7 +749,7 @@ describe API::V3::Issues, :mailer do
       post v3_api("/projects/#{project.id}/issues", user),
         title: 'new issue', confidential: true
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['confidential']).to be_truthy
     end
@@ -758,7 +758,7 @@ describe API::V3::Issues, :mailer do
       post v3_api("/projects/#{project.id}/issues", user),
         title: 'new issue', confidential: 'y'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['confidential']).to be_truthy
     end
@@ -767,7 +767,7 @@ describe API::V3::Issues, :mailer do
       post v3_api("/projects/#{project.id}/issues", user),
         title: 'new issue', confidential: false
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new issue')
       expect(json_response['confidential']).to be_falsy
     end
@@ -776,7 +776,7 @@ describe API::V3::Issues, :mailer do
       post v3_api("/projects/#{project.id}/issues", user),
         title: 'new issue', confidential: 'foo'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('confidential is invalid')
     end
 
@@ -795,7 +795,7 @@ describe API::V3::Issues, :mailer do
     it "returns a 400 bad request if title not given" do
       post v3_api("/projects/#{project.id}/issues", user), labels: 'label, label2'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'allows special label names' do
@@ -815,7 +815,7 @@ describe API::V3::Issues, :mailer do
       post v3_api("/projects/#{project.id}/issues", user),
            title: 'g' * 256
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['title']).to eq([
         'is too long (maximum is 255 characters)'
       ])
@@ -834,7 +834,7 @@ describe API::V3::Issues, :mailer do
       end
 
       it 'creates a new project issue' do
-        expect(response).to have_http_status(:created)
+        expect(response).to have_gitlab_http_status(:created)
       end
 
       it 'resolves the discussions in a merge request' do
@@ -855,7 +855,7 @@ describe API::V3::Issues, :mailer do
         post v3_api("/projects/#{project.id}/issues", user),
           title: 'new issue', due_date: due_date
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq('new issue')
         expect(json_response['description']).to be_nil
         expect(json_response['due_date']).to eq(due_date)
@@ -868,7 +868,7 @@ describe API::V3::Issues, :mailer do
         post v3_api("/projects/#{project.id}/issues", user),
           title: 'new issue', labels: 'label, label2', created_at: creation_time
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(Time.parse(json_response['created_at'])).to be_like_time(creation_time)
       end
     end
@@ -899,7 +899,7 @@ describe API::V3::Issues, :mailer do
     it "does not create a new project issue" do
       expect { post v3_api("/projects/#{project.id}/issues", user), params }.not_to change(Issue, :count)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']).to eq({ "error" => "Spam detected" })
 
       spam_logs = SpamLog.all
@@ -917,7 +917,7 @@ describe API::V3::Issues, :mailer do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user),
         title: 'updated title'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('updated title')
     end
 
@@ -925,7 +925,7 @@ describe API::V3::Issues, :mailer do
       put v3_api("/projects/#{project.id}/issues/44444", user),
         title: 'updated title'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'allows special label names' do
@@ -946,21 +946,21 @@ describe API::V3::Issues, :mailer do
         put v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", non_member),
           title: 'updated title'
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it "returns 403 for project members with guest role" do
         put v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", guest),
           title: 'updated title'
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it "updates a confidential issue for project members" do
         put v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", user),
           title: 'updated title'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq('updated title')
       end
 
@@ -968,7 +968,7 @@ describe API::V3::Issues, :mailer do
         put v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", author),
           title: 'updated title'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq('updated title')
       end
 
@@ -976,7 +976,7 @@ describe API::V3::Issues, :mailer do
         put v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", admin),
           title: 'updated title'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq('updated title')
       end
 
@@ -984,7 +984,7 @@ describe API::V3::Issues, :mailer do
         put v3_api("/projects/#{project.id}/issues/#{issue.id}", user),
           confidential: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['confidential']).to be_truthy
       end
 
@@ -992,7 +992,7 @@ describe API::V3::Issues, :mailer do
         put v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", user),
           confidential: false
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['confidential']).to be_falsy
       end
 
@@ -1000,7 +1000,7 @@ describe API::V3::Issues, :mailer do
         put v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}", user),
           confidential: 'foo'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('confidential is invalid')
       end
     end
@@ -1021,7 +1021,7 @@ describe API::V3::Issues, :mailer do
 
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user), params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']).to eq({ "error" => "Spam detected" })
 
       spam_logs = SpamLog.all
@@ -1041,7 +1041,7 @@ describe API::V3::Issues, :mailer do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user),
           title: 'updated title'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['labels']).to eq([label.title])
     end
 
@@ -1060,7 +1060,7 @@ describe API::V3::Issues, :mailer do
     it 'removes all labels' do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user), labels: ''
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['labels']).to eq([])
     end
 
@@ -1068,7 +1068,7 @@ describe API::V3::Issues, :mailer do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user),
           labels: 'foo,bar'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['labels']).to include 'foo'
       expect(json_response['labels']).to include 'bar'
     end
@@ -1092,7 +1092,7 @@ describe API::V3::Issues, :mailer do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user),
           title: 'g' * 256
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['title']).to eq([
         'is too long (maximum is 255 characters)'
       ])
@@ -1104,7 +1104,7 @@ describe API::V3::Issues, :mailer do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user),
         labels: 'label2', state_event: "close"
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['labels']).to include 'label2'
       expect(json_response['state']).to eq "closed"
     end
@@ -1112,7 +1112,7 @@ describe API::V3::Issues, :mailer do
     it 'reopens a project isssue' do
       put v3_api("/projects/#{project.id}/issues/#{closed_issue.id}", user), state_event: 'reopen'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['state']).to eq 'opened'
     end
 
@@ -1122,7 +1122,7 @@ describe API::V3::Issues, :mailer do
         put v3_api("/projects/#{project.id}/issues/#{issue.id}", user),
           labels: 'label3', state_event: 'close', updated_at: update_time
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['labels']).to include 'label3'
         expect(Time.parse(json_response['updated_at'])).to be_like_time(update_time)
       end
@@ -1135,7 +1135,7 @@ describe API::V3::Issues, :mailer do
 
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user), due_date: due_date
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['due_date']).to eq(due_date)
     end
   end
@@ -1144,14 +1144,14 @@ describe API::V3::Issues, :mailer do
     it 'updates an issue with no assignee' do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user), assignee_id: 0
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['assignee']).to eq(nil)
     end
 
     it 'updates an issue with assignee' do
       put v3_api("/projects/#{project.id}/issues/#{issue.id}", user), assignee_id: user2.id
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['assignee']['name']).to eq(user2.name)
     end
   end
@@ -1160,13 +1160,13 @@ describe API::V3::Issues, :mailer do
     it "rejects a non member from deleting an issue" do
       delete v3_api("/projects/#{project.id}/issues/#{issue.id}", non_member)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     it "rejects a developer from deleting an issue" do
       delete v3_api("/projects/#{project.id}/issues/#{issue.id}", author)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
 
     context "when the user is project owner" do
@@ -1176,7 +1176,7 @@ describe API::V3::Issues, :mailer do
       it "deletes the issue if an admin requests it" do
         delete v3_api("/projects/#{project.id}/issues/#{issue.id}", owner)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['state']).to eq 'opened'
       end
     end
@@ -1185,7 +1185,7 @@ describe API::V3::Issues, :mailer do
       it 'returns 404 when trying to move an issue' do
         delete v3_api("/projects/#{project.id}/issues/123", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -1198,7 +1198,7 @@ describe API::V3::Issues, :mailer do
       post v3_api("/projects/#{project.id}/issues/#{issue.id}/move", user),
                to_project_id: target_project.id
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['project_id']).to eq(target_project.id)
     end
 
@@ -1207,7 +1207,7 @@ describe API::V3::Issues, :mailer do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/move", user),
                  to_project_id: project.id
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']).to eq('Cannot move issue to project it originates from!')
       end
     end
@@ -1217,7 +1217,7 @@ describe API::V3::Issues, :mailer do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/move", user),
                  to_project_id: target_project2.id
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']).to eq('Cannot move issue due to insufficient permissions!')
       end
     end
@@ -1226,7 +1226,7 @@ describe API::V3::Issues, :mailer do
       post v3_api("/projects/#{project.id}/issues/#{issue.id}/move", admin),
                to_project_id: target_project2.id
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['project_id']).to eq(target_project2.id)
     end
 
@@ -1235,7 +1235,7 @@ describe API::V3::Issues, :mailer do
         post v3_api("/projects/#{project.id}/issues/123/move", user),
                  to_project_id: target_project.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Issue Not Found')
       end
     end
@@ -1245,7 +1245,7 @@ describe API::V3::Issues, :mailer do
         post v3_api("/projects/123/issues/#{issue.id}/move", user),
                  to_project_id: target_project.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
     end
@@ -1255,7 +1255,7 @@ describe API::V3::Issues, :mailer do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/move", user),
                  to_project_id: 123
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -1264,26 +1264,26 @@ describe API::V3::Issues, :mailer do
     it 'subscribes to an issue' do
       post v3_api("/projects/#{project.id}/issues/#{issue.id}/subscription", user2)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['subscribed']).to eq(true)
     end
 
     it 'returns 304 if already subscribed' do
       post v3_api("/projects/#{project.id}/issues/#{issue.id}/subscription", user)
 
-      expect(response).to have_http_status(304)
+      expect(response).to have_gitlab_http_status(304)
     end
 
     it 'returns 404 if the issue is not found' do
       post v3_api("/projects/#{project.id}/issues/123/subscription", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 404 if the issue is confidential' do
       post v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}/subscription", non_member)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1291,26 +1291,26 @@ describe API::V3::Issues, :mailer do
     it 'unsubscribes from an issue' do
       delete v3_api("/projects/#{project.id}/issues/#{issue.id}/subscription", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['subscribed']).to eq(false)
     end
 
     it 'returns 304 if not subscribed' do
       delete v3_api("/projects/#{project.id}/issues/#{issue.id}/subscription", user2)
 
-      expect(response).to have_http_status(304)
+      expect(response).to have_gitlab_http_status(304)
     end
 
     it 'returns 404 if the issue is not found' do
       delete v3_api("/projects/#{project.id}/issues/123/subscription", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 404 if the issue is confidential' do
       delete v3_api("/projects/#{project.id}/issues/#{confidential_issue.id}/subscription", non_member)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
diff --git a/spec/requests/api/v3/labels_spec.rb b/spec/requests/api/v3/labels_spec.rb
index 32f37a08024..1d31213d5ca 100644
--- a/spec/requests/api/v3/labels_spec.rb
+++ b/spec/requests/api/v3/labels_spec.rb
@@ -27,7 +27,7 @@ describe API::V3::Labels do
 
       get v3_api("/projects/#{project.id}/labels", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(3)
       expect(json_response.first.keys).to match_array expected_keys
@@ -71,7 +71,7 @@ describe API::V3::Labels do
       it "subscribes to the label" do
         post v3_api("/projects/#{project.id}/labels/#{label1.title}/subscription", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response["name"]).to eq(label1.title)
         expect(json_response["subscribed"]).to be_truthy
       end
@@ -81,7 +81,7 @@ describe API::V3::Labels do
       it "subscribes to the label" do
         post v3_api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response["name"]).to eq(label1.title)
         expect(json_response["subscribed"]).to be_truthy
       end
@@ -93,7 +93,7 @@ describe API::V3::Labels do
       it "returns 304" do
         post v3_api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
 
-        expect(response).to have_http_status(304)
+        expect(response).to have_gitlab_http_status(304)
       end
     end
 
@@ -101,7 +101,7 @@ describe API::V3::Labels do
       it "returns 404 error" do
         post v3_api("/projects/#{project.id}/labels/1234/subscription", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -113,7 +113,7 @@ describe API::V3::Labels do
       it "unsubscribes from the label" do
         delete v3_api("/projects/#{project.id}/labels/#{label1.title}/subscription", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response["name"]).to eq(label1.title)
         expect(json_response["subscribed"]).to be_falsey
       end
@@ -123,7 +123,7 @@ describe API::V3::Labels do
       it "unsubscribes from the label" do
         delete v3_api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response["name"]).to eq(label1.title)
         expect(json_response["subscribed"]).to be_falsey
       end
@@ -135,7 +135,7 @@ describe API::V3::Labels do
       it "returns 304" do
         delete v3_api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
 
-        expect(response).to have_http_status(304)
+        expect(response).to have_gitlab_http_status(304)
       end
     end
 
@@ -143,7 +143,7 @@ describe API::V3::Labels do
       it "returns 404 error" do
         delete v3_api("/projects/#{project.id}/labels/1234/subscription", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -152,18 +152,18 @@ describe API::V3::Labels do
     it 'returns 200 for existing label' do
       delete v3_api("/projects/#{project.id}/labels", user), name: 'label1'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'returns 404 for non existing label' do
       delete v3_api("/projects/#{project.id}/labels", user), name: 'label2'
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Label Not Found')
     end
 
     it 'returns 400 for wrong parameters' do
       delete v3_api("/projects/#{project.id}/labels", user)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 end
diff --git a/spec/requests/api/v3/members_spec.rb b/spec/requests/api/v3/members_spec.rb
index bc918a8eb02..68be3d24c26 100644
--- a/spec/requests/api/v3/members_spec.rb
+++ b/spec/requests/api/v3/members_spec.rb
@@ -34,7 +34,7 @@ describe API::V3::Members do
             user = public_send(type)
             get v3_api("/#{source_type.pluralize}/#{source.id}/members", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response.size).to eq(2)
             expect(json_response.map { |u| u['id'] }).to match_array [master.id, developer.id]
           end
@@ -46,7 +46,7 @@ describe API::V3::Members do
 
         get v3_api("/#{source_type.pluralize}/#{source.id}/members", developer)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.size).to eq(2)
         expect(json_response.map { |u| u['id'] }).to match_array [master.id, developer.id]
       end
@@ -54,7 +54,7 @@ describe API::V3::Members do
       it 'finds members with query string' do
         get v3_api("/#{source_type.pluralize}/#{source.id}/members", developer), query: master.username
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.count).to eq(1)
         expect(json_response.first['username']).to eq(master.username)
       end
@@ -74,7 +74,7 @@ describe API::V3::Members do
               user = public_send(type)
               get v3_api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", user)
 
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
               # User attributes
               expect(json_response['id']).to eq(developer.id)
               expect(json_response['name']).to eq(developer.name)
@@ -109,7 +109,7 @@ describe API::V3::Members do
               post v3_api("/#{source_type.pluralize}/#{source.id}/members", user),
                    user_id: access_requester.id, access_level: Member::MASTER
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -122,7 +122,7 @@ describe API::V3::Members do
               post v3_api("/#{source_type.pluralize}/#{source.id}/members", master),
                    user_id: access_requester.id, access_level: Member::MASTER
 
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(201)
             end.to change { source.members.count }.by(1)
             expect(source.requesters.count).to eq(0)
             expect(json_response['id']).to eq(access_requester.id)
@@ -135,7 +135,7 @@ describe API::V3::Members do
             post v3_api("/#{source_type.pluralize}/#{source.id}/members", master),
                  user_id: stranger.id, access_level: Member::DEVELOPER, expires_at: '2016-08-05'
 
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(201)
           end.to change { source.members.count }.by(1)
           expect(json_response['id']).to eq(stranger.id)
           expect(json_response['access_level']).to eq(Member::DEVELOPER)
@@ -147,28 +147,28 @@ describe API::V3::Members do
         post v3_api("/#{source_type.pluralize}/#{source.id}/members", master),
              user_id: master.id, access_level: Member::MASTER
 
-        expect(response).to have_http_status(source_type == 'project' ? 201 : 409)
+        expect(response).to have_gitlab_http_status(source_type == 'project' ? 201 : 409)
       end
 
       it 'returns 400 when user_id is not given' do
         post v3_api("/#{source_type.pluralize}/#{source.id}/members", master),
              access_level: Member::MASTER
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns 400 when access_level is not given' do
         post v3_api("/#{source_type.pluralize}/#{source.id}/members", master),
              user_id: stranger.id
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns 422 when access_level is not valid' do
         post v3_api("/#{source_type.pluralize}/#{source.id}/members", master),
              user_id: stranger.id, access_level: 1234
 
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
     end
   end
@@ -190,7 +190,7 @@ describe API::V3::Members do
               put v3_api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", user),
                   access_level: Member::MASTER
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -201,7 +201,7 @@ describe API::V3::Members do
           put v3_api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", master),
               access_level: Member::MASTER, expires_at: '2016-08-05'
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['id']).to eq(developer.id)
           expect(json_response['access_level']).to eq(Member::MASTER)
           expect(json_response['expires_at']).to eq('2016-08-05')
@@ -212,20 +212,20 @@ describe API::V3::Members do
         put v3_api("/#{source_type.pluralize}/#{source.id}/members/123", master),
             access_level: Member::MASTER
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns 400 when access_level is not given' do
         put v3_api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", master)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns 422 when access level is not valid' do
         put v3_api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", master),
             access_level: 1234
 
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
     end
   end
@@ -243,7 +243,7 @@ describe API::V3::Members do
               user = public_send(type)
               delete v3_api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", user)
 
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -254,7 +254,7 @@ describe API::V3::Members do
           expect do
             delete v3_api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", developer)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end.to change { source.members.count }.by(-1)
         end
       end
@@ -265,7 +265,7 @@ describe API::V3::Members do
             expect do
               delete v3_api("/#{source_type.pluralize}/#{source.id}/members/#{access_requester.id}", master)
 
-              expect(response).to have_http_status(source_type == 'project' ? 200 : 404)
+              expect(response).to have_gitlab_http_status(source_type == 'project' ? 200 : 404)
             end.not_to change { source.requesters.count }
           end
         end
@@ -274,7 +274,7 @@ describe API::V3::Members do
           expect do
             delete v3_api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", master)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end.to change { source.members.count }.by(-1)
         end
       end
@@ -282,7 +282,7 @@ describe API::V3::Members do
       it "returns #{source_type == 'project' ? 200 : 404} if member does not exist" do
         delete v3_api("/#{source_type.pluralize}/#{source.id}/members/123", master)
 
-        expect(response).to have_http_status(source_type == 'project' ? 200 : 404)
+        expect(response).to have_gitlab_http_status(source_type == 'project' ? 200 : 404)
       end
     end
   end
@@ -333,7 +333,7 @@ describe API::V3::Members do
         post v3_api("/projects/#{project.id}/members", master),
              user_id: stranger.id, access_level: Member::OWNER
 
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end.to change { project.members.count }.by(0)
     end
   end
diff --git a/spec/requests/api/v3/merge_request_diffs_spec.rb b/spec/requests/api/v3/merge_request_diffs_spec.rb
index 3f21ff40726..e613036a88d 100644
--- a/spec/requests/api/v3/merge_request_diffs_spec.rb
+++ b/spec/requests/api/v3/merge_request_diffs_spec.rb
@@ -24,7 +24,7 @@ describe API::V3::MergeRequestDiffs, 'MergeRequestDiffs' do
 
     it 'returns a 404 when merge_request_id not found' do
       get v3_api("/projects/#{project.id}/merge_requests/999/versions", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -42,7 +42,7 @@ describe API::V3::MergeRequestDiffs, 'MergeRequestDiffs' do
     it 'returns a 404 when merge_request_id not found' do
       get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/versions/999", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 end
diff --git a/spec/requests/api/v3/merge_requests_spec.rb b/spec/requests/api/v3/merge_requests_spec.rb
index df73c731c96..26251b95680 100644
--- a/spec/requests/api/v3/merge_requests_spec.rb
+++ b/spec/requests/api/v3/merge_requests_spec.rb
@@ -21,14 +21,14 @@ describe API::MergeRequests do
     context "when unauthenticated" do
       it "returns authentication error" do
         get v3_api("/projects/#{project.id}/merge_requests")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context "when authenticated" do
       it "returns an array of all merge_requests" do
         get v3_api("/projects/#{project.id}/merge_requests", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(3)
         expect(json_response.last['title']).to eq(merge_request.title)
@@ -44,7 +44,7 @@ describe API::MergeRequests do
 
       it "returns an array of all merge_requests" do
         get v3_api("/projects/#{project.id}/merge_requests?state", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(3)
         expect(json_response.last['title']).to eq(merge_request.title)
@@ -52,7 +52,7 @@ describe API::MergeRequests do
 
       it "returns an array of open merge_requests" do
         get v3_api("/projects/#{project.id}/merge_requests?state=opened", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.last['title']).to eq(merge_request.title)
@@ -60,7 +60,7 @@ describe API::MergeRequests do
 
       it "returns an array of closed merge_requests" do
         get v3_api("/projects/#{project.id}/merge_requests?state=closed", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['title']).to eq(merge_request_closed.title)
@@ -68,7 +68,7 @@ describe API::MergeRequests do
 
       it "returns an array of merged merge_requests" do
         get v3_api("/projects/#{project.id}/merge_requests?state=merged", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response.first['title']).to eq(merge_request_merged.title)
@@ -77,7 +77,7 @@ describe API::MergeRequests do
       it 'matches V3 response schema' do
         get v3_api("/projects/#{project.id}/merge_requests", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to match_response_schema('public_api/v3/merge_requests')
       end
 
@@ -89,7 +89,7 @@ describe API::MergeRequests do
 
         it "returns an array of merge_requests in ascending order" do
           get v3_api("/projects/#{project.id}/merge_requests?sort=asc", user)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(3)
           response_dates = json_response.map { |merge_request| merge_request['created_at'] }
@@ -98,7 +98,7 @@ describe API::MergeRequests do
 
         it "returns an array of merge_requests in descending order" do
           get v3_api("/projects/#{project.id}/merge_requests?sort=desc", user)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(3)
           response_dates = json_response.map { |merge_request| merge_request['created_at'] }
@@ -107,7 +107,7 @@ describe API::MergeRequests do
 
         it "returns an array of merge_requests ordered by updated_at" do
           get v3_api("/projects/#{project.id}/merge_requests?order_by=updated_at", user)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(3)
           response_dates = json_response.map { |merge_request| merge_request['updated_at'] }
@@ -116,7 +116,7 @@ describe API::MergeRequests do
 
         it "returns an array of merge_requests ordered by created_at" do
           get v3_api("/projects/#{project.id}/merge_requests?order_by=created_at&sort=asc", user)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(3)
           response_dates = json_response.map { |merge_request| merge_request['created_at'] }
@@ -130,7 +130,7 @@ describe API::MergeRequests do
     it 'exposes known attributes' do
       get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['id']).to eq(merge_request.id)
       expect(json_response['iid']).to eq(merge_request.iid)
       expect(json_response['project_id']).to eq(merge_request.project.id)
@@ -158,7 +158,7 @@ describe API::MergeRequests do
 
     it "returns merge_request" do
       get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(merge_request.title)
       expect(json_response['iid']).to eq(merge_request.iid)
       expect(json_response['work_in_progress']).to eq(false)
@@ -178,7 +178,7 @@ describe API::MergeRequests do
     it 'returns merge_request by iid array' do
       get v3_api("/projects/#{project.id}/merge_requests", user), iid: [merge_request.iid, merge_request_closed.iid]
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
       expect(json_response.first['title']).to eq merge_request_closed.title
@@ -187,7 +187,7 @@ describe API::MergeRequests do
 
     it "returns a 404 error if merge_request_id not found" do
       get v3_api("/projects/#{project.id}/merge_requests/999", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     context 'Work in Progress' do
@@ -195,7 +195,7 @@ describe API::MergeRequests do
 
       it "returns merge_request" do
         get v3_api("/projects/#{project.id}/merge_requests/#{merge_request_wip.id}", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['work_in_progress']).to eq(true)
       end
     end
@@ -214,7 +214,7 @@ describe API::MergeRequests do
 
     it 'returns a 404 when merge_request_id not found' do
       get v3_api("/projects/#{project.id}/merge_requests/999/commits", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -227,7 +227,7 @@ describe API::MergeRequests do
 
     it 'returns a 404 when merge_request_id not found' do
       get v3_api("/projects/#{project.id}/merge_requests/999/changes", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -243,7 +243,7 @@ describe API::MergeRequests do
              milestone_id: milestone.id,
              remove_source_branch: true
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['title']).to eq('Test merge_request')
         expect(json_response['labels']).to eq(%w(label label2))
         expect(json_response['milestone']['id']).to eq(milestone.id)
@@ -253,25 +253,25 @@ describe API::MergeRequests do
       it "returns 422 when source_branch equals target_branch" do
         post v3_api("/projects/#{project.id}/merge_requests", user),
         title: "Test merge_request", source_branch: "master", target_branch: "master", author: user
-        expect(response).to have_http_status(422)
+        expect(response).to have_gitlab_http_status(422)
       end
 
       it "returns 400 when source_branch is missing" do
         post v3_api("/projects/#{project.id}/merge_requests", user),
         title: "Test merge_request", target_branch: "master", author: user
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns 400 when target_branch is missing" do
         post v3_api("/projects/#{project.id}/merge_requests", user),
         title: "Test merge_request", source_branch: "markdown", author: user
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns 400 when title is missing" do
         post v3_api("/projects/#{project.id}/merge_requests", user),
         target_branch: 'master', source_branch: 'markdown'
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'allows special label names' do
@@ -307,7 +307,7 @@ describe API::MergeRequests do
                  target_branch: 'master',
                  author: user
           end.to change { MergeRequest.count }.by(0)
-          expect(response).to have_http_status(409)
+          expect(response).to have_gitlab_http_status(409)
         end
       end
     end
@@ -403,7 +403,7 @@ describe API::MergeRequests do
 
       it "denies the deletion of the merge request" do
         delete v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", developer)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -411,7 +411,7 @@ describe API::MergeRequests do
       it "destroys the merge request owners can destroy" do
         delete v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
   end
@@ -422,7 +422,7 @@ describe API::MergeRequests do
     it "returns merge_request in case of success" do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it "returns 406 if branch can't be merged" do
@@ -431,21 +431,21 @@ describe API::MergeRequests do
 
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
 
-      expect(response).to have_http_status(406)
+      expect(response).to have_gitlab_http_status(406)
       expect(json_response['message']).to eq('Branch cannot be merged')
     end
 
     it "returns 405 if merge_request is not open" do
       merge_request.close
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
-      expect(response).to have_http_status(405)
+      expect(response).to have_gitlab_http_status(405)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
     it "returns 405 if merge_request is a work in progress" do
       merge_request.update_attribute(:title, "WIP: #{merge_request.title}")
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
-      expect(response).to have_http_status(405)
+      expect(response).to have_gitlab_http_status(405)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
@@ -454,7 +454,7 @@ describe API::MergeRequests do
 
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
 
-      expect(response).to have_http_status(405)
+      expect(response).to have_gitlab_http_status(405)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
@@ -462,21 +462,21 @@ describe API::MergeRequests do
       user2 = create(:user)
       project.team << [user2, :reporter]
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user2)
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
       expect(json_response['message']).to eq('401 Unauthorized')
     end
 
     it "returns 409 if the SHA parameter doesn't match" do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), sha: merge_request.diff_head_sha.reverse
 
-      expect(response).to have_http_status(409)
+      expect(response).to have_gitlab_http_status(409)
       expect(json_response['message']).to start_with('SHA does not match HEAD of source branch')
     end
 
     it "succeeds if the SHA parameter matches" do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), sha: merge_request.diff_head_sha
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it "enables merge when pipeline succeeds if the pipeline is active" do
@@ -485,7 +485,7 @@ describe API::MergeRequests do
 
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), merge_when_build_succeeds: true
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('Test')
       expect(json_response['merge_when_build_succeeds']).to eq(true)
     end
@@ -496,39 +496,39 @@ describe API::MergeRequests do
       it "returns merge_request" do
         put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), state_event: "close"
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['state']).to eq('closed')
       end
     end
 
     it "updates title and returns merge_request" do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), title: "New title"
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('New title')
     end
 
     it "updates description and returns merge_request" do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), description: "New description"
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['description']).to eq('New description')
     end
 
     it "updates milestone_id and returns merge_request" do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), milestone_id: milestone.id
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['milestone']['id']).to eq(milestone.id)
     end
 
     it "returns merge_request with renamed target_branch" do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), target_branch: "wiki"
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['target_branch']).to eq('wiki')
     end
 
     it "returns merge_request that removes the source branch" do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), remove_source_branch: true
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['force_remove_source_branch']).to be_truthy
     end
 
@@ -549,7 +549,7 @@ describe API::MergeRequests do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), state_event: 'close', title: nil
 
       merge_request.reload
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(merge_request.state).to eq('opened')
     end
 
@@ -557,7 +557,7 @@ describe API::MergeRequests do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), state_event: 'close', target_branch: nil
 
       merge_request.reload
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(merge_request.state).to eq('opened')
     end
   end
@@ -568,7 +568,7 @@ describe API::MergeRequests do
 
       post v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user), note: "My comment"
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['note']).to eq('My comment')
       expect(json_response['author']['name']).to eq(user.name)
       expect(json_response['author']['username']).to eq(user.username)
@@ -577,13 +577,13 @@ describe API::MergeRequests do
 
     it "returns 400 if note is missing" do
       post v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns 404 if note is attached to non existent merge request" do
       post v3_api("/projects/#{project.id}/merge_requests/404/comments", user),
         note: 'My comment'
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -593,7 +593,7 @@ describe API::MergeRequests do
 
     it "returns merge_request comments ordered by created_at" do
       get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
       expect(json_response.first['note']).to eq("a comment on a MR")
@@ -603,7 +603,7 @@ describe API::MergeRequests do
 
     it "returns a 404 error if merge_request_id not found" do
       get v3_api("/projects/#{project.id}/merge_requests/999/comments", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -615,7 +615,7 @@ describe API::MergeRequests do
       end
 
       get v3_api("/projects/#{project.id}/merge_requests/#{mr.id}/closes_issues", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(issue.id)
@@ -623,7 +623,7 @@ describe API::MergeRequests do
 
     it 'returns an empty array when there are no issues to be closed' do
       get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/closes_issues", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -636,7 +636,7 @@ describe API::MergeRequests do
 
       get v3_api("/projects/#{jira_project.id}/merge_requests/#{merge_request.id}/closes_issues", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['title']).to eq(issue.title)
@@ -651,7 +651,7 @@ describe API::MergeRequests do
 
       get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/closes_issues", guest)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 
@@ -659,20 +659,20 @@ describe API::MergeRequests do
     it 'subscribes to a merge request' do
       post v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", admin)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['subscribed']).to eq(true)
     end
 
     it 'returns 304 if already subscribed' do
       post v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", user)
 
-      expect(response).to have_http_status(304)
+      expect(response).to have_gitlab_http_status(304)
     end
 
     it 'returns 404 if the merge request is not found' do
       post v3_api("/projects/#{project.id}/merge_requests/123/subscription", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 403 if user has no access to read code' do
@@ -681,7 +681,7 @@ describe API::MergeRequests do
 
       post v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", guest)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 
@@ -689,20 +689,20 @@ describe API::MergeRequests do
     it 'unsubscribes from a merge request' do
       delete v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['subscribed']).to eq(false)
     end
 
     it 'returns 304 if not subscribed' do
       delete v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", admin)
 
-      expect(response).to have_http_status(304)
+      expect(response).to have_gitlab_http_status(304)
     end
 
     it 'returns 404 if the merge request is not found' do
       post v3_api("/projects/#{project.id}/merge_requests/123/subscription", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 403 if user has no access to read code' do
@@ -711,7 +711,7 @@ describe API::MergeRequests do
 
       delete v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", guest)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 
diff --git a/spec/requests/api/v3/milestones_spec.rb b/spec/requests/api/v3/milestones_spec.rb
index feaa87faec7..e82f35598a6 100644
--- a/spec/requests/api/v3/milestones_spec.rb
+++ b/spec/requests/api/v3/milestones_spec.rb
@@ -12,7 +12,7 @@ describe API::V3::Milestones do
     it 'returns project milestones' do
       get v3_api("/projects/#{project.id}/milestones", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.first['title']).to eq(milestone.title)
     end
@@ -20,13 +20,13 @@ describe API::V3::Milestones do
     it 'returns a 401 error if user not authenticated' do
       get v3_api("/projects/#{project.id}/milestones")
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns an array of active milestones' do
       get v3_api("/projects/#{project.id}/milestones?state=active", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(milestone.id)
@@ -35,7 +35,7 @@ describe API::V3::Milestones do
     it 'returns an array of closed milestones' do
       get v3_api("/projects/#{project.id}/milestones?state=closed", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(closed_milestone.id)
@@ -46,7 +46,7 @@ describe API::V3::Milestones do
     it 'returns a project milestone by id' do
       get v3_api("/projects/#{project.id}/milestones/#{milestone.id}", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(milestone.title)
       expect(json_response['iid']).to eq(milestone.iid)
     end
@@ -63,7 +63,7 @@ describe API::V3::Milestones do
     it 'returns a project milestone by iid array' do
       get v3_api("/projects/#{project.id}/milestones", user), iid: [milestone.iid, closed_milestone.iid]
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to eq(2)
       expect(json_response.first['title']).to eq milestone.title
       expect(json_response.first['id']).to eq milestone.id
@@ -72,13 +72,13 @@ describe API::V3::Milestones do
     it 'returns 401 error if user not authenticated' do
       get v3_api("/projects/#{project.id}/milestones/#{milestone.id}")
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 404 error if milestone id not found' do
       get v3_api("/projects/#{project.id}/milestones/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -86,7 +86,7 @@ describe API::V3::Milestones do
     it 'creates a new project milestone' do
       post v3_api("/projects/#{project.id}/milestones", user), title: 'new milestone'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new milestone')
       expect(json_response['description']).to be_nil
     end
@@ -95,7 +95,7 @@ describe API::V3::Milestones do
       post v3_api("/projects/#{project.id}/milestones", user),
         title: 'new milestone', description: 'release', due_date: '2013-03-02', start_date: '2013-02-02'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['description']).to eq('release')
       expect(json_response['due_date']).to eq('2013-03-02')
       expect(json_response['start_date']).to eq('2013-02-02')
@@ -104,20 +104,20 @@ describe API::V3::Milestones do
     it 'returns a 400 error if title is missing' do
       post v3_api("/projects/#{project.id}/milestones", user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns a 400 error if params are invalid (duplicate title)' do
       post v3_api("/projects/#{project.id}/milestones", user),
         title: milestone.title, description: 'release', due_date: '2013-03-02'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'creates a new project with reserved html characters' do
       post v3_api("/projects/#{project.id}/milestones", user), title: 'foo & bar 1.1 -> 2.2'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('foo & bar 1.1 -> 2.2')
       expect(json_response['description']).to be_nil
     end
@@ -128,7 +128,7 @@ describe API::V3::Milestones do
       put v3_api("/projects/#{project.id}/milestones/#{milestone.id}", user),
         title: 'updated title'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('updated title')
     end
 
@@ -137,7 +137,7 @@ describe API::V3::Milestones do
 
       put v3_api("/projects/#{project.id}/milestones/#{milestone.id}", user), due_date: nil
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['due_date']).to be_nil
     end
 
@@ -145,7 +145,7 @@ describe API::V3::Milestones do
       put v3_api("/projects/#{project.id}/milestones/1234", user),
         title: 'updated title'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -153,7 +153,7 @@ describe API::V3::Milestones do
     it 'updates a project milestone' do
       put v3_api("/projects/#{project.id}/milestones/#{milestone.id}", user),
         state_event: 'close'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['state']).to eq('closed')
     end
@@ -175,7 +175,7 @@ describe API::V3::Milestones do
     it 'returns project issues for a particular milestone' do
       get v3_api("/projects/#{project.id}/milestones/#{milestone.id}/issues", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.first['milestone']['title']).to eq(milestone.title)
     end
@@ -183,14 +183,14 @@ describe API::V3::Milestones do
     it 'matches V3 response schema for a list of issues' do
       get v3_api("/projects/#{project.id}/milestones/#{milestone.id}/issues", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to match_response_schema('public_api/v3/issues')
     end
 
     it 'returns a 401 error if user not authenticated' do
       get v3_api("/projects/#{project.id}/milestones/#{milestone.id}/issues")
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     describe 'confidential issues' do
@@ -207,7 +207,7 @@ describe API::V3::Milestones do
       it 'returns confidential issues to team members' do
         get v3_api("/projects/#{public_project.id}/milestones/#{milestone.id}/issues", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(2)
         expect(json_response.map { |issue| issue['id'] }).to include(issue.id, confidential_issue.id)
@@ -219,7 +219,7 @@ describe API::V3::Milestones do
 
         get v3_api("/projects/#{public_project.id}/milestones/#{milestone.id}/issues", member)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
         expect(json_response.map { |issue| issue['id'] }).to include(issue.id)
@@ -228,7 +228,7 @@ describe API::V3::Milestones do
       it 'does not return confidential issues to regular users' do
         get v3_api("/projects/#{public_project.id}/milestones/#{milestone.id}/issues", create(:user))
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
         expect(json_response.map { |issue| issue['id'] }).to include(issue.id)
diff --git a/spec/requests/api/v3/notes_spec.rb b/spec/requests/api/v3/notes_spec.rb
index 56729692eed..d3455a4bba4 100644
--- a/spec/requests/api/v3/notes_spec.rb
+++ b/spec/requests/api/v3/notes_spec.rb
@@ -35,7 +35,7 @@ describe API::V3::Notes do
       it "returns an array of issue notes" do
         get v3_api("/projects/#{project.id}/issues/#{issue.id}/notes", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(issue_note.note)
@@ -46,14 +46,14 @@ describe API::V3::Notes do
       it "returns a 404 error when issue id not found" do
         get v3_api("/projects/#{project.id}/issues/12345/notes", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       context "and current user cannot view the notes" do
         it "returns an empty array" do
           get v3_api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
           expect(json_response).to be_empty
@@ -65,7 +65,7 @@ describe API::V3::Notes do
           it "returns 404" do
             get v3_api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", user)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -73,7 +73,7 @@ describe API::V3::Notes do
           it "returns an empty array" do
             get v3_api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", private_user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response.first['body']).to eq(cross_reference_note.note)
@@ -86,7 +86,7 @@ describe API::V3::Notes do
       it "returns an array of snippet notes" do
         get v3_api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(snippet_note.note)
@@ -95,13 +95,13 @@ describe API::V3::Notes do
       it "returns a 404 error when snippet id not found" do
         get v3_api("/projects/#{project.id}/snippets/42/notes", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns 404 when not authorized" do
         get v3_api("/projects/#{project.id}/snippets/#{snippet.id}/notes", private_user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -109,7 +109,7 @@ describe API::V3::Notes do
       it "returns an array of merge_requests notes" do
         get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/notes", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(merge_request_note.note)
@@ -118,13 +118,13 @@ describe API::V3::Notes do
       it "returns a 404 error if merge request id not found" do
         get v3_api("/projects/#{project.id}/merge_requests/4444/notes", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it "returns 404 when not authorized" do
         get v3_api("/projects/#{project.id}/merge_requests/4444/notes", private_user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -134,21 +134,21 @@ describe API::V3::Notes do
       it "returns an issue note by id" do
         get v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{issue_note.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq(issue_note.note)
       end
 
       it "returns a 404 error if issue note not found" do
         get v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       context "and current user cannot view the note" do
         it "returns a 404 error" do
           get v3_api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes/#{cross_reference_note.id}", user)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
 
         context "when issue is confidential" do
@@ -157,7 +157,7 @@ describe API::V3::Notes do
           it "returns 404" do
             get v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/#{issue_note.id}", private_user)
 
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -165,7 +165,7 @@ describe API::V3::Notes do
           it "returns an issue note by id" do
             get v3_api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes/#{cross_reference_note.id}", private_user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response['body']).to eq(cross_reference_note.note)
           end
         end
@@ -176,14 +176,14 @@ describe API::V3::Notes do
       it "returns a snippet note by id" do
         get v3_api("/projects/#{project.id}/snippets/#{snippet.id}/notes/#{snippet_note.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq(snippet_note.note)
       end
 
       it "returns a 404 error if snippet note not found" do
         get v3_api("/projects/#{project.id}/snippets/#{snippet.id}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -193,7 +193,7 @@ describe API::V3::Notes do
       it "creates a new issue note" do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes", user), body: 'hi!'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['body']).to eq('hi!')
         expect(json_response['author']['username']).to eq(user.username)
       end
@@ -201,13 +201,13 @@ describe API::V3::Notes do
       it "returns a 400 bad request error if body not given" do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns a 401 unauthorized error if user not authenticated" do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes"), body: 'hi!'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
 
       context 'when an admin or owner makes the request' do
@@ -216,7 +216,7 @@ describe API::V3::Notes do
           post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes", user),
             body: 'hi!', created_at: creation_time
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['body']).to eq('hi!')
           expect(json_response['author']['username']).to eq(user.username)
           expect(Time.parse(json_response['created_at'])).to be_like_time(creation_time)
@@ -229,7 +229,7 @@ describe API::V3::Notes do
         it 'creates a new issue note' do
           post v3_api("/projects/#{project.id}/issues/#{issue2.id}/notes", user), body: ':+1:'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['body']).to eq(':+1:')
         end
       end
@@ -238,7 +238,7 @@ describe API::V3::Notes do
         it 'creates a new issue note' do
           post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes", user), body: ':+1:'
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['body']).to eq(':+1:')
         end
       end
@@ -248,7 +248,7 @@ describe API::V3::Notes do
       it "creates a new snippet note" do
         post v3_api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user), body: 'hi!'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['body']).to eq('hi!')
         expect(json_response['author']['username']).to eq(user.username)
       end
@@ -256,13 +256,13 @@ describe API::V3::Notes do
       it "returns a 400 bad request error if body not given" do
         post v3_api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it "returns a 401 unauthorized error if user not authenticated" do
         post v3_api("/projects/#{project.id}/snippets/#{snippet.id}/notes"), body: 'hi!'
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -274,7 +274,7 @@ describe API::V3::Notes do
         post v3_api("/projects/#{project.id}/issues/#{issue.id}/notes", user),
           body: 'Foo'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -314,7 +314,7 @@ describe API::V3::Notes do
         put v3_api("/projects/#{project.id}/issues/#{issue.id}/"\
                   "notes/#{issue_note.id}", user), body: 'Hello!'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -322,14 +322,14 @@ describe API::V3::Notes do
         put v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user),
                 body: 'Hello!'
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 400 bad request error if body not given' do
         put v3_api("/projects/#{project.id}/issues/#{issue.id}/"\
                   "notes/#{issue_note.id}", user)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -338,7 +338,7 @@ describe API::V3::Notes do
         put v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                   "notes/#{snippet_note.id}", user), body: 'Hello!'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -346,7 +346,7 @@ describe API::V3::Notes do
         put v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                   "notes/12345", user), body: "Hello!"
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -355,7 +355,7 @@ describe API::V3::Notes do
         put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\
                   "notes/#{merge_request_note.id}", user), body: 'Hello!'
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['body']).to eq('Hello!')
       end
 
@@ -363,7 +363,7 @@ describe API::V3::Notes do
         put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\
                   "notes/12345", user), body: "Hello!"
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -374,17 +374,17 @@ describe API::V3::Notes do
         delete v3_api("/projects/#{project.id}/issues/#{issue.id}/"\
                       "notes/#{issue_note.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         # Check if note is really deleted
         delete v3_api("/projects/#{project.id}/issues/#{issue.id}/"\
                       "notes/#{issue_note.id}", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -393,18 +393,18 @@ describe API::V3::Notes do
         delete v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                       "notes/#{snippet_note.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         # Check if note is really deleted
         delete v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                       "notes/#{snippet_note.id}", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                       "notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -413,18 +413,18 @@ describe API::V3::Notes do
         delete v3_api("/projects/#{project.id}/merge_requests/"\
                       "#{merge_request.id}/notes/#{merge_request_note.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         # Check if note is really deleted
         delete v3_api("/projects/#{project.id}/merge_requests/"\
                       "#{merge_request.id}/notes/#{merge_request_note.id}", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns a 404 error when note id not found' do
         delete v3_api("/projects/#{project.id}/merge_requests/"\
                       "#{merge_request.id}/notes/12345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/v3/pipelines_spec.rb b/spec/requests/api/v3/pipelines_spec.rb
index e1d036ff365..1c7d9fe32bb 100644
--- a/spec/requests/api/v3/pipelines_spec.rb
+++ b/spec/requests/api/v3/pipelines_spec.rb
@@ -32,7 +32,7 @@ describe API::V3::Pipelines do
       it 'returns project pipelines' do
         get v3_api("/projects/#{project.id}/pipelines", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['sha']).to match(/\A\h{40}\z/)
         expect(json_response.first['id']).to eq pipeline.id
@@ -44,7 +44,7 @@ describe API::V3::Pipelines do
       it 'does not return project pipelines' do
         get v3_api("/projects/#{project.id}/pipelines", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Project Not Found'
         expect(json_response).not_to be_an Array
       end
@@ -61,7 +61,7 @@ describe API::V3::Pipelines do
             post v3_api("/projects/#{project.id}/pipeline", user), ref: project.default_branch
           end.to change { Ci::Pipeline.count }.by(1)
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response).to be_a Hash
           expect(json_response['sha']).to eq project.commit.id
         end
@@ -69,7 +69,7 @@ describe API::V3::Pipelines do
         it 'fails when using an invalid ref' do
           post v3_api("/projects/#{project.id}/pipeline", user), ref: 'invalid_ref'
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']['base'].first).to eq 'Reference not found'
           expect(json_response).not_to be_an Array
         end
@@ -79,7 +79,7 @@ describe API::V3::Pipelines do
         it 'fails to create pipeline' do
           post v3_api("/projects/#{project.id}/pipeline", user), ref: project.default_branch
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']['base'].first).to eq 'Missing .gitlab-ci.yml file'
           expect(json_response).not_to be_an Array
         end
@@ -90,7 +90,7 @@ describe API::V3::Pipelines do
       it 'does not create pipeline' do
         post v3_api("/projects/#{project.id}/pipeline", non_member), ref: project.default_branch
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Project Not Found'
         expect(json_response).not_to be_an Array
       end
@@ -102,14 +102,14 @@ describe API::V3::Pipelines do
       it 'returns project pipelines' do
         get v3_api("/projects/#{project.id}/pipelines/#{pipeline.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['sha']).to match /\A\h{40}\z/
       end
 
       it 'returns 404 when it does not exist' do
         get v3_api("/projects/#{project.id}/pipelines/123456", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Not found'
         expect(json_response['id']).to be nil
       end
@@ -131,7 +131,7 @@ describe API::V3::Pipelines do
       it 'should not return a project pipeline' do
         get v3_api("/projects/#{project.id}/pipelines/#{pipeline.id}", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Project Not Found'
         expect(json_response['id']).to be nil
       end
@@ -152,7 +152,7 @@ describe API::V3::Pipelines do
           post v3_api("/projects/#{project.id}/pipelines/#{pipeline.id}/retry", user)
         end.to change { pipeline.builds.count }.from(1).to(2)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(build.reload.retried?).to be true
       end
     end
@@ -161,7 +161,7 @@ describe API::V3::Pipelines do
       it 'should not return a project pipeline' do
         post v3_api("/projects/#{project.id}/pipelines/#{pipeline.id}/retry", non_member)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq '404 Project Not Found'
         expect(json_response['id']).to be nil
       end
@@ -180,7 +180,7 @@ describe API::V3::Pipelines do
       it 'retries failed builds' do
         post v3_api("/projects/#{project.id}/pipelines/#{pipeline.id}/cancel", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['status']).to eq('canceled')
       end
     end
@@ -193,7 +193,7 @@ describe API::V3::Pipelines do
       it 'rejects the action' do
         post v3_api("/projects/#{project.id}/pipelines/#{pipeline.id}/cancel", reporter)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
         expect(pipeline.reload.status).to eq('pending')
       end
     end
diff --git a/spec/requests/api/v3/project_hooks_spec.rb b/spec/requests/api/v3/project_hooks_spec.rb
index b0eddbb5dd2..00f59744a31 100644
--- a/spec/requests/api/v3/project_hooks_spec.rb
+++ b/spec/requests/api/v3/project_hooks_spec.rb
@@ -22,7 +22,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       it "returns project hooks" do
         get v3_api("/projects/#{project.id}/hooks", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.count).to eq(1)
         expect(json_response.first['url']).to eq("http://example.com")
@@ -42,7 +42,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       it "does not access project hooks" do
         get v3_api("/projects/#{project.id}/hooks", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -51,7 +51,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
     context "authorized user" do
       it "returns a project hook" do
         get v3_api("/projects/#{project.id}/hooks/#{hook.id}", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['url']).to eq(hook.url)
         expect(json_response['issues_events']).to eq(hook.issues_events)
         expect(json_response['push_events']).to eq(hook.push_events)
@@ -66,20 +66,20 @@ describe API::ProjectHooks, 'ProjectHooks' do
 
       it "returns a 404 error if hook id is not available" do
         get v3_api("/projects/#{project.id}/hooks/1234", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
     context "unauthorized user" do
       it "does not access an existing hook" do
         get v3_api("/projects/#{project.id}/hooks/#{hook.id}", user3)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
     it "returns a 404 error if hook id is not available" do
       get v3_api("/projects/#{project.id}/hooks/1234", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -90,7 +90,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
           url: "http://example.com", issues_events: true, wiki_page_events: true, build_events: true
       end.to change {project.hooks.count}.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['url']).to eq('http://example.com')
       expect(json_response['issues_events']).to eq(true)
       expect(json_response['push_events']).to eq(true)
@@ -111,7 +111,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
         post v3_api("/projects/#{project.id}/hooks", user), url: "http://example.com", token: token
       end.to change {project.hooks.count}.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response["url"]).to eq("http://example.com")
       expect(json_response).not_to include("token")
 
@@ -123,12 +123,12 @@ describe API::ProjectHooks, 'ProjectHooks' do
 
     it "returns a 400 error if url not given" do
       post v3_api("/projects/#{project.id}/hooks", user)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 422 error if url not valid" do
       post v3_api("/projects/#{project.id}/hooks", user), "url" => "ftp://example.com"
-      expect(response).to have_http_status(422)
+      expect(response).to have_gitlab_http_status(422)
     end
   end
 
@@ -136,7 +136,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
     it "updates an existing project hook" do
       put v3_api("/projects/#{project.id}/hooks/#{hook.id}", user),
         url: 'http://example.org', push_events: false, build_events: true
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['url']).to eq('http://example.org')
       expect(json_response['issues_events']).to eq(hook.issues_events)
       expect(json_response['push_events']).to eq(false)
@@ -154,7 +154,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
 
       put v3_api("/projects/#{project.id}/hooks/#{hook.id}", user), url: "http://example.org", token: token
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response["url"]).to eq("http://example.org")
       expect(json_response).not_to include("token")
 
@@ -164,17 +164,17 @@ describe API::ProjectHooks, 'ProjectHooks' do
 
     it "returns 404 error if hook id not found" do
       put v3_api("/projects/#{project.id}/hooks/1234", user), url: 'http://example.org'
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns 400 error if url is not given" do
       put v3_api("/projects/#{project.id}/hooks/#{hook.id}", user)
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 422 error if url is not valid" do
       put v3_api("/projects/#{project.id}/hooks/#{hook.id}", user), url: 'ftp://example.com'
-      expect(response).to have_http_status(422)
+      expect(response).to have_gitlab_http_status(422)
     end
   end
 
@@ -183,23 +183,23 @@ describe API::ProjectHooks, 'ProjectHooks' do
       expect do
         delete v3_api("/projects/#{project.id}/hooks/#{hook.id}", user)
       end.to change {project.hooks.count}.by(-1)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it "returns success when deleting hook" do
       delete v3_api("/projects/#{project.id}/hooks/#{hook.id}", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it "returns a 404 error when deleting non existent hook" do
       delete v3_api("/projects/#{project.id}/hooks/42", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns a 404 error if hook id not given" do
       delete v3_api("/projects/#{project.id}/hooks", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns a 404 if a user attempts to delete project hooks he/she does not own" do
@@ -208,7 +208,7 @@ describe API::ProjectHooks, 'ProjectHooks' do
       other_project.team << [test_user, :master]
 
       delete v3_api("/projects/#{other_project.id}/hooks/#{hook.id}", test_user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(WebHook.exists?(hook.id)).to be_truthy
     end
   end
diff --git a/spec/requests/api/v3/project_snippets_spec.rb b/spec/requests/api/v3/project_snippets_spec.rb
index 7e88489082a..2ed31b99516 100644
--- a/spec/requests/api/v3/project_snippets_spec.rb
+++ b/spec/requests/api/v3/project_snippets_spec.rb
@@ -28,7 +28,7 @@ describe API::ProjectSnippets do
 
       get v3_api("/projects/#{project.id}/snippets/", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to eq(3)
       expect(json_response.map { |snippet| snippet['id']} ).to include(public_snippet.id, internal_snippet.id, private_snippet.id)
       expect(json_response.last).to have_key('web_url')
@@ -38,7 +38,7 @@ describe API::ProjectSnippets do
       create(:project_snippet, :private, project: project)
 
       get v3_api("/projects/#{project.id}/snippets/", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to eq(0)
     end
   end
@@ -56,7 +56,7 @@ describe API::ProjectSnippets do
     it 'creates a new snippet' do
       post v3_api("/projects/#{project.id}/snippets/", admin), params
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       snippet = ProjectSnippet.find(json_response['id'])
       expect(snippet.content).to eq(params[:code])
       expect(snippet.title).to eq(params[:title])
@@ -69,7 +69,7 @@ describe API::ProjectSnippets do
 
       post v3_api("/projects/#{project.id}/snippets/", admin), params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context 'when the snippet is spam' do
@@ -95,7 +95,7 @@ describe API::ProjectSnippets do
           expect { create_snippet(project, visibility_level: Snippet::PUBLIC) }
             .not_to change { Snippet.count }
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']).to eq({ "error" => "Spam detected" })
         end
 
@@ -116,7 +116,7 @@ describe API::ProjectSnippets do
 
       put v3_api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/", admin), code: new_content
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       snippet.reload
       expect(snippet.content).to eq(new_content)
     end
@@ -124,14 +124,14 @@ describe API::ProjectSnippets do
     it 'returns 404 for invalid snippet id' do
       put v3_api("/projects/#{snippet.project.id}/snippets/1234", admin), title: 'foo'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
 
     it 'returns 400 for missing parameters' do
       put v3_api("/projects/#{project.id}/snippets/1234", admin)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context 'when the snippet is spam' do
@@ -173,7 +173,7 @@ describe API::ProjectSnippets do
           expect { update_snippet(title: 'Foo', visibility_level: Snippet::PUBLIC) }
             .not_to change { snippet.reload.title }
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']).to eq({ "error" => "Spam detected" })
         end
 
@@ -194,13 +194,13 @@ describe API::ProjectSnippets do
 
       delete v3_api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'returns 404 for invalid snippet id' do
       delete v3_api("/projects/#{snippet.project.id}/snippets/1234", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
   end
@@ -211,7 +211,7 @@ describe API::ProjectSnippets do
     it 'returns raw text' do
       get v3_api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/raw", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response.content_type).to eq 'text/plain'
       expect(response.body).to eq(snippet.content)
     end
@@ -219,7 +219,7 @@ describe API::ProjectSnippets do
     it 'returns 404 for invalid snippet id' do
       delete v3_api("/projects/#{snippet.project.id}/snippets/1234", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
   end
diff --git a/spec/requests/api/v3/projects_spec.rb b/spec/requests/api/v3/projects_spec.rb
index e5282c3311f..f62ad747c73 100644
--- a/spec/requests/api/v3/projects_spec.rb
+++ b/spec/requests/api/v3/projects_spec.rb
@@ -44,14 +44,14 @@ describe API::V3::Projects do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get v3_api('/projects')
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context 'when authenticated as regular user' do
       it 'returns an array of projects' do
         get v3_api('/projects', user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(project.name)
         expect(json_response.first['owner']['username']).to eq(user.username)
@@ -94,7 +94,7 @@ describe API::V3::Projects do
 
           get v3_api('/projects?simple=true', user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.first.keys).to match_array expected_keys
         end
@@ -103,7 +103,7 @@ describe API::V3::Projects do
       context 'and using search' do
         it 'returns searched project' do
           get v3_api('/projects', user), { search: project.name }
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(1)
         end
@@ -112,21 +112,21 @@ describe API::V3::Projects do
       context 'and using the visibility filter' do
         it 'filters based on private visibility param' do
           get v3_api('/projects', user), { visibility: 'private' }
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(user.namespace.projects.where(visibility_level: Gitlab::VisibilityLevel::PRIVATE).count)
         end
 
         it 'filters based on internal visibility param' do
           get v3_api('/projects', user), { visibility: 'internal' }
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(user.namespace.projects.where(visibility_level: Gitlab::VisibilityLevel::INTERNAL).count)
         end
 
         it 'filters based on public visibility param' do
           get v3_api('/projects', user), { visibility: 'public' }
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(user.namespace.projects.where(visibility_level: Gitlab::VisibilityLevel::PUBLIC).count)
         end
@@ -138,7 +138,7 @@ describe API::V3::Projects do
         it 'returns archived project' do
           get v3_api('/projects?archived=true', user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(1)
           expect(json_response.first['id']).to eq(archived_project.id)
@@ -147,7 +147,7 @@ describe API::V3::Projects do
         it 'returns non-archived project' do
           get v3_api('/projects?archived=false', user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(1)
           expect(json_response.first['id']).to eq(project.id)
@@ -156,7 +156,7 @@ describe API::V3::Projects do
         it 'returns all project' do
           get v3_api('/projects', user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.length).to eq(2)
         end
@@ -170,7 +170,7 @@ describe API::V3::Projects do
 
         it 'returns the correct order when sorted by id' do
           get v3_api('/projects', user), { order_by: 'id', sort: 'desc' }
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.first['id']).to eq(project3.id)
         end
@@ -184,21 +184,21 @@ describe API::V3::Projects do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get v3_api('/projects/all')
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context 'when authenticated as regular user' do
       it 'returns authentication error' do
         get v3_api('/projects/all', user)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
     context 'when authenticated as admin' do
       it 'returns an array of all projects' do
         get v3_api('/projects/all', admin)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
 
         expect(json_response).to satisfy do |response|
@@ -213,7 +213,7 @@ describe API::V3::Projects do
       it "does not include statistics by default" do
         get v3_api('/projects/all', admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first).not_to include('statistics')
       end
@@ -221,7 +221,7 @@ describe API::V3::Projects do
       it "includes statistics if requested" do
         get v3_api('/projects/all', admin), statistics: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first).to include 'statistics'
       end
@@ -237,14 +237,14 @@ describe API::V3::Projects do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get v3_api('/projects/owned')
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context 'when authenticated as project owner' do
       it 'returns an array of projects the user owns' do
         get v3_api('/projects/owned', user4)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(project4.name)
         expect(json_response.first['owner']['username']).to eq(user4.username)
@@ -253,7 +253,7 @@ describe API::V3::Projects do
       it "does not include statistics by default" do
         get v3_api('/projects/owned', user4)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first).not_to include('statistics')
       end
@@ -271,7 +271,7 @@ describe API::V3::Projects do
 
         get v3_api('/projects/owned', user4), statistics: true
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['statistics']).to eq attributes.stringify_keys
       end
@@ -283,7 +283,7 @@ describe API::V3::Projects do
       it 'returns the visible projects' do
         get v3_api('/projects/visible', current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.map { |p| p['id'] }).to contain_exactly(*projects.map(&:id))
       end
@@ -329,7 +329,7 @@ describe API::V3::Projects do
 
     it 'returns the starred projects viewable by the user' do
       get v3_api('/projects/starred', user3)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.map { |project| project['id'] }).to contain_exactly(project.id, public_project.id)
     end
@@ -341,14 +341,14 @@ describe API::V3::Projects do
         allow_any_instance_of(User).to receive(:projects_limit_left).and_return(0)
         expect { post v3_api('/projects', user2), name: 'foo' }
           .to change {Project.count}.by(0)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
     it 'creates new project without path but with name and returns 201' do
       expect { post v3_api('/projects', user), name: 'Foo Project' }
         .to change { Project.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project = Project.first
 
@@ -359,7 +359,7 @@ describe API::V3::Projects do
     it 'creates new project without name but with path and returns 201' do
       expect { post v3_api('/projects', user), path: 'foo_project' }
         .to change { Project.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project = Project.first
 
@@ -370,7 +370,7 @@ describe API::V3::Projects do
     it 'creates new project name and path and returns 201' do
       expect { post v3_api('/projects', user), path: 'foo-Project', name: 'Foo Project' }
         .to change { Project.count }.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
 
       project = Project.first
 
@@ -381,12 +381,12 @@ describe API::V3::Projects do
     it 'creates last project before reaching project limit' do
       allow_any_instance_of(User).to receive(:projects_limit_left).and_return(1)
       post v3_api('/projects', user2), name: 'foo'
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it 'does not create new project without name or path and return 400' do
       expect { post v3_api('/projects', user) }.not_to change { Project.count }
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "assigns attributes to project" do
@@ -501,7 +501,7 @@ describe API::V3::Projects do
       it 'does not allow a non-admin to use a restricted visibility level' do
         post v3_api('/projects', user), @project
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['visibility_level'].first).to(
           match('restricted by your GitLab administrator')
         )
@@ -523,14 +523,14 @@ describe API::V3::Projects do
 
     it 'should create new project without path and return 201' do
       expect { post v3_api("/projects/user/#{user.id}", admin), name: 'foo' }.to change {Project.count}.by(1)
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
     end
 
     it 'responds with 400 on failure and not project' do
       expect { post v3_api("/projects/user/#{user.id}", admin) }
         .not_to change { Project.count }
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq('name is missing')
     end
 
@@ -544,7 +544,7 @@ describe API::V3::Projects do
 
       post v3_api("/projects/user/#{user.id}", admin), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       project.each_pair do |k, v|
         next if %i[has_external_issue_tracker path].include?(k)
         expect(json_response[k.to_s]).to eq(v)
@@ -555,7 +555,7 @@ describe API::V3::Projects do
       project = attributes_for(:project, :public)
       post v3_api("/projects/user/#{user.id}", admin), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['public']).to be_truthy
       expect(json_response['visibility_level']).to eq(Gitlab::VisibilityLevel::PUBLIC)
     end
@@ -564,7 +564,7 @@ describe API::V3::Projects do
       project = attributes_for(:project, { public: true })
       post v3_api("/projects/user/#{user.id}", admin), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['public']).to be_truthy
       expect(json_response['visibility_level']).to eq(Gitlab::VisibilityLevel::PUBLIC)
     end
@@ -573,7 +573,7 @@ describe API::V3::Projects do
       project = attributes_for(:project, :internal)
       post v3_api("/projects/user/#{user.id}", admin), project
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['public']).to be_falsey
       expect(json_response['visibility_level']).to eq(Gitlab::VisibilityLevel::INTERNAL)
     end
@@ -581,7 +581,7 @@ describe API::V3::Projects do
     it 'sets a project as internal overriding :public' do
       project = attributes_for(:project, :internal, { public: true })
       post v3_api("/projects/user/#{user.id}", admin), project
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['public']).to be_falsey
       expect(json_response['visibility_level']).to eq(Gitlab::VisibilityLevel::INTERNAL)
     end
@@ -635,7 +635,7 @@ describe API::V3::Projects do
     it "uploads the file and returns its info" do
       post v3_api("/projects/#{project.id}/uploads", user), file: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['alt']).to eq("dk")
       expect(json_response['url']).to start_with("/uploads/")
       expect(json_response['url']).to end_with("/dk.png")
@@ -649,7 +649,7 @@ describe API::V3::Projects do
 
         get v3_api("/projects/#{public_project.id}")
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['id']).to eq(public_project.id)
         expect(json_response['description']).to eq(public_project.description)
         expect(json_response['default_branch']).to eq(public_project.default_branch)
@@ -668,7 +668,7 @@ describe API::V3::Projects do
 
         get v3_api("/projects/#{project.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['id']).to eq(project.id)
         expect(json_response['description']).to eq(project.description)
         expect(json_response['default_branch']).to eq(project.default_branch)
@@ -710,20 +710,20 @@ describe API::V3::Projects do
 
       it 'returns a project by path name' do
         get v3_api("/projects/#{project.id}", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(project.name)
       end
 
       it 'returns a 404 error if not found' do
         get v3_api('/projects/42', user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
 
       it 'returns a 404 error if user is not a member' do
         other_user = create(:user)
         get v3_api("/projects/#{project.id}", other_user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'handles users with dots' do
@@ -731,14 +731,14 @@ describe API::V3::Projects do
         project = create(:project, creator_id: dot_user.id, namespace: dot_user.namespace)
 
         get v3_api("/projects/#{CGI.escape(project.full_path)}", dot_user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['name']).to eq(project.name)
       end
 
       it 'exposes namespace fields' do
         get v3_api("/projects/#{project.id}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['namespace']).to eq({
           'id' => user.namespace.id,
           'name' => user.namespace.name,
@@ -756,7 +756,7 @@ describe API::V3::Projects do
           it 'contains permission information' do
             get v3_api("/projects", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response.first['permissions']['project_access']['access_level'])
             .to eq(Gitlab::Access::MASTER)
             expect(json_response.first['permissions']['group_access']).to be_nil
@@ -768,7 +768,7 @@ describe API::V3::Projects do
             project.team << [user, :master]
             get v3_api("/projects/#{project.id}", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response['permissions']['project_access']['access_level'])
             .to eq(Gitlab::Access::MASTER)
             expect(json_response['permissions']['group_access']).to be_nil
@@ -783,7 +783,7 @@ describe API::V3::Projects do
           it 'sets the owner and return 200' do
             get v3_api("/projects/#{project2.id}", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
             expect(json_response['permissions']['project_access']).to be_nil
             expect(json_response['permissions']['group_access']['access_level'])
             .to eq(Gitlab::Access::OWNER)
@@ -803,7 +803,7 @@ describe API::V3::Projects do
 
         get v3_api("/projects/#{project.id}/events", current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
 
         first_event = json_response.first
 
@@ -836,7 +836,7 @@ describe API::V3::Projects do
       it 'returns a 404 error if not found' do
         get v3_api('/projects/42/events', user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
 
@@ -845,7 +845,7 @@ describe API::V3::Projects do
 
         get v3_api("/projects/#{project.id}/events", other_user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -857,7 +857,7 @@ describe API::V3::Projects do
 
         get v3_api("/projects/#{project.id}/users", current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
 
@@ -886,7 +886,7 @@ describe API::V3::Projects do
       it 'returns a 404 error if not found' do
         get v3_api('/projects/42/users', user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 Project Not Found')
       end
 
@@ -895,7 +895,7 @@ describe API::V3::Projects do
 
         get v3_api("/projects/#{project.id}/users", other_user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -905,7 +905,7 @@ describe API::V3::Projects do
 
     it 'returns an array of project snippets' do
       get v3_api("/projects/#{project.id}/snippets", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.first['title']).to eq(snippet.title)
     end
@@ -914,13 +914,13 @@ describe API::V3::Projects do
   describe 'GET /projects/:id/snippets/:snippet_id' do
     it 'returns a project snippet' do
       get v3_api("/projects/#{project.id}/snippets/#{snippet.id}", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(snippet.title)
     end
 
     it 'returns a 404 error if snippet id not found' do
       get v3_api("/projects/#{project.id}/snippets/1234", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -929,7 +929,7 @@ describe API::V3::Projects do
       post v3_api("/projects/#{project.id}/snippets", user),
         title: 'v3_api test', file_name: 'sample.rb', code: 'test',
         visibility_level: '0'
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('v3_api test')
     end
 
@@ -943,7 +943,7 @@ describe API::V3::Projects do
     it 'updates an existing project snippet' do
       put v3_api("/projects/#{project.id}/snippets/#{snippet.id}", user),
         code: 'updated code'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('example')
       expect(snippet.reload.content).to eq('updated code')
     end
@@ -951,7 +951,7 @@ describe API::V3::Projects do
     it 'updates an existing project snippet with new title' do
       put v3_api("/projects/#{project.id}/snippets/#{snippet.id}", user),
         title: 'other v3_api test'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('other v3_api test')
     end
   end
@@ -963,24 +963,24 @@ describe API::V3::Projects do
       expect do
         delete v3_api("/projects/#{project.id}/snippets/#{snippet.id}", user)
       end.to change { Snippet.count }.by(-1)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'returns 404 when deleting unknown snippet id' do
       delete v3_api("/projects/#{project.id}/snippets/1234", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
   describe 'GET /projects/:id/snippets/:snippet_id/raw' do
     it 'gets a raw project snippet' do
       get v3_api("/projects/#{project.id}/snippets/#{snippet.id}/raw", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'returns a 404 error if raw project snippet not found' do
       get v3_api("/projects/#{project.id}/snippets/5555/raw", user)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -993,13 +993,13 @@ describe API::V3::Projects do
 
       it "is not available for non admin users" do
         post v3_api("/projects/#{project_fork_target.id}/fork/#{project_fork_source.id}", user)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it 'allows project to be forked from an existing project' do
         expect(project_fork_target.forked?).not_to be_truthy
         post v3_api("/projects/#{project_fork_target.id}/fork/#{project_fork_source.id}", admin)
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         project_fork_target.reload
         expect(project_fork_target.forked_from_project.id).to eq(project_fork_source.id)
         expect(project_fork_target.forked_project_link).not_to be_nil
@@ -1016,7 +1016,7 @@ describe API::V3::Projects do
 
       it 'fails if forked_from project which does not exist' do
         post v3_api("/projects/#{project_fork_target.id}/fork/9999", admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'fails with 409 if already forked' do
@@ -1024,7 +1024,7 @@ describe API::V3::Projects do
         project_fork_target.reload
         expect(project_fork_target.forked_from_project.id).to eq(project_fork_source.id)
         post v3_api("/projects/#{project_fork_target.id}/fork/#{new_project_fork_source.id}", admin)
-        expect(response).to have_http_status(409)
+        expect(response).to have_gitlab_http_status(409)
         project_fork_target.reload
         expect(project_fork_target.forked_from_project.id).to eq(project_fork_source.id)
         expect(project_fork_target.forked?).to be_truthy
@@ -1034,7 +1034,7 @@ describe API::V3::Projects do
     describe 'DELETE /projects/:id/fork' do
       it "is not visible to users outside group" do
         delete v3_api("/projects/#{project_fork_target.id}/fork", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       context 'when users belong to project group' do
@@ -1047,7 +1047,7 @@ describe API::V3::Projects do
 
         it 'is forbidden to non-owner users' do
           delete v3_api("/projects/#{project_fork_target.id}/fork", user2)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'makes forked project unforked' do
@@ -1056,7 +1056,7 @@ describe API::V3::Projects do
           expect(project_fork_target.forked_from_project).not_to be_nil
           expect(project_fork_target.forked?).to be_truthy
           delete v3_api("/projects/#{project_fork_target.id}/fork", admin)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           project_fork_target.reload
           expect(project_fork_target.forked_from_project).to be_nil
           expect(project_fork_target.forked?).not_to be_truthy
@@ -1065,7 +1065,7 @@ describe API::V3::Projects do
         it 'is idempotent if not forked' do
           expect(project_fork_target.forked_from_project).to be_nil
           delete v3_api("/projects/#{project_fork_target.id}/fork", admin)
-          expect(response).to have_http_status(304)
+          expect(response).to have_gitlab_http_status(304)
           expect(project_fork_target.reload.forked_from_project).to be_nil
         end
       end
@@ -1082,7 +1082,7 @@ describe API::V3::Projects do
         post v3_api("/projects/#{project.id}/share", user), group_id: group.id, group_access: Gitlab::Access::DEVELOPER, expires_at: expires_at
       end.to change { ProjectGroupLink.count }.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['group_id']).to eq(group.id)
       expect(json_response['group_access']).to eq(Gitlab::Access::DEVELOPER)
       expect(json_response['expires_at']).to eq(expires_at.to_s)
@@ -1090,18 +1090,18 @@ describe API::V3::Projects do
 
     it "returns a 400 error when group id is not given" do
       post v3_api("/projects/#{project.id}/share", user), group_access: Gitlab::Access::DEVELOPER
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 400 error when access level is not given" do
       post v3_api("/projects/#{project.id}/share", user), group_id: group.id
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it "returns a 400 error when sharing is disabled" do
       project.namespace.update(share_with_group_lock: true)
       post v3_api("/projects/#{project.id}/share", user), group_id: group.id, group_access: Gitlab::Access::DEVELOPER
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns a 404 error when user cannot read group' do
@@ -1109,19 +1109,19 @@ describe API::V3::Projects do
 
       post v3_api("/projects/#{project.id}/share", user), group_id: private_group.id, group_access: Gitlab::Access::DEVELOPER
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 404 error when group does not exist' do
       post v3_api("/projects/#{project.id}/share", user), group_id: 1234, group_access: Gitlab::Access::DEVELOPER
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it "returns a 400 error when wrong params passed" do
       post v3_api("/projects/#{project.id}/share", user), group_id: group.id, group_access: 1234
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
       expect(json_response['error']).to eq 'group_access does not have a valid value'
     end
   end
@@ -1133,26 +1133,26 @@ describe API::V3::Projects do
 
       delete v3_api("/projects/#{project.id}/share/#{group.id}", user)
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
       expect(project.project_group_links).to be_empty
     end
 
     it 'returns a 400 when group id is not an integer' do
       delete v3_api("/projects/#{project.id}/share/foo", user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns a 404 error when group link does not exist' do
       delete v3_api("/projects/#{project.id}/share/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 404 error when project does not exist' do
       delete v3_api("/projects/123/share/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -1173,7 +1173,7 @@ describe API::V3::Projects do
       it 'returns project search responses' do
         get v3_api("/projects/search/#{args[:query]}", current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(args[:results])
         json_response.each { |project| expect(project['name']).to match(args[:match_regex] || /.*#{args[:query]}.*/) }
@@ -1216,7 +1216,7 @@ describe API::V3::Projects do
       it 'returns authentication error' do
         project_param = { name: 'bar' }
         put v3_api("/projects/#{project.id}"), project_param
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -1224,7 +1224,7 @@ describe API::V3::Projects do
       it 'updates name' do
         project_param = { name: 'bar' }
         put v3_api("/projects/#{project.id}", user), project_param
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
         end
@@ -1233,7 +1233,7 @@ describe API::V3::Projects do
       it 'updates visibility_level' do
         project_param = { visibility_level: 20 }
         put v3_api("/projects/#{project3.id}", user), project_param
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
         end
@@ -1243,7 +1243,7 @@ describe API::V3::Projects do
         project3.update_attributes({ visibility_level: Gitlab::VisibilityLevel::PUBLIC })
         project_param = { public: false }
         put v3_api("/projects/#{project3.id}", user), project_param
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
         end
@@ -1253,7 +1253,7 @@ describe API::V3::Projects do
       it 'does not update name to existing name' do
         project_param = { name: project3.name }
         put v3_api("/projects/#{project.id}", user), project_param
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['name']).to eq(['has already been taken'])
       end
 
@@ -1262,14 +1262,14 @@ describe API::V3::Projects do
 
         put v3_api("/projects/#{project.id}", user), project_param
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['request_access_enabled']).to eq(false)
       end
 
       it 'updates path & name to existing path & name in different namespace' do
         project_param = { path: project4.path, name: project4.name }
         put v3_api("/projects/#{project3.id}", user), project_param
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
         end
@@ -1280,7 +1280,7 @@ describe API::V3::Projects do
       it 'updates path' do
         project_param = { path: 'bar' }
         put v3_api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
         end
@@ -1294,7 +1294,7 @@ describe API::V3::Projects do
                           description: 'new description' }
 
         put v3_api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project_param.each_pair do |k, v|
           expect(json_response[k.to_s]).to eq(v)
         end
@@ -1303,20 +1303,20 @@ describe API::V3::Projects do
       it 'does not update path to existing path' do
         project_param = { path: project.path }
         put v3_api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['path']).to eq(['has already been taken'])
       end
 
       it 'does not update name' do
         project_param = { name: 'bar' }
         put v3_api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it 'does not update visibility_level' do
         project_param = { visibility_level: 20 }
         put v3_api("/projects/#{project3.id}", user4), project_param
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -1330,7 +1330,7 @@ describe API::V3::Projects do
                           description: 'new description',
                           request_access_enabled: true }
         put v3_api("/projects/#{project.id}", user3), project_param
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -1340,7 +1340,7 @@ describe API::V3::Projects do
       it 'archives the project' do
         post v3_api("/projects/#{project.id}/archive", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['archived']).to be_truthy
       end
     end
@@ -1353,7 +1353,7 @@ describe API::V3::Projects do
       it 'remains archived' do
         post v3_api("/projects/#{project.id}/archive", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['archived']).to be_truthy
       end
     end
@@ -1366,7 +1366,7 @@ describe API::V3::Projects do
       it 'rejects the action' do
         post v3_api("/projects/#{project.id}/archive", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -1376,7 +1376,7 @@ describe API::V3::Projects do
       it 'remains unarchived' do
         post v3_api("/projects/#{project.id}/unarchive", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['archived']).to be_falsey
       end
     end
@@ -1389,7 +1389,7 @@ describe API::V3::Projects do
       it 'unarchives the project' do
         post v3_api("/projects/#{project.id}/unarchive", user)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['archived']).to be_falsey
       end
     end
@@ -1402,7 +1402,7 @@ describe API::V3::Projects do
       it 'rejects the action' do
         post v3_api("/projects/#{project.id}/unarchive", user3)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -1412,7 +1412,7 @@ describe API::V3::Projects do
       it 'stars the project' do
         expect { post v3_api("/projects/#{project.id}/star", user) }.to change { project.reload.star_count }.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['star_count']).to eq(1)
       end
     end
@@ -1426,7 +1426,7 @@ describe API::V3::Projects do
       it 'does not modify the star count' do
         expect { post v3_api("/projects/#{project.id}/star", user) }.not_to change { project.reload.star_count }
 
-        expect(response).to have_http_status(304)
+        expect(response).to have_gitlab_http_status(304)
       end
     end
   end
@@ -1441,7 +1441,7 @@ describe API::V3::Projects do
       it 'unstars the project' do
         expect { delete v3_api("/projects/#{project.id}/star", user) }.to change { project.reload.star_count }.by(-1)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['star_count']).to eq(0)
       end
     end
@@ -1450,7 +1450,7 @@ describe API::V3::Projects do
       it 'does not modify the star count' do
         expect { delete v3_api("/projects/#{project.id}/star", user) }.not_to change { project.reload.star_count }
 
-        expect(response).to have_http_status(304)
+        expect(response).to have_gitlab_http_status(304)
       end
     end
   end
@@ -1459,36 +1459,36 @@ describe API::V3::Projects do
     context 'when authenticated as user' do
       it 'removes project' do
         delete v3_api("/projects/#{project.id}", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'does not remove a project if not an owner' do
         user3 = create(:user)
         project.team << [user3, :developer]
         delete v3_api("/projects/#{project.id}", user3)
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
 
       it 'does not remove a non existing project' do
         delete v3_api('/projects/1328', user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'does not remove a project not attached to user' do
         delete v3_api("/projects/#{project.id}", user2)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
     context 'when authenticated as admin' do
       it 'removes any existing project' do
         delete v3_api("/projects/#{project.id}", admin)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'does not remove a non existing project' do
         delete v3_api('/projects/1328', admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/v3/repositories_spec.rb b/spec/requests/api/v3/repositories_spec.rb
index 67624a0bbea..0167eb2c4f6 100644
--- a/spec/requests/api/v3/repositories_spec.rb
+++ b/spec/requests/api/v3/repositories_spec.rb
@@ -17,7 +17,7 @@ describe API::V3::Repositories do
       it 'returns the repository tree' do
         get v3_api(route, current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
 
         first_commit = json_response.first
@@ -107,7 +107,7 @@ describe API::V3::Repositories do
       shared_examples_for 'repository blob' do
         it 'returns the repository blob' do
           get v3_api(route, current_user)
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
         context 'when sha does not exist' do
           it_behaves_like '404 response' do
@@ -162,7 +162,7 @@ describe API::V3::Repositories do
     shared_examples_for 'repository raw blob' do
       it 'returns the repository raw blob' do
         get v3_api(route, current_user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
       context 'when sha does not exist' do
         it_behaves_like '404 response' do
@@ -205,7 +205,7 @@ describe API::V3::Repositories do
     shared_examples_for 'repository archive' do
       it 'returns the repository archive' do
         get v3_api(route, current_user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         repo_name = project.repository.name.gsub("\.git", "")
         type, params = workhorse_send_data
         expect(type).to eq('git-archive')
@@ -213,7 +213,7 @@ describe API::V3::Repositories do
       end
       it 'returns the repository archive archive.zip' do
         get v3_api("/projects/#{project.id}/repository/archive.zip", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         repo_name = project.repository.name.gsub("\.git", "")
         type, params = workhorse_send_data
         expect(type).to eq('git-archive')
@@ -221,7 +221,7 @@ describe API::V3::Repositories do
       end
       it 'returns the repository archive archive.tar.bz2' do
         get v3_api("/projects/#{project.id}/repository/archive.tar.bz2", user)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         repo_name = project.repository.name.gsub("\.git", "")
         type, params = workhorse_send_data
         expect(type).to eq('git-archive')
@@ -263,32 +263,32 @@ describe API::V3::Repositories do
     shared_examples_for 'repository compare' do
       it "compares branches" do
         get v3_api(route, current_user), from: 'master', to: 'feature'
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_present
         expect(json_response['diffs']).to be_present
       end
       it "compares tags" do
         get v3_api(route, current_user), from: 'v1.0.0', to: 'v1.1.0'
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_present
         expect(json_response['diffs']).to be_present
       end
       it "compares commits" do
         get v3_api(route, current_user), from: sample_commit.id, to: sample_commit.parent_id
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_empty
         expect(json_response['diffs']).to be_empty
         expect(json_response['compare_same_ref']).to be_falsey
       end
       it "compares commits in reverse order" do
         get v3_api(route, current_user), from: sample_commit.parent_id, to: sample_commit.id
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_present
         expect(json_response['diffs']).to be_present
       end
       it "compares same refs" do
         get v3_api(route, current_user), from: 'master', to: 'master'
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['commits']).to be_empty
         expect(json_response['diffs']).to be_empty
         expect(json_response['compare_same_ref']).to be_truthy
@@ -325,7 +325,7 @@ describe API::V3::Repositories do
       it 'returns valid data' do
         get v3_api(route, current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
 
         first_contributor = json_response.first
diff --git a/spec/requests/api/v3/runners_spec.rb b/spec/requests/api/v3/runners_spec.rb
index a31eb3f1d43..c91b097a3c7 100644
--- a/spec/requests/api/v3/runners_spec.rb
+++ b/spec/requests/api/v3/runners_spec.rb
@@ -37,7 +37,7 @@ describe API::V3::Runners do
           expect do
             delete v3_api("/runners/#{shared_runner.id}", admin)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end.to change { Ci::Runner.shared.count }.by(-1)
         end
       end
@@ -47,7 +47,7 @@ describe API::V3::Runners do
           expect do
             delete v3_api("/runners/#{unused_specific_runner.id}", admin)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end.to change { Ci::Runner.specific.count }.by(-1)
         end
 
@@ -55,7 +55,7 @@ describe API::V3::Runners do
           expect do
             delete v3_api("/runners/#{specific_runner.id}", admin)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end.to change { Ci::Runner.specific.count }.by(-1)
         end
       end
@@ -63,7 +63,7 @@ describe API::V3::Runners do
       it 'returns 404 if runner does not exists' do
         delete v3_api('/runners/9999', admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -71,26 +71,26 @@ describe API::V3::Runners do
       context 'when runner is shared' do
         it 'does not delete runner' do
           delete v3_api("/runners/#{shared_runner.id}", user)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
       context 'when runner is not shared' do
         it 'does not delete runner without access to it' do
           delete v3_api("/runners/#{specific_runner.id}", user2)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'does not delete runner with more than one associated project' do
           delete v3_api("/runners/#{two_projects_runner.id}", user)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
 
         it 'deletes runner for one owned project' do
           expect do
             delete v3_api("/runners/#{specific_runner.id}", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end.to change { Ci::Runner.specific.count }.by(-1)
         end
       end
@@ -100,7 +100,7 @@ describe API::V3::Runners do
       it 'does not delete runner' do
         delete v3_api("/runners/#{specific_runner.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -112,7 +112,7 @@ describe API::V3::Runners do
           expect do
             delete v3_api("/projects/#{project.id}/runners/#{two_projects_runner.id}", user)
 
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end.to change { project.runners.count }.by(-1)
         end
       end
@@ -122,14 +122,14 @@ describe API::V3::Runners do
           expect do
             delete v3_api("/projects/#{project.id}/runners/#{specific_runner.id}", user)
           end.to change { project.runners.count }.by(0)
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
       it 'returns 404 is runner is not found' do
         delete v3_api("/projects/#{project.id}/runners/9999", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -137,7 +137,7 @@ describe API::V3::Runners do
       it "does not disable project's runner" do
         delete v3_api("/projects/#{project.id}/runners/#{specific_runner.id}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -145,7 +145,7 @@ describe API::V3::Runners do
       it "does not disable project's runner" do
         delete v3_api("/projects/#{project.id}/runners/#{specific_runner.id}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/v3/services_spec.rb b/spec/requests/api/v3/services_spec.rb
index f0fa48e22df..8f212ab6be6 100644
--- a/spec/requests/api/v3/services_spec.rb
+++ b/spec/requests/api/v3/services_spec.rb
@@ -13,7 +13,7 @@ describe API::V3::Services do
       it "deletes #{service}" do
         delete v3_api("/projects/#{project.id}/services/#{dashed_service}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         project.send(service_method).reload
         expect(project.send(service_method).activated?).to be_falsey
       end
diff --git a/spec/requests/api/v3/settings_spec.rb b/spec/requests/api/v3/settings_spec.rb
index 291f6dcc2aa..25fa0a8aabd 100644
--- a/spec/requests/api/v3/settings_spec.rb
+++ b/spec/requests/api/v3/settings_spec.rb
@@ -7,7 +7,7 @@ describe API::V3::Settings, 'Settings' do
   describe "GET /application/settings" do
     it "returns application settings" do
       get v3_api("/application/settings", admin)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Hash
       expect(json_response['default_projects_limit']).to eq(42)
       expect(json_response['password_authentication_enabled']).to be_truthy
@@ -30,7 +30,7 @@ describe API::V3::Settings, 'Settings' do
         put v3_api("/application/settings", admin),
           default_projects_limit: 3, password_authentication_enabled: false, repository_storage: 'custom', koding_enabled: true, koding_url: 'http://koding.example.com',
           plantuml_enabled: true, plantuml_url: 'http://plantuml.example.com'
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['default_projects_limit']).to eq(3)
         expect(json_response['password_authentication_enabled']).to be_falsey
         expect(json_response['repository_storage']).to eq('custom')
@@ -46,7 +46,7 @@ describe API::V3::Settings, 'Settings' do
       it "returns a blank parameter error message" do
         put v3_api("/application/settings", admin), koding_enabled: true
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('koding_url is missing')
       end
     end
@@ -55,7 +55,7 @@ describe API::V3::Settings, 'Settings' do
       it "returns a blank parameter error message" do
         put v3_api("/application/settings", admin), plantuml_enabled: true
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('plantuml_url is missing')
       end
     end
diff --git a/spec/requests/api/v3/snippets_spec.rb b/spec/requests/api/v3/snippets_spec.rb
index 79860725634..e8913039194 100644
--- a/spec/requests/api/v3/snippets_spec.rb
+++ b/spec/requests/api/v3/snippets_spec.rb
@@ -11,7 +11,7 @@ describe API::V3::Snippets do
 
       get v3_api("/snippets/", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.map { |snippet| snippet['id']} ).to contain_exactly(
         public_snippet.id,
         internal_snippet.id,
@@ -24,7 +24,7 @@ describe API::V3::Snippets do
       create(:personal_snippet, :private)
 
       get v3_api("/snippets/", user)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to eq(0)
     end
   end
@@ -41,7 +41,7 @@ describe API::V3::Snippets do
     it 'returns all snippets with public visibility from all users' do
       get v3_api("/snippets/public", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.map { |snippet| snippet['id']} ).to contain_exactly(
         public_snippet.id,
         public_snippet_other.id)
@@ -60,7 +60,7 @@ describe API::V3::Snippets do
     it 'returns raw text' do
       get v3_api("/snippets/#{snippet.id}/raw", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response.content_type).to eq 'text/plain'
       expect(response.body).to eq(snippet.content)
     end
@@ -68,7 +68,7 @@ describe API::V3::Snippets do
     it 'returns 404 for invalid snippet id' do
       delete v3_api("/snippets/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
   end
@@ -88,7 +88,7 @@ describe API::V3::Snippets do
         post v3_api("/snippets/", user), params
       end.to change { PersonalSnippet.count }.by(1)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq(params[:title])
       expect(json_response['file_name']).to eq(params[:file_name])
     end
@@ -98,7 +98,7 @@ describe API::V3::Snippets do
 
       post v3_api("/snippets/", user), params
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     context 'when the snippet is spam' do
@@ -121,7 +121,7 @@ describe API::V3::Snippets do
         it 'rejects the shippet' do
           expect { create_snippet(visibility_level: Snippet::PUBLIC) }
             .not_to change { Snippet.count }
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
         end
 
         it 'creates a spam log' do
@@ -140,7 +140,7 @@ describe API::V3::Snippets do
 
       put v3_api("/snippets/#{public_snippet.id}", user), content: new_content
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       public_snippet.reload
       expect(public_snippet.content).to eq(new_content)
     end
@@ -148,21 +148,21 @@ describe API::V3::Snippets do
     it 'returns 404 for invalid snippet id' do
       put v3_api("/snippets/1234", user), title: 'foo'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
 
     it "returns 404 for another user's snippet" do
       put v3_api("/snippets/#{public_snippet.id}", other_user), title: 'fubar'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
 
     it 'returns 400 for missing parameters' do
       put v3_api("/snippets/1234", user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
   end
 
@@ -172,14 +172,14 @@ describe API::V3::Snippets do
       expect do
         delete v3_api("/snippets/#{public_snippet.id}", user)
 
-        expect(response).to have_http_status(204)
+        expect(response).to have_gitlab_http_status(204)
       end.to change { PersonalSnippet.count }.by(-1)
     end
 
     it 'returns 404 for invalid snippet id' do
       delete v3_api("/snippets/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 Snippet Not Found')
     end
   end
diff --git a/spec/requests/api/v3/system_hooks_spec.rb b/spec/requests/api/v3/system_hooks_spec.rb
index ae427541abb..30711c60faa 100644
--- a/spec/requests/api/v3/system_hooks_spec.rb
+++ b/spec/requests/api/v3/system_hooks_spec.rb
@@ -12,7 +12,7 @@ describe API::V3::SystemHooks do
       it "returns authentication error" do
         get v3_api("/hooks")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -20,7 +20,7 @@ describe API::V3::SystemHooks do
       it "returns forbidden error" do
         get v3_api("/hooks", user)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -28,7 +28,7 @@ describe API::V3::SystemHooks do
       it "returns an array of hooks" do
         get v3_api("/hooks", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['url']).to eq(hook.url)
         expect(json_response.first['push_events']).to be false
@@ -43,14 +43,14 @@ describe API::V3::SystemHooks do
       expect do
         delete v3_api("/hooks/#{hook.id}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end.to change { SystemHook.count }.by(-1)
     end
 
     it 'returns 404 if the system hook does not exist' do
       delete v3_api('/hooks/12345', admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 end
diff --git a/spec/requests/api/v3/tags_spec.rb b/spec/requests/api/v3/tags_spec.rb
index 1c4b25c47c3..e6ad005fa87 100644
--- a/spec/requests/api/v3/tags_spec.rb
+++ b/spec/requests/api/v3/tags_spec.rb
@@ -17,7 +17,7 @@ describe API::V3::Tags do
       it 'returns the repository tags' do
         get v3_api("/projects/#{project.id}/repository/tags", current_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(tag_name)
       end
@@ -40,7 +40,7 @@ describe API::V3::Tags do
       it "returns an array of project tags" do
         get v3_api("/projects/#{project.id}/repository/tags", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(tag_name)
       end
@@ -55,7 +55,7 @@ describe API::V3::Tags do
       it "returns an array of project tags with release info" do
         get v3_api("/projects/#{project.id}/repository/tags", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['name']).to eq(tag_name)
         expect(json_response.first['message']).to eq('Version 1.1.0')
@@ -75,13 +75,13 @@ describe API::V3::Tags do
       it 'deletes an existing tag' do
         delete v3_api("/projects/#{project.id}/repository/tags/#{tag_name}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['tag_name']).to eq(tag_name)
       end
 
       it 'raises 404 if the tag does not exist' do
         delete v3_api("/projects/#{project.id}/repository/tags/foobar", user)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
diff --git a/spec/requests/api/v3/templates_spec.rb b/spec/requests/api/v3/templates_spec.rb
index 00446c7f29c..38a8994eb79 100644
--- a/spec/requests/api/v3/templates_spec.rb
+++ b/spec/requests/api/v3/templates_spec.rb
@@ -19,7 +19,7 @@ describe API::V3::Templates do
     it 'returns a list of available gitignore templates' do
       get v3_api(path)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.size).to be > 15
     end
@@ -29,7 +29,7 @@ describe API::V3::Templates do
     it 'returns a list of available gitlab_ci_ymls' do
       get v3_api(path)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.first['name']).not_to be_nil
     end
@@ -39,7 +39,7 @@ describe API::V3::Templates do
     it 'adds a disclaimer on the top' do
       get v3_api(path)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['content']).to start_with("# This file is a template,")
     end
   end
@@ -66,7 +66,7 @@ describe API::V3::Templates do
     it 'returns a list of available license templates' do
       get v3_api(path)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(12)
       expect(json_response.map { |l| l['key'] }).to include('agpl-3.0')
@@ -77,7 +77,7 @@ describe API::V3::Templates do
         it 'returns a list of available popular license templates' do
           get v3_api("#{path}?popular=1")
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response).to be_an Array
           expect(json_response.size).to eq(3)
           expect(json_response.map { |l| l['key'] }).to include('apache-2.0')
@@ -159,7 +159,7 @@ describe API::V3::Templates do
         let(:license_type) { 'muth-over9000' }
 
         it 'returns a 404' do
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
diff --git a/spec/requests/api/v3/triggers_spec.rb b/spec/requests/api/v3/triggers_spec.rb
index 7ccf387f2dc..e8e2f49d7a0 100644
--- a/spec/requests/api/v3/triggers_spec.rb
+++ b/spec/requests/api/v3/triggers_spec.rb
@@ -27,17 +27,17 @@ describe API::V3::Triggers do
     context 'Handles errors' do
       it 'returns bad request if token is missing' do
         post v3_api("/projects/#{project.id}/trigger/builds"), ref: 'master'
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
 
       it 'returns not found if project is not found' do
         post v3_api('/projects/0/trigger/builds'), options.merge(ref: 'master')
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'returns unauthorized if token is for different project' do
         post v3_api("/projects/#{project2.id}/trigger/builds"), options.merge(ref: 'master')
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -46,7 +46,7 @@ describe API::V3::Triggers do
 
       it 'creates builds' do
         post v3_api("/projects/#{project.id}/trigger/builds"), options.merge(ref: 'master')
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         pipeline.builds.reload
         expect(pipeline.builds.pending.size).to eq(2)
         expect(pipeline.builds.size).to eq(5)
@@ -54,7 +54,7 @@ describe API::V3::Triggers do
 
       it 'returns bad request with no builds created if there\'s no commit for that ref' do
         post v3_api("/projects/#{project.id}/trigger/builds"), options.merge(ref: 'other-branch')
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['base'])
           .to contain_exactly('Reference not found')
       end
@@ -66,19 +66,19 @@ describe API::V3::Triggers do
 
         it 'validates variables to be a hash' do
           post v3_api("/projects/#{project.id}/trigger/builds"), options.merge(variables: 'value', ref: 'master')
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['error']).to eq('variables is invalid')
         end
 
         it 'validates variables needs to be a map of key-valued strings' do
           post v3_api("/projects/#{project.id}/trigger/builds"), options.merge(variables: { key: %w(1 2) }, ref: 'master')
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(json_response['message']).to eq('variables needs to be a map of key-valued strings')
         end
 
         it 'creates trigger request with variables' do
           post v3_api("/projects/#{project.id}/trigger/builds"), options.merge(variables: variables, ref: 'master')
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           pipeline.builds.reload
           expect(pipeline.variables.map { |v| { v.key => v.value } }.first).to eq(variables)
           expect(json_response['variables']).to eq(variables)
@@ -91,7 +91,7 @@ describe API::V3::Triggers do
         expect do
           post v3_api("/projects/#{project.id}/ref/master/trigger/builds?token=#{trigger_token}"), { ref: 'refs/heads/other-branch' }
         end.to change(project.builds, :count).by(5)
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       context 'when ref contains a dot' do
@@ -102,7 +102,7 @@ describe API::V3::Triggers do
             post v3_api("/projects/#{project.id}/ref/v.1-branch/trigger/builds?token=#{trigger_token}"), { ref: 'refs/heads/other-branch' }
           end.to change(project.builds, :count).by(4)
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
         end
       end
     end
@@ -113,7 +113,7 @@ describe API::V3::Triggers do
       it 'returns list of triggers' do
         get v3_api("/projects/#{project.id}/triggers", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_a(Array)
         expect(json_response[0]).to have_key('token')
@@ -124,7 +124,7 @@ describe API::V3::Triggers do
       it 'does not return triggers list' do
         get v3_api("/projects/#{project.id}/triggers", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -132,7 +132,7 @@ describe API::V3::Triggers do
       it 'does not return triggers list' do
         get v3_api("/projects/#{project.id}/triggers")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -142,14 +142,14 @@ describe API::V3::Triggers do
       it 'returns trigger details' do
         get v3_api("/projects/#{project.id}/triggers/#{trigger.token}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_a(Hash)
       end
 
       it 'responds with 404 Not Found if requesting non-existing trigger' do
         get v3_api("/projects/#{project.id}/triggers/abcdef012345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -157,7 +157,7 @@ describe API::V3::Triggers do
       it 'does not return triggers list' do
         get v3_api("/projects/#{project.id}/triggers/#{trigger.token}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -165,7 +165,7 @@ describe API::V3::Triggers do
       it 'does not return triggers list' do
         get v3_api("/projects/#{project.id}/triggers/#{trigger.token}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -177,7 +177,7 @@ describe API::V3::Triggers do
           post v3_api("/projects/#{project.id}/triggers", user)
         end.to change {project.triggers.count}.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response).to be_a(Hash)
       end
     end
@@ -186,7 +186,7 @@ describe API::V3::Triggers do
       it 'does not create trigger' do
         post v3_api("/projects/#{project.id}/triggers", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -194,7 +194,7 @@ describe API::V3::Triggers do
       it 'does not create trigger' do
         post v3_api("/projects/#{project.id}/triggers")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -205,14 +205,14 @@ describe API::V3::Triggers do
         expect do
           delete v3_api("/projects/#{project.id}/triggers/#{trigger.token}", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end.to change {project.triggers.count}.by(-1)
       end
 
       it 'responds with 404 Not Found if requesting non-existing trigger' do
         delete v3_api("/projects/#{project.id}/triggers/abcdef012345", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -220,7 +220,7 @@ describe API::V3::Triggers do
       it 'does not delete trigger' do
         delete v3_api("/projects/#{project.id}/triggers/#{trigger.token}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -228,7 +228,7 @@ describe API::V3::Triggers do
       it 'does not delete trigger' do
         delete v3_api("/projects/#{project.id}/triggers/#{trigger.token}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/v3/users_spec.rb b/spec/requests/api/v3/users_spec.rb
index 227b8d1b0c1..bbd05f240d2 100644
--- a/spec/requests/api/v3/users_spec.rb
+++ b/spec/requests/api/v3/users_spec.rb
@@ -12,7 +12,7 @@ describe API::V3::Users do
       it 'returns an array of users' do
         get v3_api('/users', user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         username = user.username
@@ -45,14 +45,14 @@ describe API::V3::Users do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get v3_api("/users/#{user.id}/keys")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context 'when authenticated' do
       it 'returns 404 for non-existing user' do
         get v3_api('/users/999999/keys', admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
@@ -62,7 +62,7 @@ describe API::V3::Users do
 
         get v3_api("/users/#{user.id}/keys", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['title']).to eq(key.title)
       end
@@ -88,14 +88,14 @@ describe API::V3::Users do
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get v3_api("/users/#{user.id}/emails")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
     context 'when authenticated' do
       it 'returns 404 for non-existing user' do
         get v3_api('/users/999999/emails', admin)
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
@@ -105,7 +105,7 @@ describe API::V3::Users do
 
         get v3_api("/users/#{user.id}/emails", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['email']).to eq(email.email)
       end
@@ -113,7 +113,7 @@ describe API::V3::Users do
       it "returns a 404 for invalid ID" do
         put v3_api("/users/ASDF/emails", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -122,7 +122,7 @@ describe API::V3::Users do
     context "when unauthenticated" do
       it "returns authentication error" do
         get v3_api("/user/keys")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -133,7 +133,7 @@ describe API::V3::Users do
 
         get v3_api("/user/keys", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first["title"]).to eq(key.title)
       end
@@ -144,7 +144,7 @@ describe API::V3::Users do
     context "when unauthenticated" do
       it "returns authentication error" do
         get v3_api("/user/emails")
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
 
@@ -155,7 +155,7 @@ describe API::V3::Users do
 
         get v3_api("/user/emails", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first["email"]).to eq(email.email)
       end
@@ -166,25 +166,25 @@ describe API::V3::Users do
     before { admin }
     it 'blocks existing user' do
       put v3_api("/users/#{user.id}/block", admin)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(user.reload.state).to eq('blocked')
     end
 
     it 'does not re-block ldap blocked users' do
       put v3_api("/users/#{ldap_blocked_user.id}/block", admin)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(ldap_blocked_user.reload.state).to eq('ldap_blocked')
     end
 
     it 'does not be available for non admin users' do
       put v3_api("/users/#{user.id}/block", user)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(user.reload.state).to eq('active')
     end
 
     it 'returns a 404 error if user id not found' do
       put v3_api('/users/9999/block', admin)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
   end
@@ -195,38 +195,38 @@ describe API::V3::Users do
 
     it 'unblocks existing user' do
       put v3_api("/users/#{user.id}/unblock", admin)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(user.reload.state).to eq('active')
     end
 
     it 'unblocks a blocked user' do
       put v3_api("/users/#{blocked_user.id}/unblock", admin)
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(blocked_user.reload.state).to eq('active')
     end
 
     it 'does not unblock ldap blocked users' do
       put v3_api("/users/#{ldap_blocked_user.id}/unblock", admin)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(ldap_blocked_user.reload.state).to eq('ldap_blocked')
     end
 
     it 'does not be available for non admin users' do
       put v3_api("/users/#{user.id}/unblock", user)
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(user.reload.state).to eq('active')
     end
 
     it 'returns a 404 error if user id not found' do
       put v3_api('/users/9999/block', admin)
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it "returns a 404 for invalid ID" do
       put v3_api("/users/ASDF/block", admin)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -246,7 +246,7 @@ describe API::V3::Users do
 
         get api("/users/#{user.id}/events", other_user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_empty
       end
     end
@@ -262,7 +262,7 @@ describe API::V3::Users do
         end
 
         it 'responds with HTTP 200 OK' do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
 
         it 'includes the push payload as a Hash' do
@@ -281,7 +281,7 @@ describe API::V3::Users do
         it 'returns the "joined" event' do
           get v3_api("/users/#{user.id}/events", user)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(response).to include_pagination_headers
           expect(json_response).to be_an Array
 
@@ -327,7 +327,7 @@ describe API::V3::Users do
     it 'returns a 404 error if not found' do
       get v3_api('/users/420/events', user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
   end
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
index 48592e12822..79ee6c126f6 100644
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -13,7 +13,7 @@ describe API::Variables do
       it 'returns project variables' do
         get api("/projects/#{project.id}/variables", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_a(Array)
       end
     end
@@ -22,7 +22,7 @@ describe API::Variables do
       it 'does not return project variables' do
         get api("/projects/#{project.id}/variables", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -30,7 +30,7 @@ describe API::Variables do
       it 'does not return project variables' do
         get api("/projects/#{project.id}/variables")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -40,7 +40,7 @@ describe API::Variables do
       it 'returns project variable details' do
         get api("/projects/#{project.id}/variables/#{variable.key}", user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['value']).to eq(variable.value)
         expect(json_response['protected']).to eq(variable.protected?)
       end
@@ -48,7 +48,7 @@ describe API::Variables do
       it 'responds with 404 Not Found if requesting non-existing variable' do
         get api("/projects/#{project.id}/variables/non_existing_variable", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -56,7 +56,7 @@ describe API::Variables do
       it 'does not return project variable details' do
         get api("/projects/#{project.id}/variables/#{variable.key}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -64,7 +64,7 @@ describe API::Variables do
       it 'does not return project variable details' do
         get api("/projects/#{project.id}/variables/#{variable.key}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -76,7 +76,7 @@ describe API::Variables do
           post api("/projects/#{project.id}/variables", user), key: 'TEST_VARIABLE_2', value: 'VALUE_2', protected: true
         end.to change {project.variables.count}.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['key']).to eq('TEST_VARIABLE_2')
         expect(json_response['value']).to eq('VALUE_2')
         expect(json_response['protected']).to be_truthy
@@ -87,7 +87,7 @@ describe API::Variables do
           post api("/projects/#{project.id}/variables", user), key: 'TEST_VARIABLE_2', value: 'VALUE_2'
         end.to change {project.variables.count}.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['key']).to eq('TEST_VARIABLE_2')
         expect(json_response['value']).to eq('VALUE_2')
         expect(json_response['protected']).to be_falsey
@@ -98,7 +98,7 @@ describe API::Variables do
           post api("/projects/#{project.id}/variables", user), key: variable.key, value: 'VALUE_2'
         end.to change {project.variables.count}.by(0)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
       end
     end
 
@@ -106,7 +106,7 @@ describe API::Variables do
       it 'does not create variable' do
         post api("/projects/#{project.id}/variables", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -114,7 +114,7 @@ describe API::Variables do
       it 'does not create variable' do
         post api("/projects/#{project.id}/variables")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -129,7 +129,7 @@ describe API::Variables do
 
         updated_variable = project.variables.first
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(value_before).to eq(variable.value)
         expect(updated_variable.value).to eq('VALUE_1_UP')
         expect(updated_variable).to be_protected
@@ -138,7 +138,7 @@ describe API::Variables do
       it 'responds with 404 Not Found if requesting non-existing variable' do
         put api("/projects/#{project.id}/variables/non_existing_variable", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -146,7 +146,7 @@ describe API::Variables do
       it 'does not update variable' do
         put api("/projects/#{project.id}/variables/#{variable.key}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -154,7 +154,7 @@ describe API::Variables do
       it 'does not update variable' do
         put api("/projects/#{project.id}/variables/#{variable.key}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
@@ -165,14 +165,14 @@ describe API::Variables do
         expect do
           delete api("/projects/#{project.id}/variables/#{variable.key}", user)
 
-          expect(response).to have_http_status(204)
+          expect(response).to have_gitlab_http_status(204)
         end.to change {project.variables.count}.by(-1)
       end
 
       it 'responds with 404 Not Found if requesting non-existing variable' do
         delete api("/projects/#{project.id}/variables/non_existing_variable", user)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -180,7 +180,7 @@ describe API::Variables do
       it 'does not delete variable' do
         delete api("/projects/#{project.id}/variables/#{variable.key}", user2)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
 
@@ -188,7 +188,7 @@ describe API::Variables do
       it 'does not delete variable' do
         delete api("/projects/#{project.id}/variables/#{variable.key}")
 
-        expect(response).to have_http_status(401)
+        expect(response).to have_gitlab_http_status(401)
       end
     end
   end
diff --git a/spec/requests/api/wikis_spec.rb b/spec/requests/api/wikis_spec.rb
index 9e889d1eecf..65bd001e491 100644
--- a/spec/requests/api/wikis_spec.rb
+++ b/spec/requests/api/wikis_spec.rb
@@ -26,7 +26,7 @@ describe API::Wikis do
       it 'returns the list of wiki pages without content' do
         get api(url, user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.size).to eq(2)
 
         json_response.each_with_index do |page, index|
@@ -39,7 +39,7 @@ describe API::Wikis do
       it 'returns the list of wiki pages with content' do
         get api(url, user), with_content: 1
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.size).to eq(2)
 
         json_response.each_with_index do |page, index|
@@ -54,14 +54,14 @@ describe API::Wikis do
     it 'return the empty list of wiki pages' do
       get api(url, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to eq(0)
     end
   end
 
   shared_examples_for 'returns wiki page' do
     it 'returns the wiki page' do
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to eq(4)
       expect(json_response.keys).to match_array(expected_keys_with_content)
       expect(json_response['content']).to eq(page.content)
@@ -74,7 +74,7 @@ describe API::Wikis do
     it 'creates the wiki page' do
       post(api(url, user), payload)
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response.size).to eq(4)
       expect(json_response.keys).to match_array(expected_keys_with_content)
       expect(json_response['content']).to eq(payload[:content])
@@ -89,7 +89,7 @@ describe API::Wikis do
 
         post(api(url, user), payload)
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response.size).to eq(1)
         expect(json_response['error']).to eq("#{part} is missing")
       end
@@ -98,7 +98,7 @@ describe API::Wikis do
 
   shared_examples_for 'updates wiki page' do
     it 'updates the wiki page' do
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to eq(4)
       expect(json_response.keys).to match_array(expected_keys_with_content)
       expect(json_response['content']).to eq(payload[:content])
@@ -109,7 +109,7 @@ describe API::Wikis do
 
   shared_examples_for '403 Forbidden' do
     it 'returns 403 Forbidden' do
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
       expect(json_response.size).to eq(1)
       expect(json_response['message']).to eq('403 Forbidden')
     end
@@ -117,7 +117,7 @@ describe API::Wikis do
 
   shared_examples_for '404 Wiki Page Not Found' do
     it 'returns 404 Wiki Page Not Found' do
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response.size).to eq(1)
       expect(json_response['message']).to eq('404 Wiki Page Not Found')
     end
@@ -125,7 +125,7 @@ describe API::Wikis do
 
   shared_examples_for '404 Project Not Found' do
     it 'returns 404 Project Not Found' do
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
       expect(json_response.size).to eq(1)
       expect(json_response['message']).to eq('404 Project Not Found')
     end
@@ -133,7 +133,7 @@ describe API::Wikis do
 
   shared_examples_for '204 No Content' do
     it 'returns 204 No Content' do
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
     end
   end
 
diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index ecac40e301b..cd52194033a 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -9,7 +9,7 @@ describe 'Git HTTP requests' do
     context "when no credentials are provided" do
       it "responds to downloads with status 401 Unauthorized (no project existence information leak)" do
         download(path) do |response|
-          expect(response).to have_http_status(:unauthorized)
+          expect(response).to have_gitlab_http_status(:unauthorized)
           expect(response.header['WWW-Authenticate']).to start_with('Basic ')
         end
       end
@@ -18,7 +18,7 @@ describe 'Git HTTP requests' do
     context "when only username is provided" do
       it "responds to downloads with status 401 Unauthorized" do
         download(path, user: user.username) do |response|
-          expect(response).to have_http_status(:unauthorized)
+          expect(response).to have_gitlab_http_status(:unauthorized)
           expect(response.header['WWW-Authenticate']).to start_with('Basic ')
         end
       end
@@ -28,7 +28,7 @@ describe 'Git HTTP requests' do
       context "when authentication fails" do
         it "responds to downloads with status 401 Unauthorized" do
           download(path, user: user.username, password: "wrong-password") do |response|
-            expect(response).to have_http_status(:unauthorized)
+            expect(response).to have_gitlab_http_status(:unauthorized)
             expect(response.header['WWW-Authenticate']).to start_with('Basic ')
           end
         end
@@ -37,7 +37,7 @@ describe 'Git HTTP requests' do
       context "when authentication succeeds" do
         it "does not respond to downloads with status 401 Unauthorized" do
           download(path, user: user.username, password: user.password) do |response|
-            expect(response).not_to have_http_status(:unauthorized)
+            expect(response).not_to have_gitlab_http_status(:unauthorized)
             expect(response.header['WWW-Authenticate']).to be_nil
           end
         end
@@ -49,7 +49,7 @@ describe 'Git HTTP requests' do
     context "when no credentials are provided" do
       it "responds to uploads with status 401 Unauthorized (no project existence information leak)" do
         upload(path) do |response|
-          expect(response).to have_http_status(:unauthorized)
+          expect(response).to have_gitlab_http_status(:unauthorized)
           expect(response.header['WWW-Authenticate']).to start_with('Basic ')
         end
       end
@@ -58,7 +58,7 @@ describe 'Git HTTP requests' do
     context "when only username is provided" do
       it "responds to uploads with status 401 Unauthorized" do
         upload(path, user: user.username) do |response|
-          expect(response).to have_http_status(:unauthorized)
+          expect(response).to have_gitlab_http_status(:unauthorized)
           expect(response.header['WWW-Authenticate']).to start_with('Basic ')
         end
       end
@@ -68,7 +68,7 @@ describe 'Git HTTP requests' do
       context "when authentication fails" do
         it "responds to uploads with status 401 Unauthorized" do
           upload(path, user: user.username, password: "wrong-password") do |response|
-            expect(response).to have_http_status(:unauthorized)
+            expect(response).to have_gitlab_http_status(:unauthorized)
             expect(response.header['WWW-Authenticate']).to start_with('Basic ')
           end
         end
@@ -77,7 +77,7 @@ describe 'Git HTTP requests' do
       context "when authentication succeeds" do
         it "does not respond to uploads with status 401 Unauthorized" do
           upload(path, user: user.username, password: user.password) do |response|
-            expect(response).not_to have_http_status(:unauthorized)
+            expect(response).not_to have_gitlab_http_status(:unauthorized)
             expect(response.header['WWW-Authenticate']).to be_nil
           end
         end
@@ -88,7 +88,7 @@ describe 'Git HTTP requests' do
   shared_examples_for 'pulls are allowed' do
     it do
       download(path, env) do |response|
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response.content_type.to_s).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
       end
     end
@@ -97,7 +97,7 @@ describe 'Git HTTP requests' do
   shared_examples_for 'pushes are allowed' do
     it do
       upload(path, env) do |response|
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response.content_type.to_s).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
       end
     end
@@ -115,7 +115,7 @@ describe 'Git HTTP requests' do
       context 'when authenticated' do
         it 'rejects downloads and uploads with 404 Not Found' do
           download_or_upload(path, user: user.username, password: user.password) do |response|
-            expect(response).to have_http_status(:not_found)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
         end
       end
@@ -165,7 +165,7 @@ describe 'Git HTTP requests' do
 
             it 'rejects pushes with 403 Forbidden' do
               upload(path, env) do |response|
-                expect(response).to have_http_status(:forbidden)
+                expect(response).to have_gitlab_http_status(:forbidden)
                 expect(response.body).to eq(git_access_wiki_error(:write_to_wiki))
               end
             end
@@ -190,13 +190,13 @@ describe 'Git HTTP requests' do
 
               it 'allows clones' do
                 download(path, user: user.username, password: user.password) do |response|
-                  expect(response).to have_http_status(:ok)
+                  expect(response).to have_gitlab_http_status(:ok)
                 end
               end
 
               it 'pushes are allowed' do
                 upload(path, user: user.username, password: user.password) do |response|
-                  expect(response).to have_http_status(:ok)
+                  expect(response).to have_gitlab_http_status(:ok)
                 end
               end
             end
@@ -205,14 +205,14 @@ describe 'Git HTTP requests' do
           context 'and not on the team' do
             it 'rejects clones with 404 Not Found' do
               download(path, user: user.username, password: user.password) do |response|
-                expect(response).to have_http_status(:not_found)
+                expect(response).to have_gitlab_http_status(:not_found)
                 expect(response.body).to eq(git_access_error(:project_not_found))
               end
             end
 
             it 'rejects pushes with 404 Not Found' do
               upload(path, user: user.username, password: user.password) do |response|
-                expect(response).to have_http_status(:not_found)
+                expect(response).to have_gitlab_http_status(:not_found)
                 expect(response.body).to eq(git_access_error(:project_not_found))
               end
             end
@@ -253,7 +253,7 @@ describe 'Git HTTP requests' do
 
               it 'rejects pushes with 403 Forbidden' do
                 upload(path, env) do |response|
-                  expect(response).to have_http_status(:forbidden)
+                  expect(response).to have_gitlab_http_status(:forbidden)
                   expect(response.body).to eq(git_access_error(:receive_pack_disabled_over_http))
                 end
               end
@@ -264,7 +264,7 @@ describe 'Git HTTP requests' do
                 allow(Gitlab.config.gitlab_shell).to receive(:upload_pack).and_return(false)
 
                 download(path, env) do |response|
-                  expect(response).to have_http_status(:forbidden)
+                  expect(response).to have_gitlab_http_status(:forbidden)
                   expect(response.body).to eq(git_access_error(:upload_pack_disabled_over_http))
                 end
               end
@@ -276,7 +276,7 @@ describe 'Git HTTP requests' do
 
             it 'rejects pushes with 403 Forbidden' do
               upload(path, env) do |response|
-                expect(response).to have_http_status(:forbidden)
+                expect(response).to have_gitlab_http_status(:forbidden)
                 expect(response.body).to eq(change_access_error(:push_code))
               end
             end
@@ -332,7 +332,7 @@ describe 'Git HTTP requests' do
 
           it 'downloads get status 404 with "project was moved" message' do
             clone_get(path, {})
-            expect(response).to have_http_status(:not_found)
+            expect(response).to have_gitlab_http_status(:not_found)
             expect(response.body).to match(project_moved_message)
           end
         end
@@ -355,7 +355,7 @@ describe 'Git HTTP requests' do
 
                 clone_get(path, env)
 
-                expect(response).to have_http_status(:unauthorized)
+                expect(response).to have_gitlab_http_status(:unauthorized)
               end
             end
           end
@@ -374,7 +374,7 @@ describe 'Git HTTP requests' do
                   project.team << [user, :master]
 
                   download(path, env) do |response|
-                    expect(response).to have_http_status(:unauthorized)
+                    expect(response).to have_gitlab_http_status(:unauthorized)
                   end
                 end
 
@@ -382,7 +382,7 @@ describe 'Git HTTP requests' do
                   user.block
 
                   download('doesnt/exist.git', env) do |response|
-                    expect(response).to have_http_status(:unauthorized)
+                    expect(response).to have_gitlab_http_status(:unauthorized)
                   end
                 end
               end
@@ -392,7 +392,7 @@ describe 'Git HTTP requests' do
                   expect(Rack::Attack::Allow2Ban).to receive(:reset).twice
 
                   download(path, env) do
-                    expect(response).to have_http_status(:ok)
+                    expect(response).to have_gitlab_http_status(:ok)
                     expect(response.content_type.to_s).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
                   end
                 end
@@ -401,7 +401,7 @@ describe 'Git HTTP requests' do
                   expect(Rack::Attack::Allow2Ban).to receive(:reset).twice
 
                   upload(path, env) do
-                    expect(response).to have_http_status(:ok)
+                    expect(response).to have_gitlab_http_status(:ok)
                     expect(response.content_type.to_s).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
                   end
                 end
@@ -440,14 +440,14 @@ describe 'Git HTTP requests' do
                 context 'when username and password are provided' do
                   it 'rejects pulls with personal access token error message' do
                     download(path, user: user.username, password: user.password) do |response|
-                      expect(response).to have_http_status(:unauthorized)
+                      expect(response).to have_gitlab_http_status(:unauthorized)
                       expect(response.body).to include('You must use a personal access token with \'api\' scope for Git over HTTP')
                     end
                   end
 
                   it 'rejects the push attempt with personal access token error message' do
                     upload(path, user: user.username, password: user.password) do |response|
-                      expect(response).to have_http_status(:unauthorized)
+                      expect(response).to have_gitlab_http_status(:unauthorized)
                       expect(response.body).to include('You must use a personal access token with \'api\' scope for Git over HTTP')
                     end
                   end
@@ -468,14 +468,14 @@ describe 'Git HTTP requests' do
 
                 it 'rejects pulls with personal access token error message' do
                   download(path, user: 'foo', password: 'bar') do |response|
-                    expect(response).to have_http_status(:unauthorized)
+                    expect(response).to have_gitlab_http_status(:unauthorized)
                     expect(response.body).to include('You must use a personal access token with \'api\' scope for Git over HTTP')
                   end
                 end
 
                 it 'rejects pushes with personal access token error message' do
                   upload(path, user: 'foo', password: 'bar') do |response|
-                    expect(response).to have_http_status(:unauthorized)
+                    expect(response).to have_gitlab_http_status(:unauthorized)
                     expect(response.body).to include('You must use a personal access token with \'api\' scope for Git over HTTP')
                   end
                 end
@@ -489,7 +489,7 @@ describe 'Git HTTP requests' do
 
                   it 'does not display the personal access token error message' do
                     upload(path, user: 'foo', password: 'bar') do |response|
-                      expect(response).to have_http_status(:unauthorized)
+                      expect(response).to have_gitlab_http_status(:unauthorized)
                       expect(response.body).not_to include('You must use a personal access token with \'api\' scope for Git over HTTP')
                     end
                   end
@@ -541,13 +541,13 @@ describe 'Git HTTP requests' do
 
                 it 'downloads get status 404 with "project was moved" message' do
                   clone_get(path, env)
-                  expect(response).to have_http_status(:not_found)
+                  expect(response).to have_gitlab_http_status(:not_found)
                   expect(response.body).to match(project_moved_message)
                 end
 
                 it 'uploads get status 404 with "project was moved" message' do
                   upload(path, env) do |response|
-                    expect(response).to have_http_status(:not_found)
+                    expect(response).to have_gitlab_http_status(:not_found)
                     expect(response.body).to match(project_moved_message)
                   end
                 end
@@ -557,13 +557,13 @@ describe 'Git HTTP requests' do
             context "when the user doesn't have access to the project" do
               it "pulls get status 404" do
                 download(path, user: user.username, password: user.password) do |response|
-                  expect(response).to have_http_status(:not_found)
+                  expect(response).to have_gitlab_http_status(:not_found)
                 end
               end
 
               it "uploads get status 404" do
                 upload(path, user: user.username, password: user.password) do |response|
-                  expect(response).to have_http_status(:not_found)
+                  expect(response).to have_gitlab_http_status(:not_found)
                 end
               end
             end
@@ -595,7 +595,7 @@ describe 'Git HTTP requests' do
             it "rejects pushes with 403 Forbidden" do
               push_get(path, env)
 
-              expect(response).to have_http_status(:forbidden)
+              expect(response).to have_gitlab_http_status(:forbidden)
               expect(response.body).to eq(git_access_error(:upload))
             end
 
@@ -604,7 +604,7 @@ describe 'Git HTTP requests' do
             it "rejects pulls for other project with 404 Not Found" do
               clone_get("#{other_project.full_path}.git", env)
 
-              expect(response).to have_http_status(:not_found)
+              expect(response).to have_gitlab_http_status(:not_found)
               expect(response.body).to eq(git_access_error(:project_not_found))
             end
           end
@@ -627,7 +627,7 @@ describe 'Git HTTP requests' do
                 it 'rejects pulls with 403 Forbidden' do
                   clone_get path, env
 
-                  expect(response).to have_http_status(:forbidden)
+                  expect(response).to have_gitlab_http_status(:forbidden)
                   expect(response.body).to eq(git_access_error(:no_repo))
                 end
               end
@@ -635,7 +635,7 @@ describe 'Git HTTP requests' do
               it 'rejects pushes with 403 Forbidden' do
                 push_get path, env
 
-                expect(response).to have_http_status(:forbidden)
+                expect(response).to have_gitlab_http_status(:forbidden)
                 expect(response.body).to eq(git_access_error(:upload))
               end
             end
@@ -648,7 +648,7 @@ describe 'Git HTTP requests' do
               it 'downloads from other project get status 403' do
                 clone_get "#{other_project.full_path}.git", user: 'gitlab-ci-token', password: build.token
 
-                expect(response).to have_http_status(:forbidden)
+                expect(response).to have_gitlab_http_status(:forbidden)
               end
             end
 
@@ -660,7 +660,7 @@ describe 'Git HTTP requests' do
               it 'downloads from other project get status 404' do
                 clone_get "#{other_project.full_path}.git", user: 'gitlab-ci-token', password: build.token
 
-                expect(response).to have_http_status(:not_found)
+                expect(response).to have_gitlab_http_status(:not_found)
               end
             end
           end
@@ -748,7 +748,7 @@ describe 'Git HTTP requests' do
           end
 
           it "returns the file" do
-            expect(response).to have_http_status(:ok)
+            expect(response).to have_gitlab_http_status(:ok)
           end
         end
 
@@ -758,7 +758,7 @@ describe 'Git HTTP requests' do
           end
 
           it "returns not found" do
-            expect(response).to have_http_status(:not_found)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
         end
       end
@@ -783,7 +783,7 @@ describe 'Git HTTP requests' do
       context "when the project doesn't exist" do
         it "responds with status 404 Not Found" do
           download(path, user: user.username, password: user.password) do |response|
-            expect(response).to have_http_status(:not_found)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
         end
       end
@@ -800,7 +800,7 @@ describe 'Git HTTP requests' do
 
           it "responds with status 200" do
             clone_get(path, env) do |response|
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
           end
 
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index 41bf43a9bce..94e04ce5608 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -13,12 +13,12 @@ describe JwtController do
   context 'existing service' do
     subject! { get '/jwt/auth', parameters }
 
-    it { expect(response).to have_http_status(200) }
+    it { expect(response).to have_gitlab_http_status(200) }
 
     context 'returning custom http code' do
       let(:service) { double(execute: { http_status: 505 }) }
 
-      it { expect(response).to have_http_status(505) }
+      it { expect(response).to have_gitlab_http_status(505) }
     end
   end
 
@@ -41,7 +41,7 @@ describe JwtController do
 
         subject! { get '/jwt/auth', parameters, headers }
 
-        it { expect(response).to have_http_status(401) }
+        it { expect(response).to have_gitlab_http_status(401) }
       end
 
       context 'using personal access tokens' do
@@ -56,7 +56,7 @@ describe JwtController do
         subject! { get '/jwt/auth', parameters, headers }
 
         it 'authenticates correctly' do
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(service_class).to have_received(:new).with(nil, user, parameters)
         end
       end
@@ -75,7 +75,7 @@ describe JwtController do
 
         context 'without personal token' do
           it 'rejects the authorization attempt' do
-            expect(response).to have_http_status(401)
+            expect(response).to have_gitlab_http_status(401)
             expect(response.body).to include('You must use a personal access token with \'api\' scope for Git over HTTP')
           end
         end
@@ -85,7 +85,7 @@ describe JwtController do
           let(:headers) { { authorization: credentials(user.username, access_token.token) } }
 
           it 'accepts the authorization attempt' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
         end
       end
@@ -98,7 +98,7 @@ describe JwtController do
         it 'rejects the authorization attempt' do
           get '/jwt/auth', parameters, headers
 
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
           expect(response.body).not_to include('You must use a personal access token with \'api\' scope for Git over HTTP')
         end
       end
@@ -108,7 +108,7 @@ describe JwtController do
           allow_any_instance_of(ApplicationSetting).to receive(:password_authentication_enabled?) { false }
           get '/jwt/auth', parameters, headers
 
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
           expect(response.body).to include('You must use a personal access token with \'api\' scope for Git over HTTP')
         end
       end
@@ -119,7 +119,7 @@ describe JwtController do
     it 'accepts the authorization attempt' do
       get '/jwt/auth', parameters
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
     end
 
     it 'allows read access' do
@@ -132,7 +132,7 @@ describe JwtController do
   context 'unknown service' do
     subject! { get '/jwt/auth', service: 'unknown' }
 
-    it { expect(response).to have_http_status(404) }
+    it { expect(response).to have_gitlab_http_status(404) }
   end
 
   def credentials(login, password)
diff --git a/spec/requests/lfs_http_spec.rb b/spec/requests/lfs_http_spec.rb
index bca5bf81c5c..52e93e157f1 100644
--- a/spec/requests/lfs_http_spec.rb
+++ b/spec/requests/lfs_http_spec.rb
@@ -41,7 +41,7 @@ describe 'Git LFS API and storage' do
     end
 
     it 'responds with 501' do
-      expect(response).to have_http_status(501)
+      expect(response).to have_gitlab_http_status(501)
       expect(json_response).to include('message' => 'Git LFS is not enabled on this GitLab server, contact your admin.')
     end
   end
@@ -75,13 +75,13 @@ describe 'Git LFS API and storage' do
         it 'responds with a 501 message on upload' do
           post_lfs_json "#{project.http_url_to_repo}/info/lfs/objects/batch", body, headers
 
-          expect(response).to have_http_status(501)
+          expect(response).to have_gitlab_http_status(501)
         end
 
         it 'responds with a 501 message on download' do
           get "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}", nil, headers
 
-          expect(response).to have_http_status(501)
+          expect(response).to have_gitlab_http_status(501)
         end
       end
 
@@ -93,13 +93,13 @@ describe 'Git LFS API and storage' do
         it 'responds with a 501 message on upload' do
           post_lfs_json "#{project.http_url_to_repo}/info/lfs/objects/batch", body, headers
 
-          expect(response).to have_http_status(501)
+          expect(response).to have_gitlab_http_status(501)
         end
 
         it 'responds with a 501 message on download' do
           get "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}", nil, headers
 
-          expect(response).to have_http_status(501)
+          expect(response).to have_gitlab_http_status(501)
         end
       end
     end
@@ -118,14 +118,14 @@ describe 'Git LFS API and storage' do
         it 'responds with a 403 message on upload' do
           post_lfs_json "#{project.http_url_to_repo}/info/lfs/objects/batch", body, headers
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
           expect(json_response).to include('message' => 'Access forbidden. Check your access level.')
         end
 
         it 'responds with a 403 message on download' do
           get "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}", nil, headers
 
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
           expect(json_response).to include('message' => 'Access forbidden. Check your access level.')
         end
       end
@@ -138,14 +138,14 @@ describe 'Git LFS API and storage' do
         it 'responds with a 200 message on upload' do
           post_lfs_json "#{project.http_url_to_repo}/info/lfs/objects/batch", body, headers
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['objects'].first['size']).to eq(1575078)
         end
 
         it 'responds with a 200 message on download' do
           get "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}", nil, headers
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
         end
       end
     end
@@ -160,7 +160,7 @@ describe 'Git LFS API and storage' do
 
     shared_examples 'a deprecated' do
       it 'responds with 501' do
-        expect(response).to have_http_status(501)
+        expect(response).to have_gitlab_http_status(501)
       end
 
       it 'returns deprecated message' do
@@ -201,7 +201,7 @@ describe 'Git LFS API and storage' do
     context 'and request comes from gitlab-workhorse' do
       context 'without user being authorized' do
         it 'responds with status 401' do
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
         end
       end
 
@@ -210,7 +210,7 @@ describe 'Git LFS API and storage' do
           let(:sendfile) { 'X-Sendfile' }
 
           it 'responds with status 200' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it 'responds with the file location' do
@@ -228,7 +228,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 404' do
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
           end
 
@@ -272,7 +272,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 404' do
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
           end
         end
@@ -311,7 +311,7 @@ describe 'Git LFS API and storage' do
               end
 
               it 'rejects downloading code' do
-                expect(response).to have_http_status(other_project_status)
+                expect(response).to have_gitlab_http_status(other_project_status)
               end
             end
           end
@@ -351,7 +351,7 @@ describe 'Git LFS API and storage' do
         let(:authorization) { authorize_user }
 
         it 'responds with status 404' do
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -387,7 +387,7 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with status 200' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it 'with href to download' do
@@ -415,7 +415,7 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with status 200' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it 'with href to download' do
@@ -446,7 +446,7 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with status 200' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it 'with an 404 for specific object' do
@@ -483,7 +483,7 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with status 200' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it 'responds with upload hypermedia link for the new object' do
@@ -528,7 +528,7 @@ describe 'Git LFS API and storage' do
           let(:update_user_permissions) { nil }
 
           it 'responds with 404' do
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
 
@@ -536,7 +536,7 @@ describe 'Git LFS API and storage' do
           let(:role) { :guest }
 
           it 'responds with 403' do
-            expect(response).to have_http_status(403)
+            expect(response).to have_gitlab_http_status(403)
           end
         end
       end
@@ -564,7 +564,7 @@ describe 'Git LFS API and storage' do
             let(:pipeline) { create(:ci_empty_pipeline, project: other_project) }
 
             it 'rejects downloading code' do
-              expect(response).to have_http_status(other_project_status)
+              expect(response).to have_gitlab_http_status(other_project_status)
             end
           end
         end
@@ -608,7 +608,7 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with status 200 and href to download' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it 'responds with status 200 and href to download' do
@@ -636,7 +636,7 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with authorization required' do
-            expect(response).to have_http_status(401)
+            expect(response).to have_gitlab_http_status(401)
           end
         end
       end
@@ -669,7 +669,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 200' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
 
             it 'responds with links the object to the project' do
@@ -695,7 +695,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 200' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
 
             it 'responds with upload hypermedia link' do
@@ -725,7 +725,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 200' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
 
             it 'responds with upload hypermedia link for the new object' do
@@ -747,7 +747,7 @@ describe 'Git LFS API and storage' do
           let(:authorization) { authorize_user }
 
           it 'responds with 403' do
-            expect(response).to have_http_status(403)
+            expect(response).to have_gitlab_http_status(403)
           end
         end
 
@@ -761,7 +761,7 @@ describe 'Git LFS API and storage' do
               let(:build) { create(:ci_build, :running, pipeline: pipeline, user: user) }
 
               it 'responds with 403 (not 404 because project is public)' do
-                expect(response).to have_http_status(403)
+                expect(response).to have_gitlab_http_status(403)
               end
             end
 
@@ -772,7 +772,7 @@ describe 'Git LFS API and storage' do
 
               # I'm not sure what this tests that is different from the previous test
               it 'responds with 403 (not 404 because project is public)' do
-                expect(response).to have_http_status(403)
+                expect(response).to have_gitlab_http_status(403)
               end
             end
           end
@@ -781,7 +781,7 @@ describe 'Git LFS API and storage' do
             let(:build) { create(:ci_build, :running, pipeline: pipeline) }
 
             it 'responds with 403 (not 404 because project is public)' do
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -794,13 +794,13 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with status 401' do
-            expect(response).to have_http_status(401)
+            expect(response).to have_gitlab_http_status(401)
           end
         end
 
         context 'when user does not have push access' do
           it 'responds with status 401' do
-            expect(response).to have_http_status(401)
+            expect(response).to have_gitlab_http_status(401)
           end
         end
       end
@@ -820,7 +820,7 @@ describe 'Git LFS API and storage' do
       end
 
       it 'responds with status 404' do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
   end
@@ -865,7 +865,7 @@ describe 'Git LFS API and storage' do
         end
 
         it 'responds with status 401' do
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
         end
       end
 
@@ -875,7 +875,7 @@ describe 'Git LFS API and storage' do
         end
 
         it 'responds with status 401' do
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
         end
       end
 
@@ -885,7 +885,7 @@ describe 'Git LFS API and storage' do
         end
 
         it 'does not recognize it as a valid lfs command' do
-          expect(response).to have_http_status(401)
+          expect(response).to have_gitlab_http_status(401)
         end
       end
     end
@@ -897,7 +897,7 @@ describe 'Git LFS API and storage' do
         end
 
         it 'responds with 403' do
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
@@ -907,7 +907,7 @@ describe 'Git LFS API and storage' do
         end
 
         it 'responds with 403' do
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
 
@@ -917,7 +917,7 @@ describe 'Git LFS API and storage' do
         end
 
         it 'does not recognize it as a valid lfs command' do
-          expect(response).to have_http_status(403)
+          expect(response).to have_gitlab_http_status(403)
         end
       end
     end
@@ -945,7 +945,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 200' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
 
             it 'uses the gitlab-workhorse content type' do
@@ -965,7 +965,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 200' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
 
             it 'lfs object is linked to the project' do
@@ -976,12 +976,12 @@ describe 'Git LFS API and storage' do
           context 'invalid tempfiles' do
             it 'rejects slashes in the tempfile name (path traversal' do
               put_finalize('foo/bar')
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
 
             it 'rejects tempfile names that do not start with the oid' do
               put_finalize("foo#{sample_oid}")
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -1010,7 +1010,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with 403 (not 404 because the build user can read the project)' do
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
 
@@ -1024,7 +1024,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with 404 (do not leak non-public project existence)' do
-              expect(response).to have_http_status(404)
+              expect(response).to have_gitlab_http_status(404)
             end
           end
         end
@@ -1037,7 +1037,7 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with 404 (do not leak non-public project existence)' do
-            expect(response).to have_http_status(404)
+            expect(response).to have_gitlab_http_status(404)
           end
         end
       end
@@ -1066,7 +1066,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 200' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
 
             it 'with location of lfs store and object details' do
@@ -1082,7 +1082,7 @@ describe 'Git LFS API and storage' do
             end
 
             it 'responds with status 200' do
-              expect(response).to have_http_status(200)
+              expect(response).to have_gitlab_http_status(200)
             end
 
             it 'lfs object is linked to the source project' do
@@ -1110,7 +1110,7 @@ describe 'Git LFS API and storage' do
             let(:build) { create(:ci_build, :running, pipeline: pipeline, user: user) }
 
             it 'responds with 403 (not 404 because project is public)' do
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
 
@@ -1121,7 +1121,7 @@ describe 'Git LFS API and storage' do
 
             # I'm not sure what this tests that is different from the previous test
             it 'responds with 403 (not 404 because project is public)' do
-              expect(response).to have_http_status(403)
+              expect(response).to have_gitlab_http_status(403)
             end
           end
         end
@@ -1130,7 +1130,7 @@ describe 'Git LFS API and storage' do
           let(:build) { create(:ci_build, :running, pipeline: pipeline) }
 
           it 'responds with 403 (not 404 because project is public)' do
-            expect(response).to have_http_status(403)
+            expect(response).to have_gitlab_http_status(403)
           end
         end
       end
@@ -1155,7 +1155,7 @@ describe 'Git LFS API and storage' do
           end
 
           it 'responds with status 200' do
-            expect(response).to have_http_status(200)
+            expect(response).to have_gitlab_http_status(200)
           end
 
           it 'links the lfs object to the project' do
diff --git a/spec/requests/openid_connect_spec.rb b/spec/requests/openid_connect_spec.rb
index a927de952d0..0b1f8ce6f6d 100644
--- a/spec/requests/openid_connect_spec.rb
+++ b/spec/requests/openid_connect_spec.rb
@@ -37,7 +37,7 @@ describe 'OpenID Connect requests' do
     it 'userinfo response is unauthorized' do
       request_user_info
 
-      expect(response).to have_http_status 403
+      expect(response).to have_gitlab_http_status 403
       expect(response.body).to be_blank
     end
   end
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb
index 6667ce771bd..286d8a884a4 100644
--- a/spec/requests/projects/cycle_analytics_events_spec.rb
+++ b/spec/requests/projects/cycle_analytics_events_spec.rb
@@ -99,19 +99,19 @@ describe 'cycle analytics events' do
       it 'does not list the test events' do
         get project_cycle_analytics_test_path(project, format: :json)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
 
       it 'does not list the staging events' do
         get project_cycle_analytics_staging_path(project, format: :json)
 
-        expect(response).to have_http_status(:not_found)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
 
       it 'lists the issue events' do
         get project_cycle_analytics_issue_path(project, format: :json)
 
-        expect(response).to have_http_status(:ok)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
   end
diff --git a/spec/support/api/issues_resolving_discussions_shared_examples.rb b/spec/support/api/issues_resolving_discussions_shared_examples.rb
index d26d279363c..d2d6260dfa8 100644
--- a/spec/support/api/issues_resolving_discussions_shared_examples.rb
+++ b/spec/support/api/issues_resolving_discussions_shared_examples.rb
@@ -1,6 +1,6 @@
 shared_examples 'creating an issue resolving discussions through the API' do
   it 'creates a new project issue' do
-    expect(response).to have_http_status(:created)
+    expect(response).to have_gitlab_http_status(:created)
   end
 
   it 'resolves the discussions in a merge request' do
diff --git a/spec/support/api/members_shared_examples.rb b/spec/support/api/members_shared_examples.rb
index dab71a35a55..8d910e52eda 100644
--- a/spec/support/api/members_shared_examples.rb
+++ b/spec/support/api/members_shared_examples.rb
@@ -6,6 +6,6 @@ shared_examples 'a 404 response when source is private' do
   it 'returns 404' do
     route
 
-    expect(response).to have_http_status(404)
+    expect(response).to have_gitlab_http_status(404)
   end
 end
diff --git a/spec/support/api/milestones_shared_examples.rb b/spec/support/api/milestones_shared_examples.rb
index 4bb5113957e..d9080b02541 100644
--- a/spec/support/api/milestones_shared_examples.rb
+++ b/spec/support/api/milestones_shared_examples.rb
@@ -10,7 +10,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns milestones list' do
       get api(route, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.first['title']).to eq(milestone.title)
@@ -19,13 +19,13 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns a 401 error if user not authenticated' do
       get api(route)
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns an array of active milestones' do
       get api("#{route}/?state=active", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
@@ -35,7 +35,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns an array of closed milestones' do
       get api("#{route}/?state=closed", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
@@ -47,7 +47,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
 
       get api(route, user), iids: [closed_milestone.iid, other_milestone.iid]
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(2)
       expect(json_response.map { |m| m['id'] }).to match_array([closed_milestone.id, other_milestone.id])
@@ -56,7 +56,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'does not return any milestone if none found' do
       get api(route, user), iids: [Milestone.maximum(:iid).succ]
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
@@ -75,7 +75,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns a milestone by searching for title' do
       get api(route, user), search: 'version2'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response.size).to eq(1)
       expect(json_response.first['title']).to eq milestone.title
@@ -85,7 +85,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns a milestones by searching for description' do
       get api(route, user), search: 'open'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response.size).to eq(1)
       expect(json_response.first['title']).to eq milestone.title
@@ -97,7 +97,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns a milestone by id' do
       get api(resource_route, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(milestone.title)
       expect(json_response['iid']).to eq(milestone.iid)
     end
@@ -105,7 +105,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns a milestone by id' do
       get api(resource_route, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq(milestone.title)
       expect(json_response['iid']).to eq(milestone.iid)
     end
@@ -113,13 +113,13 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns 401 error if user not authenticated' do
       get api(resource_route)
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns a 404 error if milestone id not found' do
       get api("#{route}/1234", user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
   end
 
@@ -127,7 +127,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'creates a new milestone' do
       post api(route, user), title: 'new milestone'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('new milestone')
       expect(json_response['description']).to be_nil
     end
@@ -136,7 +136,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
       post api(route, user),
         title: 'new milestone', description: 'release', due_date: '2013-03-02', start_date: '2013-02-02'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['description']).to eq('release')
       expect(json_response['due_date']).to eq('2013-03-02')
       expect(json_response['start_date']).to eq('2013-02-02')
@@ -145,20 +145,20 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns a 400 error if title is missing' do
       post api(route, user)
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'returns a 400 error if params are invalid (duplicate title)' do
       post api(route, user),
         title: milestone.title, description: 'release', due_date: '2013-03-02'
 
-      expect(response).to have_http_status(400)
+      expect(response).to have_gitlab_http_status(400)
     end
 
     it 'creates a new milestone with reserved html characters' do
       post api(route, user), title: 'foo & bar 1.1 -> 2.2'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['title']).to eq('foo & bar 1.1 -> 2.2')
       expect(json_response['description']).to be_nil
     end
@@ -169,7 +169,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
       put api(resource_route, user),
         title: 'updated title'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['title']).to eq('updated title')
     end
 
@@ -178,7 +178,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
 
       put api(resource_route, user), due_date: nil
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['due_date']).to be_nil
     end
 
@@ -186,13 +186,13 @@ shared_examples_for 'group and project milestones' do |route_definition|
       put api("#{route}/1234", user),
         title: 'updated title'
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'closes milestone' do
       put api(resource_route, user),
         state_event: 'close'
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
 
       expect(json_response['state']).to eq('closed')
     end
@@ -207,7 +207,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'returns issues for a particular milestone' do
       get api(issues_route, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.first['milestone']['title']).to eq(milestone.title)
@@ -228,14 +228,14 @@ shared_examples_for 'group and project milestones' do |route_definition|
     it 'matches V4 response schema for a list of issues' do
       get api(issues_route, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to match_response_schema('public_api/v4/issues')
     end
 
     it 'returns a 401 error if user not authenticated' do
       get api(issues_route)
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     describe 'confidential issues' do
@@ -265,7 +265,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
       it 'returns confidential issues to team members' do
         get api(issues_route, user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         # 2 for projects, 3 for group(which has another project with an issue)
@@ -279,7 +279,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
 
         get api(issues_route, member)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -289,7 +289,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
       it 'does not return confidential issues to regular users' do
         get api(issues_route, create(:user))
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(1)
@@ -302,7 +302,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
 
         get api(issues_route, user)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         # 2 for projects, 3 for group(which has another project with an issue)
@@ -325,7 +325,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
       another_merge_request
       get api(merge_requests_route, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(1)
       expect(json_response.first['title']).to eq(merge_request.title)
@@ -349,20 +349,20 @@ shared_examples_for 'group and project milestones' do |route_definition|
 
       get api(not_found_route, user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 404 if the user has no access to the milestone' do
       new_user = create :user
       get api(merge_requests_route, new_user)
 
-      expect(response).to have_http_status(404)
+      expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns a 401 error if user not authenticated' do
       get api(merge_requests_route)
 
-      expect(response).to have_http_status(401)
+      expect(response).to have_gitlab_http_status(401)
     end
 
     it 'returns merge_requests ordered by position asc' do
@@ -372,7 +372,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
 
       get api(merge_requests_route, user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.size).to eq(2)
diff --git a/spec/support/api/scopes/read_user_shared_examples.rb b/spec/support/api/scopes/read_user_shared_examples.rb
index 111534f2f26..06ae8792c61 100644
--- a/spec/support/api/scopes/read_user_shared_examples.rb
+++ b/spec/support/api/scopes/read_user_shared_examples.rb
@@ -6,7 +6,7 @@ shared_examples_for 'allows the "read_user" scope' do
       it 'returns a "200" response' do
         get api_call.call(path, user, personal_access_token: token)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -16,7 +16,7 @@ shared_examples_for 'allows the "read_user" scope' do
       it 'returns a "200" response' do
         get api_call.call(path, user, personal_access_token: token)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -30,7 +30,7 @@ shared_examples_for 'allows the "read_user" scope' do
       it 'returns a "403" response' do
         get api_call.call(path, user, personal_access_token: token)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -44,7 +44,7 @@ shared_examples_for 'allows the "read_user" scope' do
       it 'returns a "200" response' do
         get api_call.call(path, user, oauth_access_token: token)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -54,7 +54,7 @@ shared_examples_for 'allows the "read_user" scope' do
       it 'returns a "200" response' do
         get api_call.call(path, user, oauth_access_token: token)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -64,7 +64,7 @@ shared_examples_for 'allows the "read_user" scope' do
       it 'returns a "403" response' do
         get api_call.call(path, user, oauth_access_token: token)
 
-        expect(response).to have_http_status(403)
+        expect(response).to have_gitlab_http_status(403)
       end
     end
   end
@@ -77,7 +77,7 @@ shared_examples_for 'does not allow the "read_user" scope' do
     it 'returns a "403" response' do
       post api_call.call(path, user, personal_access_token: token), attributes_for(:user, projects_limit: 3)
 
-      expect(response).to have_http_status(403)
+      expect(response).to have_gitlab_http_status(403)
     end
   end
 end
diff --git a/spec/support/api/time_tracking_shared_examples.rb b/spec/support/api/time_tracking_shared_examples.rb
index 16a3cf06be7..af1083f4bfd 100644
--- a/spec/support/api/time_tracking_shared_examples.rb
+++ b/spec/support/api/time_tracking_shared_examples.rb
@@ -15,7 +15,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
     it "sets the time estimate for #{issuable_name}" do
       post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/time_estimate", user), duration: '1w'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['human_time_estimate']).to eq('1w')
     end
 
@@ -28,7 +28,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
         it 'does not modify the original estimate' do
           post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/time_estimate", user), duration: 'foo'
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(issuable.reload.human_time_estimate).to eq('1w')
         end
       end
@@ -37,7 +37,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
         it 'updates the estimate' do
           post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/time_estimate", user), duration: '3w1h'
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(issuable.reload.human_time_estimate).to eq('3w 1h')
         end
       end
@@ -54,7 +54,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
     it "resets the time estimate for #{issuable_name}" do
       post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/reset_time_estimate", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['time_estimate']).to eq(0)
     end
   end
@@ -73,7 +73,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
       post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/add_spent_time", user),
            duration: '2h'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['human_total_time_spent']).to eq('2h')
     end
 
@@ -84,7 +84,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
         post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/add_spent_time", user),
              duration: '-1h'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['total_time_spent']).to eq(3600)
       end
     end
@@ -96,7 +96,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
         post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/add_spent_time", user),
              duration: '-1w'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['time_spent'].first).to match(/exceeds the total time spent/)
       end
     end
@@ -112,7 +112,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
     it "resets spent time for #{issuable_name}" do
       post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/reset_spent_time", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['total_time_spent']).to eq(0)
     end
   end
@@ -124,7 +124,7 @@ shared_examples 'time tracking endpoints' do |issuable_name|
 
       get api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/time_stats", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['total_time_spent']).to eq(1800)
       expect(json_response['time_estimate']).to eq(3600)
     end
diff --git a/spec/support/api/v3/time_tracking_shared_examples.rb b/spec/support/api/v3/time_tracking_shared_examples.rb
index f982b10d999..afe0f4cecda 100644
--- a/spec/support/api/v3/time_tracking_shared_examples.rb
+++ b/spec/support/api/v3/time_tracking_shared_examples.rb
@@ -11,7 +11,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
     it "sets the time estimate for #{issuable_name}" do
       post v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/time_estimate", user), duration: '1w'
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['human_time_estimate']).to eq('1w')
     end
 
@@ -24,7 +24,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
         it 'does not modify the original estimate' do
           post v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/time_estimate", user), duration: 'foo'
 
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(400)
           expect(issuable.reload.human_time_estimate).to eq('1w')
         end
       end
@@ -33,7 +33,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
         it 'updates the estimate' do
           post v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/time_estimate", user), duration: '3w1h'
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(issuable.reload.human_time_estimate).to eq('3w 1h')
         end
       end
@@ -50,7 +50,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
     it "resets the time estimate for #{issuable_name}" do
       post v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/reset_time_estimate", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['time_estimate']).to eq(0)
     end
   end
@@ -69,7 +69,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
       post v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/add_spent_time", user),
            duration: '2h'
 
-      expect(response).to have_http_status(201)
+      expect(response).to have_gitlab_http_status(201)
       expect(json_response['human_total_time_spent']).to eq('2h')
     end
 
@@ -80,7 +80,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
         post v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/add_spent_time", user),
              duration: '-1h'
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['total_time_spent']).to eq(3600)
       end
     end
@@ -92,7 +92,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
         post v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/add_spent_time", user),
              duration: '-1w'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['message']['time_spent'].first).to match(/exceeds the total time spent/)
       end
     end
@@ -108,7 +108,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
     it "resets spent time for #{issuable_name}" do
       post v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/reset_spent_time", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['total_time_spent']).to eq(0)
     end
   end
@@ -120,7 +120,7 @@ shared_examples 'V3 time tracking endpoints' do |issuable_name|
 
       get v3_api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.id}/time_stats", user)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response['total_time_spent']).to eq(1800)
       expect(json_response['time_estimate']).to eq(3600)
     end
diff --git a/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb b/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
index c9302f7b750..6bc39f2f279 100644
--- a/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
@@ -9,7 +9,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
       it 'does not filter by custom attributes' do
         get api("/#{attributable_name}", user), custom_attributes: { foo: 'foo', bar: 'bar' }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.size).to be 2
       end
     end
@@ -17,7 +17,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
     it 'filters by custom attributes' do
       get api("/#{attributable_name}", admin), custom_attributes: { foo: 'foo', bar: 'bar' }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to be 1
       expect(json_response.first['id']).to eq attributable.id
     end
@@ -33,7 +33,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
     it 'returns all custom attributes' do
       get api("/#{attributable_name}/#{attributable.id}/custom_attributes", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to contain_exactly(
         { 'key' => 'foo', 'value' => 'foo' },
         { 'key' => 'bar', 'value' => 'bar' }
@@ -51,7 +51,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
     it 'returns a single custom attribute' do
       get api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'foo', 'value' => 'foo' })
     end
   end
@@ -68,7 +68,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         put api("/#{attributable_name}/#{attributable.id}/custom_attributes/new", admin), value: 'new'
       end.to change { attributable.custom_attributes.count }.by(1)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'new', 'value' => 'new' })
       expect(attributable.custom_attributes.find_by(key: 'new').value).to eq 'new'
     end
@@ -78,7 +78,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         put api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin), value: 'new'
       end.not_to change { attributable.custom_attributes.count }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'foo', 'value' => 'new' })
       expect(custom_attribute1.reload.value).to eq 'new'
     end
@@ -96,7 +96,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         delete api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin)
       end.to change { attributable.custom_attributes.count }.by(-1)
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
       expect(attributable.custom_attributes.find_by(key: 'foo')).to be_nil
     end
   end
diff --git a/spec/support/unique_ip_check_shared_examples.rb b/spec/support/unique_ip_check_shared_examples.rb
index 2dfa5fbecea..3d9705c9c05 100644
--- a/spec/support/unique_ip_check_shared_examples.rb
+++ b/spec/support/unique_ip_check_shared_examples.rb
@@ -56,13 +56,13 @@ shared_examples 'user login request with unique ip limit' do |success_status = 2
     end
 
     it 'allows user authenticating from the same ip' do
-      expect(request_from_ip('ip')).to have_http_status(success_status)
-      expect(request_from_ip('ip')).to have_http_status(success_status)
+      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_http_status(success_status)
-      expect(request_from_ip('ip2')).to have_http_status(403)
+      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