Add latest changes from gitlab-org/gitlab@master

doc/administration/gitaly/praefect.md

@@ -91,7 +91,7 @@ Below we assume that you have administrative access as the `postgres`
 user. First open a `psql` session as the `postgres` user:
 ```shell
-psql -h POSTGRESQL_SERVER -U postgres -d template1
+/opt/gitlab/embedded/bin/psql -h POSTGRESQL_SERVER -U postgres -d template1
 ```
 Once you are connected, run the following command. Replace
@@ -100,21 +100,21 @@ generated for the `praefect` SQL user:
 ```sql
 CREATE ROLE praefect WITH LOGIN CREATEDB PASSWORD 'PRAEFECT_SQL_PASSWORD';
-\q # exit psql
+\q
 ```
 Now connect as the `praefect` user to create the database. This has
 the side effect of verifying that you have access:
 ```shell
-psql -h POSTGRESQL_SERVER -U praefect -d template1
+/opt/gitlab/embedded/bin/psql -h POSTGRESQL_SERVER -U praefect -d template1
 ```
 Once you have connected as the `praefect` user, run:
 ```sql
 CREATE DATABASE praefect_production WITH ENCODING=UTF8;
-\q # quit psql
+\q
 ```
 #### Praefect
@@ -260,9 +260,17 @@ git_data_dirs({
 For more information on Gitaly server configuration, see our [Gitaly documentation](index.md#3-gitaly-server-configuration).
+When finished editing the configuration file for each Gitaly server, run the
+reconfigure command to put changes into effect:
+
+```shell
+sudo gitlab-ctl reconfigure
+```
+
 When all Gitaly servers are configured, you can run the Praefect connection
 checker to verify Praefect can connect to all Gitaly servers in the Praefect
-config:
+config. This can be done by running the following command on the Praefect
+server:
 ```shell
 sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml dial-nodes

doc/development/fe_guide/vuex.md

@@ -396,3 +396,93 @@ export default () => {};
 ```
 [vuex-docs]: https://vuex.vuejs.org
+
+### Two way data binding
+
+When storing form data in Vuex, it is sometimes necessary to update the value stored. The store should never be mutated directly, and an action should be used instead.
+In order to still use `v-model` in our code, we need to create computed properties in this form:
+
+```javascript
+export default {
+  computed: {
+    someValue: {
+      get() {
+        return this.$store.state.someValue;
+      },
+      set(value) {
+        this.$store.dispatch("setSomeValue", value);
+      }
+    }
+  }
+};
+```
+
+An alternative is to use `mapState` and `mapActions`:
+
+```javascript
+export default {
+  computed: {
+    ...mapState(['someValue']),
+    localSomeValue: {
+      get() {
+        return this.someValue;
+      },
+      set(value) {
+        this.setSomeValue(value)
+      }
+    }
+  },
+  methods: {
+    ...mapActions(['setSomeValue'])
+  }
+};
+```
+
+Adding a few of these properties becomes cumbersome, and makes the code more repetitive with more tests to write. To simplify this there is a helper in `~/vuex_shared/bindings.js`
+
+The helper can be used like so:
+
+```javascript
+// this store is non-functional and only used to give context to the example
+export default {
+  state: {
+    baz: '',
+    bar: '',
+    foo: ''
+  },
+  actions: {
+    updateBar() {...}
+    updateAll() {...}
+  },
+  getters: {
+    getFoo() {...}
+  }
+}
+```
+
+```javascript
+import { mapComputed } from '~/vuex_shared/bindings'
+export default {
+  computed: {
+    /**
+     * @param {(string[]|Object[])} list - list of string matching state keys or list objects
+     * @param {string} list[].key - the key matching the key present in the vuex state
+     * @param {string} list[].getter - the name of the getter, leave it empty to not use a getter
+     * @param {string} list[].updateFn - the name of the action, leave it empty to use the default action
+     * @param {string} defaultUpdateFn - the default function to dispatch
+     * @param {string} root - optional key of the state where to search fo they keys described in list
+     * @returns {Object} a dictionary with all the computed properties generated
+    */
+    ...mapComputed(
+      [
+        'baz',
+        { key: 'bar', updateFn: 'updateBar' }
+        { key: 'foo', getter: 'getFoo' },
+      ],
+      'updateAll',
+    ),
+  }
+}
+```
+
+`mapComputed` will then generate the appropriate computed properties that get the data from the store and dispatch the correct action when updated.

doc/development/testing_guide/best_practices.md

@@ -532,20 +532,24 @@ This is especially useful whenever it's showing 500 internal server error.
 ### Shared contexts
-All shared contexts should be placed under `spec/support/shared_contexts/`.
-Shared contexts can be placed in subfolder if they apply to a certain type of
-specs only (e.g. features, requests etc.) but shouldn't be if they apply to
-multiple type of specs.
+Shared contexts only used in one spec file can be declared inline.
+Any shared contexts used by more than one spec file:
+
+- Should be placed under `spec/support/shared_contexts/`.
+- Can be placed in subfolder if they apply to a certain type of specs only
+  (e.g. features, requests etc.) but shouldn't be if they apply to multiple type of specs.
 Each file should include only one context and have a descriptive name, e.g.
 `spec/support/shared_contexts/controllers/githubish_import_controller_shared_context.rb`.
 ### Shared examples
-All shared examples should be placed under `spec/support/shared_examples/`.
-Shared examples can be placed in subfolder if they apply to a certain type of
-specs only (e.g. features, requests etc.) but shouldn't be if they apply to
-multiple type of specs.
+Shared examples only used in one spec file can be declared inline.
+Any shared examples used by more than one spec file:
+
+- Should be placed under `spec/support/shared_examples/`.
+- Can be placed in subfolder if they apply to a certain type of specs only
+  (e.g. features, requests etc.) but shouldn't be if they apply to multiple type of specs.
 Each file should include only one context and have a descriptive name, e.g.
 `spec/support/shared_examples/controllers/githubish_import_controller_shared_example.rb`.

doc/user/application_security/index.md

@@ -40,7 +40,7 @@ The various scanning tools and the vulnerabilities database are updated regularl
 |:-------------------------------------------------------------|-------------------------------------------|
 | [Container Scanning](container_scanning/index.md)            | Uses `clair` underneath and the latest `clair-db` version is used for each job run by running the [`latest` docker image tag](https://gitlab.com/gitlab-org/gitlab/blob/438a0a56dc0882f22bdd82e700554525f552d91b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml#L37). The `clair-db` database [is updated daily according to the author](https://github.com/arminc/clair-local-scan#clair-server-or-local). |
 | [Dependency Scanning](dependency_scanning/index.md)          | Relies on `bundler-audit` (for Rubygems), `retire.js` (for NPM packages) and `gemnasium` (GitLab's own tool for all libraries). `bundler-audit` and `retire.js` both fetch their vulnerabilities data from GitHub repositories, so vulnerabilities added to `ruby-advisory-db` and `retire.js` are immediately available. The tools themselves are updated once per month if there's a new version. The [Gemnasium DB](https://gitlab.com/gitlab-org/security-products/gemnasium-db) is updated at least once a week. |
-| [Dynamic Application Security Testing (DAST)](dast/index.md) | Updated weekly on Sundays. The underlying tool, `zaproxy`, downloads fresh rules at startup. |
+| [Dynamic Application Security Testing (DAST)](dast/index.md) | The scanning engine is updated on a periodic basis. See the [version of the underlying tool `zaproxy`](https://gitlab.com/gitlab-org/security-products/dast/blob/master/Dockerfile#L1). The scanning rules are downloaded at the runtime of the scan. |
 | [Static Application Security Testing (SAST)](sast/index.md)  | Relies exclusively on [the tools GitLab is wrapping](sast/index.md#supported-languages-and-frameworks). The underlying analyzers are updated at least once per month if a relevant update is available. The vulnerabilities database is updated by the upstream tools. |
 You don't have to update GitLab to benefit from the latest vulnerabilities definitions,

doc/user/packages/npm_registry/index.md

@@ -28,52 +28,87 @@ You should then be able to see the **Packages** section on the left sidebar.
 Before proceeding to authenticating with the GitLab NPM Registry, you should
 get familiar with the package naming convention.
-## Package naming convention
-**Packages must be scoped in the root namespace of the project**. The package
-name may be anything but it is preferred that the project name be used unless
-it is not possible due to a naming collision. For example:
-| Project                | Package                 | Supported |
-| ---------------------- | ----------------------- | --------- |
-| `foo/bar`              | `@foo/bar`              | Yes       |
-| `foo/bar/baz`          | `@foo/baz`              | Yes       |
-| `foo/bar/buz`          | `@foo/anything`         | Yes       |
-| `gitlab-org/gitlab`    | `@gitlab-org/gitlab`    | Yes       |
-| `gitlab-org/gitlab`    | `@foo/bar`              | No        |
-The regex that is used for naming is validating all package names from all package managers:
+## Getting started
+This section will cover installing NPM (or Yarn) and building a package for your
+JavaScript project. This is a quickstart if you are new to NPM packages. If you
+are already using NPM and understand how to build your own packages, move on to
+the [next section](#authenticating-to-the-gitlab-npm-registry).
+### Installing NPM
+Follow the instructions at [npmjs.com](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) to download and install Node.JS and
+NPM to your local development environment.
+
+Once installation is complete, verify you can use NPM in your terminal by
+running:
+```sh
+npm --version
 ```
-/\A\@?(([\w\-\.\+]*)\/)*([\w\-\.]+)@?(([\w\-\.\+]*)\/)*([\w\-\.]*)\z/
+
+You should see the NPM version printed in the output:
+
+```
+6.10.3
 ```
-It allows for capital letters, while NPM does not, and allows for almost all of the
-characters NPM allows with a few exceptions (`~` is not allowed).
-NOTE: **Note:** Capital letters are needed because the scope is required to be
-identical to the top level namespace of the project. So, for example, if your
-project path is `My-Group/project-foo`, your package must be named `@My-Group/any-package-name`.
-`@my-group/any-package-name` will not work.
-CAUTION: **When updating the path of a user/group or transferring a (sub)group/project:**
-If you update the root namespace of a project with NPM packages, your changes will be rejected. To be allowed to do that, make sure to remove any NPM package first. Don't forget to update your `.npmrc` files to follow the above naming convention and run `npm publish` if necessary.
-Now, you can configure your project to authenticate with the GitLab NPM
-Registry.
+### Installing Yarn
+You may want to install and use Yarn as an alternative to NPM. Follow the
+instructions at [yarnpkg.com](https://yarnpkg.com/en/docs/install) to install on
+your development environment.
+Once installed, you can verify that Yarn is available with the following command:
+```sh
+yarn --version
+```
+
+You should see the version printed like so:
+
+```
+1.19.1
+```
+
+### Creating a project
+
+Understanding how to create a full JavaScript project is outside the scope of
+this guide but you can initialize a new empty package by creating and navigating
+to an empty directory and using the following command:
+
+```sh
+npm init
+```
+
+Or if you're using Yarn:
+
+```sh
+yarn init
+```
+
+This will take you through a series of questions to produce a `package.json`
+file, which is required for all NPM packages. The most important question is the
+package name. NPM packages must [follow the naming convention](#package-naming-convention)
+and be scoped to the project or group where the registry exists.
+
+Once you have completed the setup, you are now ready to upload your package to
+the GitLab registry. To get started, you will need to set up authentication then
+configure GitLab as a remote registry.
 ## Authenticating to the GitLab NPM Registry
 If a project is private or you want to upload an NPM package to GitLab,
-credentials will need to be provided for authentication. Support is available for [OAuth tokens](../../../api/oauth2.md#resource-owner-password-credentials-flow) or [personal access tokens](../../profile/personal_access_tokens.md).
+credentials will need to be provided for authentication. [Personal access tokens](../../profile/personal_access_tokens.md)
+are preferred, but support is available for [OAuth tokens](../../../api/oauth2.md#resource-owner-password-credentials-flow).
 CAUTION: **2FA is only supported with personal access tokens:**
 If you have 2FA enabled, you need to use a [personal access token](../../profile/personal_access_tokens.md) with OAuth headers with the scope set to `api`. Standard OAuth tokens won't be able to authenticate to the GitLab NPM Registry.
-### Authenticating with an OAuth token
-To authenticate with an [OAuth token](../../../api/oauth2.md#resource-owner-password-credentials-flow)
-or [personal access token](../../profile/personal_access_tokens.md), set your NPM configuration:
+### Authenticating with a personal access token
+To authenticate with a [personal access token](../../profile/personal_access_tokens.md),
+set your NPM configuration:
 ```bash
 # Set URL for your scoped packages.
@@ -90,7 +125,7 @@ npm config set '//gitlab.com/api/v4/packages/npm/:_authToken' "<your_token>"
 ```
 Replace `<your_project_id>` with your project ID which can be found on the home page
-of your project and `<your_token>` with your OAuth or personal access token.
+of your project and `<your_token>` with your personal access token.
 If you have a self-hosted GitLab installation, replace `gitlab.com` with your
 domain name.
@@ -142,9 +177,9 @@ Before you will be able to upload a package, you need to specify the registry
 for NPM. To do this, add the following section to the bottom of `package.json`:
 ```json
-  "publishConfig": {
-    "@foo:registry":"https://gitlab.com/api/v4/projects/<your_project_id>/packages/npm/"
-  }
+"publishConfig": {
+  "@foo:registry":"https://gitlab.com/api/v4/projects/<your_project_id>/packages/npm/"
+}
 ```
 Replace `<your_project_id>` with your project ID, which can be found on the home
@@ -173,6 +208,93 @@ delete the existing package first. This aligns with npmjs.org's behavior, with
 the exception that npmjs.org does not allow users to ever publish the same version
 more than once, even if it has been deleted.
+## Package naming convention
+
+**Packages must be scoped in the root namespace of the project**. The package
+name may be anything but it is preferred that the project name be used unless
+it is not possible due to a naming collision. For example:
+
+| Project                | Package                 | Supported |
+| ---------------------- | ----------------------- | --------- |
+| `foo/bar`              | `@foo/bar`              | Yes       |
+| `foo/bar/baz`          | `@foo/baz`              | Yes       |
+| `foo/bar/buz`          | `@foo/anything`         | Yes       |
+| `gitlab-org/gitlab`    | `@gitlab-org/gitlab`    | Yes       |
+| `gitlab-org/gitlab`    | `@foo/bar`              | No        |
+
+The regex that is used for naming is validating all package names from all package managers:
+
+```
+/\A\@?(([\w\-\.\+]*)\/)*([\w\-\.]+)@?(([\w\-\.\+]*)\/)*([\w\-\.]*)\z/
+```
+
+It allows for capital letters, while NPM does not, and allows for almost all of the
+characters NPM allows with a few exceptions (`~` is not allowed).
+
+NOTE: **Note:** Capital letters are needed because the scope is required to be
+identical to the top level namespace of the project. So, for example, if your
+project path is `My-Group/project-foo`, your package must be named `@My-Group/any-package-name`.
+`@my-group/any-package-name` will not work.
+
+CAUTION: **When updating the path of a user/group or transferring a (sub)group/project:**
+If you update the root namespace of a project with NPM packages, your changes will be rejected. To be allowed to do that, make sure to remove any NPM package first. Don't forget to update your `.npmrc` files to follow the above naming convention and run `npm publish` if necessary.
+
+Now, you can configure your project to authenticate with the GitLab NPM
+Registry.
+
+## Installing a package
+
+NPM packages are commonly installed using the the `npm` or `yarn` commands
+inside a JavaScript project. If you haven't already, you will need to set the
+URL for scoped packages. You can do this with the following command:
+
+```sh
+npm config set @foo:registry https://gitlab.com/api/v4/packages/npm/
+```
+
+You will need to replace `@foo` with your scope.
+
+Next, you will need to ensure [authentication](#authenticating-to-the-gitlab-npm-registry)
+is setup so you can successfully install the package. Once this has been
+completed, you can run the following command inside your project to install a
+package:
+
+```sh
+npm install @my-project-scope/my-package
+```
+
+Or if you're using Yarn:
+
+```sh
+yarn add @my-project-scope/my-package
+```
+
+## Removing a package
+
+In the packages view of your project page, you can delete packages by clicking
+the red trash icons or by clicking the **Delete** button on the package details
+page.
+
+## Publishing a package with CI/CD
+
+To work with NPM commands within [GitLab CI](./../../../ci/README.md), you can use
+`CI_JOB_TOKEN` in place of the personal access token in your commands.
+
+A simple example `gitlab-ci.yml` file for publishing NPM packages:
+
+```yml
+image: node:latest
+
+stages:
+  - deploy
+
+deploy:
+  stage: deploy
+  script:
+    - echo '//gitlab.com/api/v4/projects/<your_project_id>/packages/npm/:_authToken=${CI_JOB_TOKEN}'>.npmrc
+    - npm publish
+```
+
 ## Troubleshooting
 ### Error running yarn with NPM registry
@@ -192,11 +314,11 @@ info If you think this is a bug, please open a bug report with the information p
 info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command
 ```
-In this case, try adding this to your `.npmrc` file (and replace `<your_oauth_token>`
-with your OAuth or personal access token):
+In this case, try adding this to your `.npmrc` file (and replace `<your_token>`
+with your personal access token):
 ```text
-//gitlab.com/api/v4/projects/:_authToken=<your_oauth_token>
+//gitlab.com/api/v4/projects/:_authToken=<your_token>
 ```
 ### `npm publish` targets default NPM registry (`registry.npmjs.org`)
@@ -220,8 +342,8 @@ should look like:
 And the `.npmrc` file should look like:
 ```ini
-//gitlab.com/api/v4/projects/<your_project_id>/packages/npm/:_authToken=<your_oauth_token>
-//gitlab.com/api/v4/packages/npm/:_authToken=<your_oauth_token>
+//gitlab.com/api/v4/projects/<your_project_id>/packages/npm/:_authToken=<your_token>
+//gitlab.com/api/v4/packages/npm/:_authToken=<your_token>
 @foo:registry=https://gitlab.com/api/v4/packages/npm/
 ```

lib/banzai/filter/repository_link_filter.rb

@@ -101,11 +101,18 @@ module Banzai
       def rebuild_relative_uri(uri)
         file_path = nested_file_path_if_exists(uri)
+        resource_type = uri_type(file_path)
+
+        # Repository routes are under /-/ scope now.
+        # Since we craft a path without using route helpers we must
+        # ensure - is added here.
+        prefix = '-' if %w(tree blob raw commits).include?(resource_type.to_s)
         uri.path = [
           relative_url_root,
           project.full_path,
-          uri_type(file_path),
+          prefix,
+          resource_type,
           Addressable::URI.escape(ref).gsub('#', '%23'),
           Addressable::URI.escape(file_path)
         ].compact.join('/').squeeze('/').chomp('/')

lib/gitlab/auth/saml/auth_hash.rb

@@ -28,7 +28,7 @@ module Gitlab
         end
         def extract_authn_context(document)
-          REXML::XPath.first(document, "//*[name()='saml:AuthnStatement' or name()='saml2:AuthnStatement']/*[name()='saml:AuthnContext' or name()='saml2:AuthnContext']/*[name()='saml:AuthnContextClassRef' or name()='saml2:AuthnContextClassRef']/text()").to_s
+          REXML::XPath.first(document, "//*[name()='saml:AuthnStatement' or name()='saml2:AuthnStatement' or name()='AuthnStatement']/*[name()='saml:AuthnContext' or name()='saml2:AuthnContext' or name()='AuthnContext']/*[name()='saml:AuthnContextClassRef' or name()='saml2:AuthnContextClassRef' or name()='AuthnContextClassRef']/text()").to_s
         end
       end
     end

lib/gitlab/ci/pipeline/chain/populate.rb

@@ -17,7 +17,7 @@ module Gitlab
             #
             pipeline.stages = @command.stage_seeds.map(&:to_resource)
-            if pipeline.stages.none?
+            if stage_names.empty?
               return error('No stages / jobs for this pipeline.')
             end
@@ -31,6 +31,15 @@ module Gitlab
           def break?
             pipeline.errors.any?
           end
+
+          private
+
+          def stage_names
+            # We filter out `.pre/.post` stages, as they alone are not considered
+            # a complete pipeline:
+            # https://gitlab.com/gitlab-org/gitlab/issues/198518
+            pipeline.stages.map(&:name) - ::Gitlab::Ci::Config::EdgeStagesInjector::EDGES
+          end
         end
       end
     end

lib/gitlab/dependency_linker/godeps_json_linker.rb

@@ -12,10 +12,12 @@ module Gitlab
       def link_dependencies
         link_json('ImportPath') do |path|
           case path
+          when %r{\A(?<repo>github\.com/#{REPO_REGEX})/(?<path>.+)\z}
+            "https://#{$~[:repo]}/tree/master/#{$~[:path]}"
           when %r{\A(?<repo>gitlab\.com/#{NESTED_REPO_REGEX})\.git/(?<path>.+)\z},
-              %r{\A(?<repo>git(lab|hub)\.com/#{REPO_REGEX})/(?<path>.+)\z}
-            "https://#{$~[:repo]}/tree/master/#{$~[:path]}"
+            %r{\A(?<repo>gitlab\.com/#{REPO_REGEX})/(?<path>.+)\z}
+            "https://#{$~[:repo]}/-/tree/master/#{$~[:path]}"
           when /\Agolang\.org/
             "https://godoc.org/#{path}"
           else

lib/gitlab/middleware/go.rb

@@ -60,7 +60,7 @@ module Gitlab
                          end
         meta_import_tag = tag :meta, name: 'go-import', content: "#{import_prefix} git #{repository_url}"
-        meta_source_tag = tag :meta, name: 'go-source', content: "#{import_prefix} #{project_url} #{project_url}/tree/#{branch}{/dir} #{project_url}/blob/#{branch}{/dir}/{file}#L{line}"
+        meta_source_tag = tag :meta, name: 'go-source', content: "#{import_prefix} #{project_url} #{project_url}/-/tree/#{branch}{/dir} #{project_url}/-/blob/#{branch}{/dir}/{file}#L{line}"
         head_tag = content_tag :head, meta_import_tag + meta_source_tag
         html_tag = content_tag :html, head_tag + body_tag
         [html_tag, 200]

lib/gitlab/shell.rb

@@ -11,18 +11,26 @@ module Gitlab
     Error = Class.new(StandardError)
     class << self
+      # Retrieve GitLab Shell secret token
+      #
+      # @return [String] secret token
       def secret_token
         @secret_token ||= begin
           File.read(Gitlab.config.gitlab_shell.secret_file).chomp
         end
       end
+      # Ensure gitlab shell has a secret token stored in the secret_file
+      # if that was never generated, generate a new one
       def ensure_secret_token!
         return if File.exist?(File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret'))
         generate_and_link_secret_token
       end
+      # Returns required GitLab shell version
+      #
+      # @return [String] version from the manifest file
       def version_required
         @version_required ||= File.read(Rails.root
                                         .join('GITLAB_SHELL_VERSION')).strip
@@ -48,24 +56,31 @@ module Gitlab
       end
     end
-    # Convenience methods for initializing a new repository with a Project model.
+    # Initialize a new project repository using a Project model
+    #
+    # @param [Project] project
+    # @return [Boolean] whether repository could be created
     def create_project_repository(project)
       create_repository(project.repository_storage, project.disk_path, project.full_path)
     end
+    # Initialize a new wiki repository using a Project model
+    #
+    # @param [Project] project
+    # @return [Boolean] whether repository could be created
     def create_wiki_repository(project)
       create_repository(project.repository_storage, project.wiki.disk_path, project.wiki.full_path)
     end
     # Init new repository
     #
-    # storage - the shard key
-    # disk_path - project disk path
-    # gl_project_path - project name
-    #
-    # Ex.
+    # @example Create a repository
     #   create_repository("default", "path/to/gitlab-ci", "gitlab/gitlab-ci")
     #
+    # @param [String] storage the shard key
+    # @param [String] disk_path project path on disk
+    # @param [String] gl_project_path project name
+    # @return [Boolean] whether repository could be created
     def create_repository(storage, disk_path, gl_project_path)
       relative_path = disk_path.dup
       relative_path << '.git' unless relative_path.end_with?('.git')
@@ -82,29 +97,39 @@ module Gitlab
       false
     end
+    # Import wiki repository from external service
+    #
+    # @param [Project] project
+    # @param [Gitlab::LegacyGithubImport::WikiFormatter, Gitlab::BitbucketImport::WikiFormatter] wiki_formatter
+    # @return [Boolean] whether repository could be imported
     def import_wiki_repository(project, wiki_formatter)
       import_repository(project.repository_storage, wiki_formatter.disk_path, wiki_formatter.import_url, project.wiki.full_path)
     end
+    # Import project repository from external service
+    #
+    # @param [Project] project
+    # @return [Boolean] whether repository could be imported
     def import_project_repository(project)
       import_repository(project.repository_storage, project.disk_path, project.import_url, project.full_path)
     end
     # Import repository
     #
-    # storage - project's storage name
-    # name - project disk path
-    # url - URL to import from
-    #
-    # Ex.
-    #   import_repository("nfs-file06", "gitlab/gitlab-ci", "https://gitlab.com/gitlab-org/gitlab-test.git")
+    # @example Import a repository
+    #   import_repository("nfs-file06", "gitlab/gitlab-ci", "https://gitlab.com/gitlab-org/gitlab-test.git", "gitlab/gitlab-ci")
     #
-    def import_repository(storage, name, url, gl_project_path)
+    # @param [String] storage  project's storage name
+    # @param [String] disk_path project path on disk
+    # @param [String] url from external resource to import from
+    # @param [String] gl_project_path project name
+    # @return [Boolean] whether repository could be imported
+    def import_repository(storage, disk_path, url, gl_project_path)
       if url.start_with?('.', '/')
         raise Error.new("don't use disk paths with import_repository: #{url.inspect}")
       end
-      relative_path = "#{name}.git"
+      relative_path = "#{disk_path}.git"
       cmd = GitalyGitlabProjects.new(storage, relative_path, gl_project_path)
       success = cmd.import_project(url, git_timeout)
@@ -113,27 +138,31 @@ module Gitlab
       success
     end
-    # storage - project's storage path
-    # path - project disk path
-    # new_path - new project disk path
+    # Move or rename a repository
     #
-    # Ex.
+    # @example Move/rename a repository
     #   mv_repository("/path/to/storage", "gitlab/gitlab-ci", "randx/gitlab-ci-new")
-    def mv_repository(storage, path, new_path)
-      return false if path.empty? || new_path.empty?
-      Gitlab::Git::Repository.new(storage, "#{path}.git", nil, nil).rename("#{new_path}.git")
+    #
+    # @param [String] storage project's storage path
+    # @param [String] disk_path current project path on disk
+    # @param [String] new_disk_path new project path on disk
+    # @return [Boolean] whether repository could be moved/renamed on disk
+    def mv_repository(storage, disk_path, new_disk_path)
+      return false if disk_path.empty? || new_disk_path.empty?
+      Gitlab::Git::Repository.new(storage, "#{disk_path}.git", nil, nil).rename("#{new_disk_path}.git")
       true
     rescue => e
-      Gitlab::ErrorTracking.track_exception(e, path: path, new_path: new_path, storage: storage)
+      Gitlab::ErrorTracking.track_exception(e, path: disk_path, new_path: new_disk_path, storage: storage)
       false
     end
     # Fork repository to new path
-    # source_project - forked-from Project
-    # target_project - forked-to Project
+    #
+    # @param [Project] source_project forked-from Project
+    # @param [Project] target_project forked-to Project
     def fork_repository(source_project, target_project)
       forked_from_relative_path = "#{source_project.disk_path}.git"
       fork_args = [target_project.repository_storage, "#{target_project.disk_path}.git", target_project.full_path]
@@ -145,29 +174,32 @@ module Gitlab
     # for rm_namespace. Given the underlying implementation removes the name
     # passed as second argument on the passed storage.
     #
-    # storage - project's storage path
-    # name - project disk path
-    #
-    # Ex.
+    # @example Remove a repository
     #   remove_repository("/path/to/storage", "gitlab/gitlab-ci")
-    def remove_repository(storage, name)
-      return false if name.empty?
-      Gitlab::Git::Repository.new(storage, "#{name}.git", nil, nil).remove
+    #
+    # @param [String] storage project's storage path
+    # @param [String] disk_path current project path on disk
+    def remove_repository(storage, disk_path)
+      return false if disk_path.empty?
+      Gitlab::Git::Repository.new(storage, "#{disk_path}.git", nil, nil).remove
       true
     rescue => e
-      Rails.logger.warn("Repository does not exist: #{e} at: #{name}.git") # rubocop:disable Gitlab/RailsLogger
-      Gitlab::ErrorTracking.track_exception(e, path: name, storage: storage)
+      Rails.logger.warn("Repository does not exist: #{e} at: #{disk_path}.git") # rubocop:disable Gitlab/RailsLogger
+      Gitlab::ErrorTracking.track_exception(e, path: disk_path, storage: storage)
       false
     end
     # Add new key to authorized_keys
     #
-    # Ex.
+    # @example Add new key
     #   add_key("key-42", "sha-rsa ...")
     #
+    # @param [String] key_id identifier of the key
+    # @param [String] key_content key content (public certificate)
+    # @return [Boolean] whether key could be added
     def add_key(key_id, key_content)
       return unless self.authorized_keys_enabled?
@@ -176,39 +208,45 @@ module Gitlab
     # Batch-add keys to authorized_keys
     #
-    # Ex.
+    # @example
     #   batch_add_keys(Key.all)
+    #
+    # @param [Array<Key>] keys
+    # @return [Boolean] whether keys could be added
     def batch_add_keys(keys)
       return unless self.authorized_keys_enabled?
       gitlab_authorized_keys.batch_add_keys(keys)
     end
-    # Remove ssh key from authorized_keys
+    # Remove SSH key from authorized_keys
     #
-    # Ex.
+    # @example Remove a key
     #   remove_key("key-342")
     #
-    def remove_key(id, _ = nil)
+    # @param [String] key_id
+    # @return [Boolean] whether key could be removed or not
+    def remove_key(key_id, _ = nil)
       return unless self.authorized_keys_enabled?
-      gitlab_authorized_keys.rm_key(id)
+      gitlab_authorized_keys.rm_key(key_id)
     end
-    # Remove all ssh keys from gitlab shell
+    # Remove all SSH keys from gitlab shell
     #
-    # Ex.
+    # @example Remove all keys
     #   remove_all_keys
     #
+    # @return [Boolean] whether keys could be removed or not
     def remove_all_keys
       return unless self.authorized_keys_enabled?
       gitlab_authorized_keys.clear
     end
-    # Remove ssh keys from gitlab shell that are not in the DB
+    # Remove SSH keys from gitlab shell that are not in the DB
     #
-    # Ex.
+    # @example Remove keys not on the database
     #   remove_keys_not_found_in_db
     #
     # rubocop: disable CodeReuse/ActiveRecord
@@ -234,11 +272,12 @@ module Gitlab
     # Add empty directory for storing repositories
     #
-    # Ex.
+    # @example Add new namespace directory
     #   add_namespace("default", "gitlab")
     #
+    # @param [String] storage project's storage path
+    # @param [String] name namespace name
     def add_namespace(storage, name)
-      # https://gitlab.com/gitlab-org/gitlab-foss/issues/58012
       Gitlab::GitalyClient.allow_n_plus_1_calls do
         Gitlab::GitalyClient::NamespaceService.new(storage).add(name)
       end
@@ -249,9 +288,11 @@ module Gitlab
     # Remove directory from repositories storage
     # Every repository inside this directory will be removed too
     #
-    # Ex.
+    # @example Remove namespace directory
     #   rm_namespace("default", "gitlab")
     #
+    # @param [String] storage project's storage path
+    # @param [String] name namespace name
     def rm_namespace(storage, name)
       Gitlab::GitalyClient::NamespaceService.new(storage).remove(name)
     rescue GRPC::InvalidArgument => e
@@ -261,9 +302,12 @@ module Gitlab
     # Move namespace directory inside repositories storage
     #
-    # Ex.
+    # @example Move/rename a namespace directory
     #   mv_namespace("/path/to/storage", "gitlab", "gitlabhq")
     #
+    # @param [String] storage project's storage path
+    # @param [String] old_name current namespace name
+    # @param [String] new_name new namespace name
     def mv_namespace(storage, old_name, new_name)
       Gitlab::GitalyClient::NamespaceService.new(storage).rename(old_name, new_name)
     rescue GRPC::InvalidArgument => e
@@ -272,11 +316,17 @@ module Gitlab
       false
     end
-    def url_to_repo(path)
-      Gitlab.config.gitlab_shell.ssh_path_prefix + "#{path}.git"
+    # Return a SSH url for a given project path
+    #
+    # @param [String] full_path project path (URL)
+    # @return [String] SSH URL
+    def url_to_repo(full_path)
+      Gitlab.config.gitlab_shell.ssh_path_prefix + "#{full_path}.git"
     end
     # Return GitLab shell version
+    #
+    # @return [String] version
     def version
       gitlab_shell_version_file = "#{gitlab_shell_path}/VERSION"
@@ -285,12 +335,23 @@ module Gitlab
       end
     end
+    # Check if repository exists on disk
+    #
+    # @example Check if repository exists
+    #   repository_exists?('default', 'gitlab-org/gitlab.git')
+    #
+    # @return [Boolean] whether repository exists or not
+    # @param [String] storage project's storage path
+    # @param [Object] dir_name repository dir name
     def repository_exists?(storage, dir_name)
       Gitlab::Git::Repository.new(storage, dir_name, nil, nil).exists?
     rescue GRPC::Internal
       false
     end
+    # Return hooks folder path used by projects
+    #
+    # @return [String] path
     def hooks_path
       File.join(gitlab_shell_path, 'hooks')
     end

locale/gitlab.pot

@@ -10407,15 +10407,9 @@ msgstr ""
 msgid "Invocations"
 msgstr ""
-msgid "Is"
-msgstr ""
-
 msgid "Is blocked by"
 msgstr ""
-msgid "Is not"
-msgstr ""
-
 msgid "Is using license seat:"
 msgstr ""
@@ -22464,6 +22458,9 @@ msgstr[1] ""
 msgid "invalid milestone state `%{state}`"
 msgstr ""
+msgid "is"
+msgstr ""
+
 msgid "is an invalid IP address range"
 msgstr ""
@@ -22479,6 +22476,9 @@ msgstr ""
 msgid "is invalid because there is upstream lock"
 msgstr ""
+msgid "is not"
+msgstr ""
+
 msgid "is not a descendant of the Group owning the template"
 msgstr ""

spec/controllers/acme_challenges_controller_spec.rb

@@ -28,7 +28,7 @@ describe AcmeChallengesController do
       let(:token) { acme_order.challenge_token }
       it 'renders not found' do
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
@@ -37,7 +37,7 @@ describe AcmeChallengesController do
       let(:token) { 'wrongtoken' }
       it 'renders not found' do
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end

spec/controllers/application_controller_spec.rb

@@ -156,7 +156,7 @@ describe ApplicationController do
       it 'returns 200 response' do
         get :index, format: requested_format
-        expect(response).to have_gitlab_http_status 200
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
@@ -164,7 +164,7 @@ describe ApplicationController do
       it 'returns 404 response' do
         get :index
-        expect(response).to have_gitlab_http_status 404
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -181,7 +181,7 @@ describe ApplicationController do
       get :index
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
     it 'redirects to login page if not authenticated' do
@@ -202,7 +202,7 @@ describe ApplicationController do
         get :index, format: 'unknown'
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -489,7 +489,7 @@ describe ApplicationController do
       it 'redirects if the user did not accept the terms' do
         get :index
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
       it 'does not redirect when the user accepted terms' do
@@ -497,7 +497,7 @@ describe ApplicationController do
         get :index
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
   end
@@ -581,21 +581,21 @@ describe ApplicationController do
     it 'renders a 404 without a message' do
       get :index
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
       expect(response).to render_template('errors/not_found')
     end
     it 'renders a 403 when a message is passed to access denied' do
       get :index, params: { message: 'None shall pass' }
-      expect(response).to have_gitlab_http_status(403)
+      expect(response).to have_gitlab_http_status(:forbidden)
       expect(response).to render_template('errors/access_denied')
     end
     it 'renders a status passed to access denied' do
       get :index, params: { status: 401 }
-      expect(response).to have_gitlab_http_status(401)
+      expect(response).to have_gitlab_http_status(:unauthorized)
     end
   end

spec/controllers/autocomplete_controller_spec.rb

@@ -32,7 +32,7 @@ describe AutocompleteController do
           get(:users, params: { project_id: 'unknown' })
         end
-        it { expect(response).to have_gitlab_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
     end
@@ -61,7 +61,7 @@ describe AutocompleteController do
           get(:users, params: { group_id: 'unknown' })
         end
-        it { expect(response).to have_gitlab_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
     end
@@ -140,7 +140,7 @@ describe AutocompleteController do
           get(:users, params: { project_id: project.id })
         end
-        it { expect(response).to have_gitlab_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
       describe 'GET #users with unknown project' do
@@ -148,7 +148,7 @@ describe AutocompleteController do
           get(:users, params: { project_id: 'unknown' })
         end
-        it { expect(response).to have_gitlab_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
       describe 'GET #users with inaccessible group' do
@@ -157,7 +157,7 @@ describe AutocompleteController do
           get(:users, params: { group_id: user.namespace.id })
         end
-        it { expect(response).to have_gitlab_http_status(404) }
+        it { expect(response).to have_gitlab_http_status(:not_found) }
       end
       describe 'GET #users with no project' do
@@ -372,7 +372,7 @@ describe AutocompleteController do
       it 'returns empty json' do
         get :merge_request_target_branches, params: { project_id: project.id }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response).to be_empty
       end
     end
@@ -383,7 +383,7 @@ describe AutocompleteController do
         get :merge_request_target_branches, params: { project_id: project.id }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response).to be_empty
       end
     end
@@ -404,7 +404,7 @@ describe AutocompleteController do
           get :merge_request_target_branches, params: params
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
           expect(json_response).to eq({ 'error' => 'At least one of group_id or project_id must be specified' })
         end
       end
@@ -416,7 +416,7 @@ describe AutocompleteController do
         get :merge_request_target_branches, params: { project_id: project.id }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response).to contain_exactly({ 'title' => 'feature' })
       end
     end
@@ -433,7 +433,7 @@ describe AutocompleteController do
         get :merge_request_target_branches, params: { group_id: group.id }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response).to contain_exactly({ 'title' => 'feature' })
       end
     end

spec/controllers/chaos_controller_spec.rb

@@ -9,7 +9,7 @@ describe ChaosController do
       get :leakmem
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'call synchronously with params' do
@@ -17,7 +17,7 @@ describe ChaosController do
       get :leakmem, params: { memory_mb: 1, duration_s: 2 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'calls asynchronously' do
@@ -25,7 +25,7 @@ describe ChaosController do
       get :leakmem, params: { async: 1 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
   end
@@ -35,7 +35,7 @@ describe ChaosController do
       get :cpu_spin
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'calls synchronously with params' do
@@ -43,7 +43,7 @@ describe ChaosController do
       get :cpu_spin, params: { duration_s: 3 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'calls asynchronously' do
@@ -51,7 +51,7 @@ describe ChaosController do
       get :cpu_spin, params: { async: 1 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
   end
@@ -61,7 +61,7 @@ describe ChaosController do
       get :db_spin
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'calls synchronously with params' do
@@ -69,7 +69,7 @@ describe ChaosController do
       get :db_spin, params: { duration_s: 4, interval_s: 5 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'calls asynchronously' do
@@ -77,7 +77,7 @@ describe ChaosController do
       get :db_spin, params: { async: 1 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
   end
@@ -87,7 +87,7 @@ describe ChaosController do
       get :sleep
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'calls synchronously with params' do
@@ -95,7 +95,7 @@ describe ChaosController do
       get :sleep, params: { duration_s: 5 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'calls asynchronously' do
@@ -103,7 +103,7 @@ describe ChaosController do
       get :sleep, params: { async: 1 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
   end
@@ -113,7 +113,7 @@ describe ChaosController do
       get :kill
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
     it 'calls asynchronously' do
@@ -121,7 +121,7 @@ describe ChaosController do
       get :kill, params: { async: 1 }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
   end
 end

spec/controllers/concerns/metrics_dashboard_spec.rb

@@ -72,7 +72,7 @@ describe MetricsDashboard do
           it 'includes project_blob_path only for project dashboards' do
             expect(system_dashboard['project_blob_path']).to be_nil
-            expect(project_dashboard['project_blob_path']).to eq("/#{project.namespace.path}/#{project.name}/blob/master/.gitlab/dashboards/test.yml")
+            expect(project_dashboard['project_blob_path']).to eq("/#{project.namespace.path}/#{project.name}/-/blob/master/.gitlab/dashboards/test.yml")
           end
           describe 'project permissions' do

spec/controllers/graphql_controller_spec.rb

@@ -39,7 +39,7 @@ describe GraphqlController do
       it 'returns 200 when user can access API' do
         post :execute
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
       it 'returns access denied template when user cannot access API' do
@@ -59,7 +59,7 @@ describe GraphqlController do
       it 'returns 200' do
         post :execute
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
   end

spec/controllers/groups_controller_spec.rb

@@ -136,7 +136,7 @@ describe GroupsController do
         get :activity, params: { id: group.to_param }, format: :json
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['count']).to eq(3)
         expect(assigns(:projects).limit_value).to be_nil
       end
@@ -151,7 +151,7 @@ describe GroupsController do
         post :create, params: { group: { name: 'new_group', path: "new_group" } }
       end.to change { Group.count }.by(1)
-      expect(response).to have_gitlab_http_status(302)
+      expect(response).to have_gitlab_http_status(:found)
     end
     context 'authorization' do
@@ -162,7 +162,7 @@ describe GroupsController do
           post :create, params: { group: { name: 'new_group', path: "new_group" } }
         end.to change { Group.count }.by(1)
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
     end
@@ -367,7 +367,7 @@ describe GroupsController do
     it 'updates the path successfully' do
       post :update, params: { id: group.to_param, group: { path: 'new_path' } }
-      expect(response).to have_gitlab_http_status(302)
+      expect(response).to have_gitlab_http_status(:found)
       expect(controller).to set_flash[:notice]
     end
@@ -382,7 +382,7 @@ describe GroupsController do
     it 'updates the project_creation_level successfully' do
       post :update, params: { id: group.to_param, group: { project_creation_level: ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS } }
-      expect(response).to have_gitlab_http_status(302)
+      expect(response).to have_gitlab_http_status(:found)
       expect(group.reload.project_creation_level).to eq(::Gitlab::Access::MAINTAINER_PROJECT_ACCESS)
     end
@@ -397,7 +397,7 @@ describe GroupsController do
         post :update, params: { id: group.to_param, group: { name: 'new_name' } }
         expect(controller).to set_flash[:notice]
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
         expect(group.reload.name).to eq('new_name')
       end
@@ -405,7 +405,7 @@ describe GroupsController do
         post :update, params: { id: group.to_param, group: { path: 'new_path' } }
         expect(assigns(:group).errors[:base].first).to match(/Docker images in their Container Registry/)
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
   end
@@ -468,7 +468,7 @@ describe GroupsController do
               it 'does not redirect' do
                 get :issues, params: { id: group.to_param }
-                expect(response).not_to have_gitlab_http_status(301)
+                expect(response).not_to have_gitlab_http_status(:moved_permanently)
               end
             end
@@ -487,7 +487,7 @@ describe GroupsController do
               it 'does not redirect' do
                 get :show, params: { id: group.to_param }
-                expect(response).not_to have_gitlab_http_status(301)
+                expect(response).not_to have_gitlab_http_status(:moved_permanently)
               end
             end
@@ -554,13 +554,13 @@ describe GroupsController do
           it 'does not 404' do
             post :update, params: { id: group.to_param.upcase, group: { path: 'new_path' } }
-            expect(response).not_to have_gitlab_http_status(404)
+            expect(response).not_to have_gitlab_http_status(:not_found)
           end
           it 'does not redirect to the correct casing' do
             post :update, params: { id: group.to_param.upcase, group: { path: 'new_path' } }
-            expect(response).not_to have_gitlab_http_status(301)
+            expect(response).not_to have_gitlab_http_status(:moved_permanently)
           end
         end
@@ -570,7 +570,7 @@ describe GroupsController do
           it 'returns not found' do
             post :update, params: { id: redirect_route.path, group: { path: 'new_path' } }
-            expect(response).to have_gitlab_http_status(404)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
         end
       end
@@ -580,13 +580,13 @@ describe GroupsController do
           it 'does not 404' do
             delete :destroy, params: { id: group.to_param.upcase }
-            expect(response).not_to have_gitlab_http_status(404)
+            expect(response).not_to have_gitlab_http_status(:not_found)
           end
           it 'does not redirect to the correct casing' do
             delete :destroy, params: { id: group.to_param.upcase }
-            expect(response).not_to have_gitlab_http_status(301)
+            expect(response).not_to have_gitlab_http_status(:moved_permanently)
           end
         end
@@ -596,7 +596,7 @@ describe GroupsController do
           it 'returns not found' do
             delete :destroy, params: { id: redirect_route.path }
-            expect(response).to have_gitlab_http_status(404)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
         end
       end
@@ -693,7 +693,7 @@ describe GroupsController do
       end
       it 'is denied' do
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
@@ -755,13 +755,13 @@ describe GroupsController do
         it 'is successful' do
           get :show, params: { id: group.to_param }
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
         end
         it 'does not allow other formats' do
           get :show, params: { id: group.to_param }, format: :atom
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
         end
       end
@@ -769,7 +769,7 @@ describe GroupsController do
         it 'is successful' do
           get :edit, params: { id: group.to_param }
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
         end
       end
@@ -777,7 +777,7 @@ describe GroupsController do
         it 'is successful' do
           get :new
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
         end
       end
@@ -786,7 +786,7 @@ describe GroupsController do
           get :index
           # Redirects to the dashboard
-          expect(response).to have_gitlab_http_status(302)
+          expect(response).to have_gitlab_http_status(:found)
         end
       end
@@ -810,7 +810,7 @@ describe GroupsController do
         it 'deletes the group' do
           delete :destroy, params: { id: group.to_param }
-          expect(response).to have_gitlab_http_status(302)
+          expect(response).to have_gitlab_http_status(:found)
         end
       end
     end

spec/controllers/health_check_controller_spec.rb

@@ -101,7 +101,7 @@ describe HealthCheckController, :request_store do
       it 'supports failure plaintext response' do
         get :index
-        expect(response).to have_gitlab_http_status(500)
+        expect(response).to have_gitlab_http_status(:internal_server_error)
         expect(response.content_type).to eq 'text/plain'
         expect(response.body).to include('The server is on fire')
       end
@@ -109,7 +109,7 @@ describe HealthCheckController, :request_store do
       it 'supports failure json response' do
         get :index, format: :json
-        expect(response).to have_gitlab_http_status(500)
+        expect(response).to have_gitlab_http_status(:internal_server_error)
         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')
@@ -118,7 +118,7 @@ describe HealthCheckController, :request_store do
       it 'supports failure xml response' do
         get :index, format: :xml
-        expect(response).to have_gitlab_http_status(500)
+        expect(response).to have_gitlab_http_status(:internal_server_error)
         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')
@@ -127,7 +127,7 @@ describe HealthCheckController, :request_store do
       it 'supports failure responses for specific checks' do
         get :index, params: { checks: 'email' }, format: :json
-        expect(response).to have_gitlab_http_status(500)
+        expect(response).to have_gitlab_http_status(:internal_server_error)
         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')