Add latest changes from gitlab-org/gitlab@master

.rubocop.yml

@@ -347,6 +347,8 @@ RSpec/HaveGitlabHttpStatus:
     - 'ee/spec/features/**/*'
     - 'spec/controllers/*.rb'
     - 'ee/spec/controllers/*.rb'
+    - 'spec/controllers/projects/*.rb'
+    - 'ee/spec/controllers/projects/*.rb'
     - 'spec/requests/*.rb'
     - 'ee/spec/requests/*.rb'

app/assets/javascripts/pages/projects/init_blob.js

@@ -11,7 +11,7 @@ export default () => {
   // eslint-disable-next-line no-new
   new BlobLinePermalinkUpdater(
     document.querySelector('#blob-content-holder'),
-    '.diff-line-num[data-line-number]',
+    '.diff-line-num[data-line-number], .diff-line-num[data-line-number] *',
     document.querySelectorAll('.js-data-file-blob-permalink-url, .js-blob-blame-link'),
   );

app/controllers/sent_notifications_controller.rb

@@ -6,14 +6,24 @@ class SentNotificationsController < ApplicationController
   def unsubscribe
     @sent_notification = SentNotification.for(params[:id])
-    return render_404 unless @sent_notification && @sent_notification.unsubscribable?
+    return render_404 unless unsubscribe_prerequisites_met?
+
     return unsubscribe_and_redirect if current_user || params[:force]
   end
   private
+  def unsubscribe_prerequisites_met?
+    @sent_notification.present? &&
+    @sent_notification.unsubscribable? &&
+    noteable.present?
+  end
+
+  def noteable
+    @sent_notification.noteable
+  end
+
   def unsubscribe_and_redirect
-    noteable = @sent_notification.noteable
     noteable.unsubscribe(@sent_notification.recipient, @sent_notification.project)
     flash[:notice] = _("You have been unsubscribed from this thread.")

changelogs/unreleased/199034-nomethoderror-undefined-method-unsubscribe-for-nil-nilclass.yml

+---
+title: Fix 500 error when trying to unsubscribe from an already deleted entity
+merge_request: 23747
+author:
+type: fixed

changelogs/unreleased/nfriend-31374-fix-permalink-button.yml

+---
+title: Fix hash parameter of Permalink and Blame button
+merge_request: 23713
+author:
+type: fixed

doc/administration/packages/index.md

@@ -15,7 +15,7 @@ The Packages feature allows GitLab to act as a repository for the following:
 Don't you see your package management system supported yet?
 Please consider contributing
-to GitLab. This [development documentation](../../development/packages.md) will guide you through the process, it includes a list of [suggested contributions](../../development/packages.md#suggested-contributions).
+to GitLab. This [development documentation](../../development/packages.md) will guide you through the process.
 ## Enabling the Packages feature

doc/development/documentation/styleguide.md

@@ -77,7 +77,7 @@ and cross-link between any related content.
 We employ a **docs-first methodology** to help ensure that the docs remain a complete and trusted resource, and to make communicating about the use of GitLab more efficient.
 - If the answer to a question exists in documentation, share the link to the docs instead of rephrasing the information.
-- When you encounter new information not available in GitLab’s documentation (for example, when working on a support case or testing a feature), your first step should be to create a merge request to add this information to the docs. You can then share the MR in order to communicate this information.
+- When you encounter new information not available in GitLab’s documentation (for example, when working on a support case or testing a feature), your first step should be to create a merge request (MR) to add this information to the docs. You can then share the MR in order to communicate this information.
 New information that would be useful toward the future usage or troubleshooting of GitLab should not be written directly in a forum or other messaging system, but added to a docs MR and then referenced, as described above. Note that among any other doc changes, you can always add a Troubleshooting section to a doc if none exists, or un-comment and use the placeholder Troubleshooting section included as part of our [doc template](structure.md#template-for-new-docs), if present.
@@ -525,6 +525,35 @@ For other punctuation rules, please refer to the
 - Use sentence case in headings. Do not capitalize the words of the title, unless
   it refers to a product feature. For example, capitalizing "issues" is acceptable in
   `## What you can do with GitLab Issues`, but not in `## Closing multiple issues`.
+- Our docs site search engine prioritizes headings, therefore, make sure to write
+  headings that contextualize the subject and help to take the user to the right
+  document. For example, `## Examples` is a bad heading; `## GitLab Pages examples`
+  is a better one. It's not an exact science, but please consider this carefully.
+
+### Anchor links
+
+Headings generate anchor links automatically when rendered. `## This is an example`
+generates the anchor `#this-is-an-example`.
+
+Keep in mind that the GitLab UI links to a large number of docs and respective
+anchor links to take the user to the right spot. Therefore, when you change a
+heading, search `doc/*`, `app/views/*`, and `ee/app/views/*` for the old anchor
+to make sure you're not breaking an anchor linked from other docs nor from the
+GitLab UI. If you find the old anchor, make sure to replace it with the new one.
+
+Important:
+
+- Avoid crosslinking docs to headings unless you need to link to a specific section
+  of the document. This will avoid breaking anchors in the future in case the heading
+  is changed.
+- If possible, avoid changing headings since they're not only linked internally.
+  There are various links to GitLab documentation on the internet, such as tutorials,
+  presentations, StackOverflow posts, and other sources.
+- Do not link to `h1` headings.
+
+Note that, with Kramdown, it is possible to add a custom ID to an HTML element
+with Markdown markup, but they **do not** work in GitLab's `/help`. Therefore,
+do not use this option until further notice.
 ## Links
@@ -953,6 +982,24 @@ Which renders to:
 To maintain consistency through GitLab documentation, the following guides documentation authors
 on agreed styles and usage of terms.
+### Merge Requests (MRs)
+
+Merge requests allow you to exchange changes you made to source code and collaborate
+with other people on the same project. You'll see this term used in the following ways:
+
+- If you're referring to the feature, use **Merge Request**.
+- In any other context, use **merge request**.
+
+As noted in our corporate [Writing Style Guidelines](https://about.gitlab.com/handbook/communication/#writing-style-guidelines),
+if you use the **MR** acronym, expand it at least once per document page.
+For example, the first time you specify a MR, specify either _Merge Request (MR)_ or _merge request (MR)_.
+
+Examples:
+
+- "We prefer GitLab Merge Requests".
+- "Open a merge request to fix a broken link".
+- "After you open a merge request (MR), submit your MR for review and approval".
+
 ### Describing UI elements
 The following are styles to follow when describing UI elements on a screen:

doc/development/packages.md

@@ -14,29 +14,6 @@ by looking at existing merge requests with Maven and NPM support:
 - [Maven repository](https://gitlab.com/gitlab-org/gitlab/merge_requests/6607).
 - [Instance level endpoint for Maven repository](https://gitlab.com/gitlab-org/gitlab/merge_requests/8757)
-## Suggested contributions
-
-The goal of the Package group is to build a set of features that, within three years, will allow ninety percent of our customers to store all of their packages in GitLab. To do that we need to ensure that we support the below package manager formats.
-
-| Format | Use case |
-| ------ | ------ |
-| [Bower](https://gitlab.com/gitlab-org/gitlab/issues/36888) | Boost your front end development by hosting your own Bower components.  |
-| [Cargo](https://gitlab.com/gitlab-org/gitlab/issues/33060) | Cargo is the Rust package manager. Build, publish and share Rust packages  |
-| [Chef](https://gitlab.com/gitlab-org/gitlab/issues/36889) | Configuration management with Chef using all the benefits of a repository manager. |
-| [CocoaPods](https://gitlab.com/gitlab-org/gitlab/issues/36890) | Speed up development with Xcode and CocoaPods. |
-| [Conda](https://gitlab.com/gitlab-org/gitlab/issues/36891) | Secure and private local Conda repositories. |
-| [CRAN](https://gitlab.com/gitlab-org/gitlab/issues/36892) | Deploy and resolve CRAN packages for the R language. |
-| [Debian](https://gitlab.com/gitlab-org/gitlab/issues/5835) | Host and provision Debian packages. |
-| [Go](https://gitlab.com/gitlab-org/gitlab/issues/9773) | Resolve Go dependencies from and publish your Go packages to GitLab.  |
-| [Opkg](https://gitlab.com/gitlab-org/gitlab/issues/36894) | Optimize your work with OpenWrt using Opkg repositories. |
-| [P2](https://gitlab.com/gitlab-org/gitlab/issues/36895) | Host all your Eclipse plugins in your own GitLab P2 repository. |
-| [Puppet](https://gitlab.com/gitlab-org/gitlab/issues/36897) | Configuration management meets repository management with Puppet repositories. |
-| [PyPi](https://gitlab.com/gitlab-org/gitlab/issues/10483) | Host PyPi distributions. |
-| [RPM](https://gitlab.com/gitlab-org/gitlab/issues/5932) | Distribute RPMs directly from GitLab. |
-| [RubyGems](https://gitlab.com/gitlab-org/gitlab/issues/803) | Use GitLab to host your own gems. |
-| [SBT](https://gitlab.com/gitlab-org/gitlab/issues/36898) | Resolve dependencies from and deploy build output to SBT repositories when running SBT builds. |
-| [Vagrant](https://gitlab.com/gitlab-org/gitlab/issues/36899) | Securely host your Vagrant boxes in local repositories. |
-
 ## General information
 The existing database model requires the following:

doc/user/packages/index.md

@@ -15,13 +15,29 @@ The Packages feature allows GitLab to act as a repository for the following:
 | [NPM Registry](npm_registry/index.md) **(PREMIUM)**  | The GitLab NPM Registry enables every project in GitLab to have its own space to store [NPM](https://www.npmjs.com/) packages. | 11.7+ |
 | [NuGet Repository](nuget_repository/index.md) **(PREMIUM)**  | *PLANNED* The GitLab NuGet Repository will enable every project in GitLab to have its own space to store [NuGet](https://www.nuget.org/) packages. | 12.8+ |
-TIP: **Tip:**
-Don't you see your package management system supported yet? Consider contributing
-to GitLab. This [development documentation](../../development/packages.md) will
+## Suggested contributions
+
+Consider contributing to GitLab. This [development documentation](../../development/packages.md) will
 guide you through the process. Or check out how other members of the community
 are adding support for [PHP](https://gitlab.com/gitlab-org/gitlab/merge_requests/17417) or [Terraform](https://gitlab.com/gitlab-org/gitlab/merge_requests/18834).
-NOTE: **Note** We are especially interested in adding support for [PyPi](https://gitlab.com/gitlab-org/gitlab/issues/10483), [RubyGems](https://gitlab.com/gitlab-org/gitlab/issues/803), [Debian](https://gitlab.com/gitlab-org/gitlab/issues/5835), and [RPM](https://gitlab.com/gitlab-org/gitlab/issues/5932).
+| Format | Use case |
+| ------ | ------ |
+| [Cargo](https://gitlab.com/gitlab-org/gitlab/issues/33060) | Cargo is the Rust package manager. Build, publish and share Rust packages  |
+| [Chef](https://gitlab.com/gitlab-org/gitlab/issues/36889) | Configuration management with Chef using all the benefits of a repository manager. |
+| [CocoaPods](https://gitlab.com/gitlab-org/gitlab/issues/36890) | Speed up development with Xcode and CocoaPods. |
+| [Conda](https://gitlab.com/gitlab-org/gitlab/issues/36891) | Secure and private local Conda repositories. |
+| [CRAN](https://gitlab.com/gitlab-org/gitlab/issues/36892) | Deploy and resolve CRAN packages for the R language. |
+| [Debian](https://gitlab.com/gitlab-org/gitlab/issues/5835) | Host and provision Debian packages. |
+| [Go](https://gitlab.com/gitlab-org/gitlab/issues/9773) | Resolve Go dependencies from and publish your Go packages to GitLab.  |
+| [Opkg](https://gitlab.com/gitlab-org/gitlab/issues/36894) | Optimize your work with OpenWrt using Opkg repositories. |
+| [P2](https://gitlab.com/gitlab-org/gitlab/issues/36895) | Host all your Eclipse plugins in your own GitLab P2 repository. |
+| [Puppet](https://gitlab.com/gitlab-org/gitlab/issues/36897) | Configuration management meets repository management with Puppet repositories. |
+| [PyPi](https://gitlab.com/gitlab-org/gitlab/issues/10483) | Host PyPi distributions. |
+| [RPM](https://gitlab.com/gitlab-org/gitlab/issues/5932) | Distribute RPMs directly from GitLab. |
+| [RubyGems](https://gitlab.com/gitlab-org/gitlab/issues/803) | Use GitLab to host your own gems. |
+| [SBT](https://gitlab.com/gitlab-org/gitlab/issues/36898) | Resolve dependencies from and deploy build output to SBT repositories when running SBT builds. |
+| [Vagrant](https://gitlab.com/gitlab-org/gitlab/issues/36899) | Securely host your Vagrant boxes in local repositories. |
 ## Package workflows

lib/api/group_export.rb

@@ -3,6 +3,8 @@
 module API
   class GroupExport < Grape::API
     before do
+      not_found! unless Feature.enabled?(:group_import_export, user_group, default_enabled: true)
+
       authorize! :admin_group, user_group
     end

lib/api/search.rb

@@ -47,7 +47,7 @@ module API
         SCOPE_ENTITY[params[:scope].to_sym]
       end
-      def verify_search_scope!
+      def verify_search_scope!(resource:)
         # In EE we have additional validation requirements for searches.
         # Defining this method here as a noop allows us to easily extend it in
         # EE, without having to modify this file directly.
@@ -73,7 +73,7 @@ module API
         use :pagination
       end
       get do
-        verify_search_scope!
+        verify_search_scope!(resource: nil)
         check_users_search_allowed!
         present search, with: entity
@@ -94,7 +94,7 @@ module API
         use :pagination
       end
       get ':id/(-/)search' do
-        verify_search_scope!
+        verify_search_scope!(resource: user_group)
         check_users_search_allowed!
         present search(group_id: user_group.id), with: entity

qa/qa/flow/login.rb

@@ -12,12 +12,6 @@ module QA
         yield
-        # Workaround for a bug preventing sign out from secondary nodes
-        # See https://gitlab.com/gitlab-org/gitlab/issues/198289
-        if address == :geo_secondary
-          Runtime::Browser.visit(:geo_primary, Page::Dashboard::Projects)
-        end
-
         Page::Main::Menu.perform(&:sign_out)
       end

qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb

 # frozen_string_literal: true
 module QA
-  context 'Create', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/196034' do
+  context 'Create' do
     describe 'Web IDE file templates' do
       include Runtime::Fixtures

spec/controllers/projects/artifacts_controller_spec.rb

@@ -156,7 +156,7 @@ describe Projects::ArtifactsController do
         it 'returns 404' do
           download_artifact(file_type: file_type)
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
@@ -236,7 +236,7 @@ describe Projects::ArtifactsController do
         it 'renders the file view' do
           get :file, params: { namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt' }
-          expect(response).to have_gitlab_http_status(302)
+          expect(response).to have_gitlab_http_status(:found)
         end
       end
@@ -302,7 +302,7 @@ describe Projects::ArtifactsController do
       it 'renders the file view' do
         get :file, params: { namespace_id: private_project.namespace, project_id: private_project, job_id: job, path: 'ci_artifacts.txt' }
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
     end
   end
@@ -317,7 +317,7 @@ describe Projects::ArtifactsController do
         it 'serves the file using workhorse' do
           subject
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(send_data).to start_with('artifacts-entry:')
           expect(params.keys).to eq(%w(Archive Entry))

spec/controllers/projects/autocomplete_sources_controller_spec.rb

@@ -65,7 +65,7 @@ describe Projects::AutocompleteSourcesController do
         get :milestones, format: :json, params: { namespace_id: group.path, project_id: project.path }
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end

spec/controllers/projects/avatars_controller_spec.rb

@@ -16,7 +16,7 @@ describe Projects::AvatarsController do
       it 'shows 404' do
         subject
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
@@ -31,7 +31,7 @@ describe Projects::AvatarsController do
         it 'sends the avatar' do
           subject
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(response.header['Content-Disposition']).to eq('inline')
           expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with('git-blob:')
           expect(response.header[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"

spec/controllers/projects/blob_controller_spec.rb

@@ -232,7 +232,7 @@ describe Projects::BlobController do
       end
       it 'redirects to blob show' do
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
@@ -246,7 +246,7 @@ describe Projects::BlobController do
       end
       it 'redirects to blob show' do
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
   end

spec/controllers/projects/boards_controller_spec.rb

@@ -39,7 +39,7 @@ describe Projects::BoardsController do
         it 'returns a not found 404 response' do
           list_boards
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
           expect(response.content_type).to eq 'text/html'
         end
       end
@@ -82,7 +82,7 @@ describe Projects::BoardsController do
         it 'returns a not found 404 response' do
           list_boards format: :json
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
           expect(response.content_type).to eq 'application/json'
         end
       end
@@ -94,7 +94,7 @@ describe Projects::BoardsController do
       it 'returns a not found 404 response' do
         list_boards
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
@@ -137,7 +137,7 @@ describe Projects::BoardsController do
         it 'returns a not found 404 response' do
           read_board board: board
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
           expect(response.content_type).to eq 'text/html'
         end
       end
@@ -174,7 +174,7 @@ describe Projects::BoardsController do
         it 'returns a not found 404 response' do
           read_board board: board, format: :json
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
           expect(response.content_type).to eq 'application/json'
         end
       end
@@ -186,7 +186,7 @@ describe Projects::BoardsController do
         read_board board: another_board
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end

spec/controllers/projects/branches_controller_spec.rb

@@ -217,7 +217,7 @@ describe Projects::BranchesController do
                  }
             expect(response.location).to include(project_new_blob_path(project, branch))
-            expect(response).to have_gitlab_http_status(302)
+            expect(response).to have_gitlab_http_status(:found)
           end
         end
@@ -238,7 +238,7 @@ describe Projects::BranchesController do
                }
           expect(response.location).to include(project_new_blob_path(project, branch))
-          expect(response).to have_gitlab_http_status(302)
+          expect(response).to have_gitlab_http_status(:found)
         end
       end
@@ -289,7 +289,7 @@ describe Projects::BranchesController do
       it 'returns a successful 200 response' do
         create_branch name: 'my-branch', ref: 'master'
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
       it 'returns the created branch' do
@@ -303,7 +303,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_gitlab_http_status(422)
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
       end
     end
@@ -335,7 +335,7 @@ describe Projects::BranchesController do
              project_id: project
            }
-      expect(response).to have_gitlab_http_status(303)
+      expect(response).to have_gitlab_http_status(:see_other)
     end
   end
@@ -361,28 +361,28 @@ describe Projects::BranchesController do
       context "valid branch name, valid source" do
         let(:branch) { "feature" }
-        it { expect(response).to have_gitlab_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(:ok) }
         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_gitlab_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(:ok) }
         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_gitlab_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(:ok) }
         it { expect(response.body).to be_blank }
       end
       context "invalid branch name, valid ref" do
         let(:branch) { "no-branch" }
-        it { expect(response).to have_gitlab_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
         it { expect(response.body).to be_blank }
       end
     end
@@ -398,7 +398,7 @@ describe Projects::BranchesController do
           expect(json_response).to eql("message" => 'Branch was deleted')
         end
-        it { expect(response).to have_gitlab_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(:ok) }
       end
       context 'valid branch name with unencoded slashes' do
@@ -408,7 +408,7 @@ describe Projects::BranchesController do
           expect(json_response).to eql('message' => 'Branch was deleted')
         end
-        it { expect(response).to have_gitlab_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(:ok) }
       end
       context "valid branch name with encoded slashes" do
@@ -418,7 +418,7 @@ describe Projects::BranchesController do
           expect(json_response).to eql('message' => 'Branch was deleted')
         end
-        it { expect(response).to have_gitlab_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(:ok) }
       end
       context 'invalid branch name, valid ref' do
@@ -428,7 +428,7 @@ describe Projects::BranchesController do
           expect(json_response).to eql('message' => 'No such branch')
         end
-        it { expect(response).to have_gitlab_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
     end
@@ -478,7 +478,7 @@ describe Projects::BranchesController do
       it 'responds with status 404' do
         destroy_all_merged
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -519,7 +519,7 @@ describe Projects::BranchesController do
               state: 'all'
             }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
@@ -537,7 +537,7 @@ describe Projects::BranchesController do
               state: 'all'
             }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
@@ -594,7 +594,7 @@ describe Projects::BranchesController do
             names: %w[fix add-pdf-file branch-merged]
           }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response).to eq(
         "fix" => { "behind" => 29, "ahead" => 2 },
         "branch-merged" => { "behind" => 1, "ahead" => 0 },
@@ -612,7 +612,7 @@ describe Projects::BranchesController do
             project_id: project
           }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response.count).to be > 1
     end
@@ -629,7 +629,7 @@ describe Projects::BranchesController do
               project_id: project
             }
-        expect(response).to have_gitlab_http_status(422)
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
         expect(json_response['error']).to eq("Specify at least one and at most #{Kaminari.config.default_per_page} branch names")
       end
@@ -642,7 +642,7 @@ describe Projects::BranchesController do
               names: %w[fix add-pdf-file branch-merged]
             }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response.count).to be > 1
       end
     end

spec/controllers/projects/clusters_controller_spec.rb

@@ -648,7 +648,7 @@ describe Projects::ClustersController do
             go(format: :json)
             cluster.reload
-            expect(response).to have_http_status(:no_content)
+            expect(response).to have_gitlab_http_status(:no_content)
             expect(cluster.enabled).to be_falsey
             expect(cluster.name).to eq('my-new-cluster-name')
             expect(cluster).not_to be_managed
@@ -671,7 +671,7 @@ describe Projects::ClustersController do
           it "rejects changes" do
             go(format: :json)
-            expect(response).to have_http_status(:bad_request)
+            expect(response).to have_gitlab_http_status(:bad_request)
           end
         end
       end