Merge branch 'ce-to-ee-2018-11-22' into 'master'

CE upstream - 2018-11-22 14:21 UTC

See merge request gitlab-org/gitlab-ee!8557

app/assets/javascripts/ci_variable_list/ajax_variable_list.js

@@ -84,7 +84,7 @@ export default class AjaxVariableList {
       .catch(() => {
         loadingIcon.classList.toggle('hide', true);
         this.variableList.toggleEnableRow(true);
-        Flash(s__('CiVariable|Error occured while saving variables'));
+        Flash(s__('CiVariable|Error occurred while saving variables'));
       });
   }
 

app/assets/javascripts/ide/stores/actions/file.js

@@ -82,7 +82,7 @@ export const getFileData = (
     .catch(() => {
       commit(types.TOGGLE_LOADING, { entry: file });
       dispatch('setErrorMessage', {
-        text: __('An error occured whilst loading the file.'),
+        text: __('An error occurred whilst loading the file.'),
         action: payload =>
           dispatch('getFileData', payload).then(() => dispatch('setErrorMessage', null)),
         actionText: __('Please try again'),
@@ -124,7 +124,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) =
       })
       .catch(() => {
         dispatch('setErrorMessage', {
-          text: __('An error occured whilst loading the file content.'),
+          text: __('An error occurred whilst loading the file content.'),
           action: payload =>
             dispatch('getRawFileData', payload).then(() => dispatch('setErrorMessage', null)),
           actionText: __('Please try again'),

app/assets/javascripts/ide/stores/actions/merge_request.js

@@ -25,7 +25,7 @@ export const getMergeRequestData = (
         })
         .catch(() => {
           dispatch('setErrorMessage', {
-            text: __('An error occured whilst loading the merge request.'),
+            text: __('An error occurred whilst loading the merge request.'),
             action: payload =>
               dispatch('getMergeRequestData', payload).then(() =>
                 dispatch('setErrorMessage', null),
@@ -58,7 +58,7 @@ export const getMergeRequestChanges = (
         })
         .catch(() => {
           dispatch('setErrorMessage', {
-            text: __('An error occured whilst loading the merge request changes.'),
+            text: __('An error occurred whilst loading the merge request changes.'),
             action: payload =>
               dispatch('getMergeRequestChanges', payload).then(() =>
                 dispatch('setErrorMessage', null),
@@ -92,7 +92,7 @@ export const getMergeRequestVersions = (
         })
         .catch(() => {
           dispatch('setErrorMessage', {
-            text: __('An error occured whilst loading the merge request version data.'),
+            text: __('An error occurred whilst loading the merge request version data.'),
             action: payload =>
               dispatch('getMergeRequestVersions', payload).then(() =>
                 dispatch('setErrorMessage', null),

app/assets/javascripts/ide/stores/actions/project.js

@@ -103,7 +103,7 @@ export const createNewBranchFromDefault = ({ state, dispatch, getters }, branch)
     })
     .catch(() => {
       dispatch('setErrorMessage', {
-        text: __('An error occured creating the new branch.'),
+        text: __('An error occurred creating the new branch.'),
         action: payload => dispatch('createNewBranchFromDefault', payload),
         actionText: __('Please try again'),
         actionPayload: branch,

app/assets/javascripts/ide/stores/actions/tree.js

@@ -76,7 +76,7 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } =
             dispatch('showBranchNotFoundError', branchId);
           } else {
             dispatch('setErrorMessage', {
-              text: __('An error occured whilst loading all the files.'),
+              text: __('An error occurred whilst loading all the files.'),
               action: payload =>
                 dispatch('getFiles', payload).then(() => dispatch('setErrorMessage', null)),
               actionText: __('Please try again'),

app/assets/javascripts/ide/stores/modules/pipelines/actions.js

@@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => {
     dispatch(
       'setErrorMessage',
       {
-        text: __('An error occured whilst fetching the latest pipeline.'),
+        text: __('An error occurred whilst fetching the latest pipeline.'),
         action: () =>
           dispatch('forcePipelineRequest').then(() =>
             dispatch('setErrorMessage', null, { root: true }),
@@ -84,7 +84,7 @@ export const receiveJobsError = ({ commit, dispatch }, stage) => {
   dispatch(
     'setErrorMessage',
     {
-      text: __('An error occured whilst loading the pipelines jobs.'),
+      text: __('An error occurred whilst loading the pipelines jobs.'),
       action: payload =>
         dispatch('fetchJobs', payload).then(() =>
           dispatch('setErrorMessage', null, { root: true }),
@@ -123,7 +123,7 @@ export const receiveJobTraceError = ({ commit, dispatch }) => {
   dispatch(
     'setErrorMessage',
     {
-      text: __('An error occured whilst fetching the job trace.'),
+      text: __('An error occurred whilst fetching the job trace.'),
       action: () =>
         dispatch('fetchJobTrace').then(() => dispatch('setErrorMessage', null, { root: true })),
       actionText: __('Please try again'),

app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue

@@ -47,7 +47,7 @@ export default {
     errorMessage() {
       return sprintf(
         s__(
-          'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}',
+          'ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}',
         ),
         { error: this.gapiError },
       );

app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue

@@ -93,7 +93,7 @@ export default {
       }
 
       return sprintf(
-        s__('ClusterIntegration|An error occured while trying to fetch your projects: %{error}'),
+        s__('ClusterIntegration|An error occurred while trying to fetch your projects: %{error}'),
         { error: this.gapiError },
       );
     },

changelogs/unreleased/46950-systemcheck-ruby-version.yml

+---
+title: 'SystemCheck: Use a more reliable way to detect current Ruby version'
+merge_request: 23291
+author:
+type: changed

changelogs/unreleased/54201-update-rack-to-2-0-6.yml

+---
+title: Update rack to 2.0.6 (for QA environments)
+merge_request: 23171
+author: Takuya Noguchi
+type: security

changelogs/unreleased/fj-47494-upgrade-git-to-2-18-0.yml

+---
+title: Upgrade minimum required Git version to 2.18.0
+merge_request: 22803
+author:
+type: other

changelogs/unreleased/mr-origin-23218.yml

+---
+title: Fix typo for scheduled pipeline
+merge_request: 23218
+author: Davy Defaud
+type: other

changelogs/unreleased/zj-improve-gitaly-pb.yml

+---
+title: Show what RPC is called in the performance bar
+merge_request: 23140
+author:
+type: other

doc/api/issues.md

@@ -668,7 +668,7 @@ POST /projects/:id/issues/:issue_iid/move
 | `to_project_id` | integer | yes      | The ID of the new project            |
 
 ```bash
-curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --data '{"to_project_id": 5}' https://gitlab.example.com/api/v4/projects/4/issues/85/move
+curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form to_project_id=5 https://gitlab.example.com/api/v4/projects/4/issues/85/move
 ```
 
 Example response:

doc/ci/yaml/README.md

@@ -1634,6 +1634,10 @@ rspec:
     - bundle exec rspec
 ```
 
+NOTE: **Note:**
+`include` requires the external YAML files to have the extensions `.yml` or `.yaml`. 
+The external file will not be included if the extension is missing.
+
 You can define it either as a single string, or, in case you want to include
 more than one files, an array of different values . The following examples
 are both valid cases:

doc/install/installation.md

@@ -79,7 +79,7 @@ Make sure you have the right version of Git installed
     # Install Git
     sudo apt-get install -y git-core
 
-    # Make sure Git is version 2.9.5 or higher
+    # Make sure Git is version 2.18.0 or higher
     git --version
 
 Is the system packaged Git too old? Remove it and compile from source.

doc/integration/shibboleth.md

@@ -4,18 +4,17 @@ This documentation is for enabling shibboleth with omnibus-gitlab package.
 
 In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however this is difficult to configure using the bundled Nginx provided in the omnibus-gitlab package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider.
 
+To enable the Shibboleth OmniAuth provider you must configure Apache shibboleth module.
+Installation and configuration of module it self is out of scope of this document.
+Check <https://wiki.shibboleth.net/> for more info.
 
-To enable the Shibboleth OmniAuth provider you must:
+You can find Apache config in gitlab-recipes (<https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache>).
 
-1. Configure Apache shibboleth module. Installation and configuration of module it self is out of scope of this document.
-Check https://wiki.shibboleth.net/ for more info.
+The following changes are needed to enable Shibboleth:
 
-1. You can find Apache config in gitlab-recipes (https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache)
+1. Protect omniauth-shibboleth callback URL:
 
-Following changes are needed to enable shibboleth:
-
-protect omniauth-shibboleth callback URL:
-```
+    ```
       <Location /users/auth/shibboleth/callback>
         AuthType shibboleth
         ShibRequestSetting requireSession 1
@@ -31,9 +30,11 @@ protect omniauth-shibboleth callback URL:
       <Location /Shibboleth.sso>
         SetHandler shib
       </Location>
-```
-exclude shibboleth URLs from rewriting, add "RewriteCond %{REQUEST_URI} !/Shibboleth.sso" and "RewriteCond %{REQUEST_URI} !/shibboleth-sp", config should look like this:
-```
+    ```
+
+1. Exclude shibboleth URLs from rewriting. Add `RewriteCond %{REQUEST_URI} !/Shibboleth.sso` and `RewriteCond %{REQUEST_URI} !/shibboleth-sp`. Config should look like this:
+
+    ```
       # Apache equivalent of Nginx try files
       RewriteEngine on
       RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
@@ -41,34 +42,35 @@ exclude shibboleth URLs from rewriting, add "RewriteCond %{REQUEST_URI} !/Shibbo
       RewriteCond %{REQUEST_URI} !/shibboleth-sp
       RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA]
       RequestHeader set X_FORWARDED_PROTO 'https'
-```
-
-1. Edit /etc/gitlab/gitlab.rb configuration file to enable OmniAuth and add
-Shibboleth as an OmniAuth provider. User attributes will be sent from the
-Apache reverse proxy to GitLab as headers with the names from the Shibboleth
-attribute mapping. Therefore the values of the `args` hash
-should be in the form of `"HTTP_ATTRIBUTE"`. The keys in the hash are arguments
-to the [OmniAuth::Strategies::Shibboleth class](https://github.com/toyokazu/omniauth-shibboleth/blob/master/lib/omniauth/strategies/shibboleth.rb)
-and are documented by the [omniauth-shibboleth gem](https://github.com/toyokazu/omniauth-shibboleth)
-(take care to note the version of the gem packaged with GitLab). If some of
-your users appear to be authenticated by Shibboleth and Apache, but GitLab
-rejects their account with a URI that contains "e-mail is invalid" then your
-Shibboleth Identity Provider or Attribute Authority may be asserting multiple
-e-mail addresses. In this instance, you might consider setting the
-`multi_values` argument to `first`.
-
-File should look like this:
-```
-external_url 'https://gitlab.example.com'
-gitlab_rails['internal_api_url'] = 'https://gitlab.example.com'
-
-# disable Nginx
-nginx['enable'] = false
-
-gitlab_rails['omniauth_allow_single_sign_on'] = true
-gitlab_rails['omniauth_block_auto_created_users'] = false
-gitlab_rails['omniauth_enabled'] = true
-gitlab_rails['omniauth_providers'] = [
+    ```
+
+1. Edit `/etc/gitlab/gitlab.rb` configuration file to enable OmniAuth and add
+   Shibboleth as an OmniAuth provider. User attributes will be sent from the
+   Apache reverse proxy to GitLab as headers with the names from the Shibboleth
+   attribute mapping. Therefore the values of the `args` hash
+   should be in the form of `"HTTP_ATTRIBUTE"`. The keys in the hash are arguments
+   to the [OmniAuth::Strategies::Shibboleth class](https://github.com/toyokazu/omniauth-shibboleth/blob/master/lib/omniauth/strategies/shibboleth.rb)
+   and are documented by the [omniauth-shibboleth gem](https://github.com/toyokazu/omniauth-shibboleth)
+   (take care to note the version of the gem packaged with GitLab). If some of
+   your users appear to be authenticated by Shibboleth and Apache, but GitLab
+   rejects their account with a URI that contains "e-mail is invalid" then your
+   Shibboleth Identity Provider or Attribute Authority may be asserting multiple
+   e-mail addresses. In this instance, you might consider setting the
+   `multi_values` argument to `first`.
+
+   The file should look like this:
+
+    ```
+    external_url 'https://gitlab.example.com'
+    gitlab_rails['internal_api_url'] = 'https://gitlab.example.com'
+
+    # disable Nginx
+    nginx['enable'] = false
+
+    gitlab_rails['omniauth_allow_single_sign_on'] = true
+    gitlab_rails['omniauth_block_auto_created_users'] = false
+    gitlab_rails['omniauth_enabled'] = true
+    gitlab_rails['omniauth_providers'] = [
       {
         "name"  => "'shibboleth"',
         "label" => "Text for Login Button",
@@ -80,16 +82,17 @@ gitlab_rails['omniauth_providers'] = [
             "info_fields" => { "email" => 'HTTP_MAIL'}
         }
       }
-]
+    ]
 
-```
+    ```
 
-1. [Reconfigure][] or [restart GitLab][] for the changes to take effect if you
+1. [Reconfigure](../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) or [restart](../administration/restart_gitlab.md#installations-from-source) GitLab for the changes to take effect if you
    installed GitLab via Omnibus or from source respectively.
 
-On the sign in page there should now be a "Sign in with: Shibboleth" icon below the regular sign in form. Click the icon to begin the authentication process. You will be redirected to IdP server (Depends on your Shibboleth module configuration). If everything goes well the user will be returned to GitLab and will be signed in.
+On the sign in page, there should now be a "Sign in with: Shibboleth" icon below the regular sign in form. Click the icon to begin the authentication process. You will be redirected to IdP server (depends on your Shibboleth module configuration). If everything goes well the user will be returned to GitLab and will be signed in.
 
 ## Apache 2.4 / GitLab 8.6 update
+
 The order of the first 2 Location directives is important. If they are reversed,
 you will not get a shibboleth session!
 
@@ -135,6 +138,3 @@ you will not get a shibboleth session!
   RequestHeader set X_FORWARDED_PROTO 'https'
   RequestHeader set X-Forwarded-Ssl on
 ```
-
-[reconfigure]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure
-[restart GitLab]: ../administration/restart_gitlab.md#installations-from-source

doc/update/6.x-or-7.x-to-7.14.md

@@ -20,7 +20,7 @@ database migrations for GitLab 7.2.
 
 ## Stash changes
 
-If you [deleted the vendors folder during your original installation](https://github.com/gitlabhq/gitlabhq/issues/4883#issuecomment-31108431), [you will get an error](https://gitlab.com/gitlab-org/gitlab-ce/issues/1494) when you attempt to rebuild the assets in step 7. To avoid this, stash the changes in your GitLab working copy before starting:
+If you deleted the vendors folder during your original installation, [you will get an error](https://gitlab.com/gitlab-org/gitlab-ce/issues/1494) when you attempt to rebuild the assets in step 7. To avoid this, stash the changes in your GitLab working copy before starting:
 
     git stash
 

doc/user/project/integrations/discord_notifications.md

 # Discord Notifications service
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22684) in GitLab 11.5.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22684) in GitLab 11.6.
 
 The Discord Notifications service sends event notifications from GitLab to the channel for which the webhook was created.
 

lib/gitlab/ci/status/build/scheduled.rb

@@ -10,7 +10,7 @@ module Gitlab
               image: 'illustrations/illustrations_scheduled-job_countdown.svg',
               size: 'svg-394',
               title: _("This is a delayed job to run in %{remainingTime}"),
-              content: _("This job will automatically run after it's timer finishes. " \
+              content: _("This job will automatically run after its timer finishes. " \
                          "Often they are used for incremental roll-out deploys " \
                          "to production environments. When unscheduled it converts " \
                          "into a manual action.")

lib/gitlab/git/blob.rb

 # frozen_string_literal: true
 
-# Gitaly note: JV: seems to be completely migrated (behind feature flags).
-
 module Gitlab
   module Git
     class Blob

lib/gitlab/git/repository.rb

@@ -885,12 +885,6 @@ module Gitlab
         Gitlab::GitalyClient::ConflictsService.new(self, our_commit_oid, their_commit_oid)
       end
 
-      def gitaly_migrate(method, status: Gitlab::GitalyClient::MigrationStatus::OPT_IN, &block)
-        wrapped_gitaly_errors do
-          Gitlab::GitalyClient.migrate(method, status: status, &block)
-        end
-      end
-
       def clean_stale_repository_files
         wrapped_gitaly_errors do
           gitaly_repository_client.cleanup if exists?

lib/gitlab/gitaly_client.rb

@@ -9,11 +9,6 @@ require 'grpc/health/v1/health_services_pb'
 module Gitlab
   module GitalyClient
     include Gitlab::Metrics::Methods
-    module MigrationStatus
-      DISABLED = 1
-      OPT_IN = 2
-      OPT_OUT = 3
-    end
 
     class TooManyInvocationsError < StandardError
       attr_reader :call_site, :invocation_count, :max_call_stack
@@ -31,7 +26,7 @@ module Gitlab
       end
     end
 
-    SERVER_VERSION_FILE = 'GITALY_SERVER_VERSION'.freeze
+    SERVER_VERSION_FILE = 'GITALY_SERVER_VERSION'
     MAXIMUM_GITALY_CALLS = 35
     CLIENT_NAME = (Sidekiq.server? ? 'gitlab-sidekiq' : 'gitlab-web').freeze
 
@@ -43,11 +38,6 @@ module Gitlab
 
     self.query_time = 0
 
-    define_histogram :gitaly_migrate_call_duration_seconds do
-      docstring "Gitaly migration call execution timings"
-      base_labels gitaly_enabled: nil, feature: nil
-    end
-
     define_histogram :gitaly_controller_action_duration_seconds do
       docstring "Gitaly endpoint histogram by controller and action combination"
       base_labels Gitlab::Metrics::Transaction::BASE_LABELS.merge(gitaly_service: nil, rpc: nil)
@@ -126,7 +116,6 @@ module Gitlab
     def self.call(storage, service, rpc, request, remote_storage: nil, timeout: nil)
       start = Gitlab::Metrics::System.monotonic_time
       request_hash = request.is_a?(Google::Protobuf::MessageExts) ? request.to_h : {}
-      @current_call_id ||= SecureRandom.uuid
 
       enforce_gitaly_request_limits(:call)
 
@@ -145,9 +134,7 @@ module Gitlab
         current_transaction_labels.merge(gitaly_service: service.to_s, rpc: rpc.to_s),
         duration)
 
-      add_call_details(id: @current_call_id, feature: service, duration: duration, request: request_hash)
-
-      @current_call_id = nil
+      add_call_details(feature: "#{service}##{rpc}", duration: duration, request: request_hash, rpc: rpc)
     end
 
     def self.handle_grpc_unavailable!(ex)
@@ -222,7 +209,7 @@ module Gitlab
       result
     end
 
-    SERVER_FEATURE_FLAGS = %w[gogit_findcommit].freeze
+    SERVER_FEATURE_FLAGS = %w[].freeze
 
     def self.server_feature_flags
       SERVER_FEATURE_FLAGS.map do |f|
@@ -237,82 +224,8 @@ module Gitlab
       params['gitaly_token'].presence || Gitlab.config.gitaly['token']
     end
 
-    # Evaluates whether a feature toggle is on or off
-    def self.feature_enabled?(feature_name, status: MigrationStatus::OPT_IN)
-      # Disabled features are always off!
-      return false if status == MigrationStatus::DISABLED
-
-      feature = Feature.get("gitaly_#{feature_name}")
-
-      # If the feature has been set, always evaluate
-      if Feature.persisted?(feature)
-        if feature.percentage_of_time_value > 0
-          # Probabilistically enable this feature
-          return Random.rand() * 100 < feature.percentage_of_time_value
-        end
-
-        return feature.enabled?
-      end
-
-      # If the feature has not been set, the default depends
-      # on it's status
-      case status
-      when MigrationStatus::OPT_OUT
-        true
-      when MigrationStatus::OPT_IN
-        opt_into_all_features? && !explicit_opt_in_required.include?(feature_name)
-      else
-        false
-      end
-    rescue => ex
-      # During application startup feature lookups in SQL can fail
-      Rails.logger.warn "exception while checking Gitaly feature status for #{feature_name}: #{ex}"
-      false
-    end
-
-    # We have a mechanism to let GitLab automatically opt in to all Gitaly
-    # features. We want to be able to exclude some features from automatic
-    # opt-in. This function has an override in EE.
-    def self.explicit_opt_in_required
-      []
-    end
-
-    # opt_into_all_features? returns true when the current environment
-    # is one in which we opt into features automatically
-    def self.opt_into_all_features?
-      Rails.env.development? || ENV["GITALY_FEATURE_DEFAULT_ON"] == "1"
-    end
-    private_class_method :opt_into_all_features?
-
-    def self.migrate(feature, status: MigrationStatus::OPT_IN)
-      # Enforce limits at both the `migrate` and `call` sites to ensure that
-      # problems are not hidden by a feature being disabled
-      enforce_gitaly_request_limits(:migrate)
-
-      is_enabled  = feature_enabled?(feature, status: status)
-      metric_name = feature.to_s
-      metric_name += "_gitaly" if is_enabled
-
-      Gitlab::Metrics.measure(metric_name) do
-        # Some migrate calls wrap other migrate calls
-        allow_n_plus_1_calls do
-          feature_stack = Thread.current[:gitaly_feature_stack] ||= []
-          feature_stack.unshift(feature)
-          begin
-            start = Gitlab::Metrics::System.monotonic_time
-            @current_call_id = SecureRandom.uuid
-            call_details = { id: @current_call_id }
-            yield is_enabled
-          ensure
-            total_time = Gitlab::Metrics::System.monotonic_time - start
-            gitaly_migrate_call_duration_seconds.observe({ gitaly_enabled: is_enabled, feature: feature }, total_time)
-            feature_stack.shift
-            Thread.current[:gitaly_feature_stack] = nil if feature_stack.empty?
-
-            add_call_details(call_details.merge(feature: feature, duration: total_time))
-          end
-        end
-      end
+    def self.feature_enabled?(feature_name)
+      Feature.enabled?("gitaly_#{feature_name}")
     end
 
     # Ensures that Gitaly is not being abuse through n+1 misuse etc
@@ -368,48 +281,29 @@ module Gitlab
     end
     private_class_method :decrement_call_count
 
-    # Returns an estimate of the number of Gitaly calls made for this
-    # request
+    # Returns the of the number of Gitaly calls made for this request
     def self.get_request_count
-      return 0 unless Gitlab::SafeRequestStore.active?
-
-      gitaly_migrate_count = get_call_count("gitaly_migrate_actual")
-      gitaly_call_count = get_call_count("gitaly_call_actual")
-
-      # Using the maximum of migrate and call_count will provide an
-      # indicator of how many Gitaly calls will be made, even
-      # before a feature is enabled. This provides us with a single
-      # metric, but not an exact number, but this tradeoff is acceptable
-      if gitaly_migrate_count > gitaly_call_count
-        gitaly_migrate_count
-      else
-        gitaly_call_count
-      end
+      get_call_count("gitaly_call_actual")
     end
 
     def self.reset_counts
       return unless Gitlab::SafeRequestStore.active?
 
-      %w[migrate call].each do |call_site|
-        Gitlab::SafeRequestStore["gitaly_#{call_site}_actual"] = 0
-        Gitlab::SafeRequestStore["gitaly_#{call_site}_permitted"] = 0
-      end
+      Gitlab::SafeRequestStore["gitaly_call_actual"] = 0
+      Gitlab::SafeRequestStore["gitaly_call_permitted"] = 0
     end
 
     def self.add_call_details(details)
-      id = details.delete(:id)
-
-      return unless id && Gitlab::SafeRequestStore[:peek_enabled]
+      return unless Gitlab::SafeRequestStore[:peek_enabled]
 
-      Gitlab::SafeRequestStore['gitaly_call_details'] ||= {}
-      Gitlab::SafeRequestStore['gitaly_call_details'][id] ||= {}
-      Gitlab::SafeRequestStore['gitaly_call_details'][id].merge!(details)
+      Gitlab::SafeRequestStore['gitaly_call_details'] ||= []
+      Gitlab::SafeRequestStore['gitaly_call_details'] << details
     end
 
     def self.list_call_details
-      return {} unless Gitlab::SafeRequestStore[:peek_enabled]
+      return [] unless Gitlab::SafeRequestStore[:peek_enabled]
 
-      Gitlab::SafeRequestStore['gitaly_call_details'] || {}
+      Gitlab::SafeRequestStore['gitaly_call_details'] || []
     end
 
     def self.expected_server_version

lib/peek/views/gitaly.rb

@@ -23,7 +23,6 @@ module Peek
 
       def details
         ::Gitlab::GitalyClient.list_call_details
-          .values
           .sort { |a, b| b[:duration] <=> a[:duration] }
           .map(&method(:format_call_details))
       end

lib/system_check/app/git_version_check.rb

@@ -7,7 +7,7 @@ module SystemCheck
       set_check_pass -> { "yes (#{self.current_version})" }
 
       def self.required_version
-        @required_version ||= Gitlab::VersionInfo.new(2, 9, 5)
+        @required_version ||= Gitlab::VersionInfo.parse('2.18.0')
       end
 
       def self.current_version

lib/system_check/app/ruby_version_check.rb

@@ -11,7 +11,7 @@ module SystemCheck
       end
 
       def self.current_version
-        @current_version ||= Gitlab::VersionInfo.parse(Gitlab::TaskHelpers.run_command(%w(ruby --version)))
+        @current_version ||= Gitlab::VersionInfo.parse(RUBY_VERSION)
       end
 
       def check?

locale/gitlab.pot

@@ -599,42 +599,15 @@ msgstr ""
 msgid "An error has occurred"
 msgstr ""
 
-msgid "An error occured creating the new branch."
-msgstr ""
-
-msgid "An error occured whilst fetching the job trace."
-msgstr ""
-
-msgid "An error occured whilst fetching the latest pipeline."
-msgstr ""
-
-msgid "An error occured whilst loading all the files."
-msgstr ""
-
-msgid "An error occured whilst loading the file content."
-msgstr ""
-
-msgid "An error occured whilst loading the file."
-msgstr ""
-
-msgid "An error occured whilst loading the merge request changes."
-msgstr ""
-
-msgid "An error occured whilst loading the merge request version data."
-msgstr ""
-
-msgid "An error occured whilst loading the merge request."
-msgstr ""
-
-msgid "An error occured whilst loading the pipelines jobs."
-msgstr ""
-
 msgid "An error occurred adding a draft to the discussion."
 msgstr ""
 
 msgid "An error occurred adding a new draft."
 msgstr ""
 
+msgid "An error occurred creating the new branch."
+msgstr ""
+
 msgid "An error occurred previewing the blob"
 msgstr ""
 
@@ -743,6 +716,33 @@ msgstr ""
 msgid "An error occurred while validating username"
 msgstr ""
 
+msgid "An error occurred whilst fetching the job trace."
+msgstr ""
+
+msgid "An error occurred whilst fetching the latest pipeline."
+msgstr ""
+
+msgid "An error occurred whilst loading all the files."
+msgstr ""
+
+msgid "An error occurred whilst loading the file content."
+msgstr ""
+
+msgid "An error occurred whilst loading the file."
+msgstr ""
+
+msgid "An error occurred whilst loading the merge request changes."
+msgstr ""
+
+msgid "An error occurred whilst loading the merge request version data."
+msgstr ""
+
+msgid "An error occurred whilst loading the merge request."
+msgstr ""
+
+msgid "An error occurred whilst loading the pipelines jobs."
+msgstr ""
+
 msgid "An error occurred. Please try again."
 msgstr ""
 
@@ -1600,7 +1600,7 @@ msgstr ""
 msgid "CiVariable|Create wildcard"
 msgstr ""
 
-msgid "CiVariable|Error occured while saving variables"
+msgid "CiVariable|Error occurred while saving variables"
 msgstr ""
 
 msgid "CiVariable|New environment"
@@ -1708,13 +1708,13 @@ msgstr ""
 msgid "ClusterIntegration|An error occured while trying to fetch project zones: %{error}"
 msgstr ""
 
-msgid "ClusterIntegration|An error occured while trying to fetch your projects: %{error}"
+msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later."
 msgstr ""
 
-msgid "ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}"
+msgid "ClusterIntegration|An error occurred while trying to fetch your projects: %{error}"
 msgstr ""
 
-msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later."
+msgid "ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}"
 msgstr ""
 
 msgid "ClusterIntegration|Applications"
@@ -8289,7 +8289,7 @@ msgstr ""
 msgid "This job requires a manual action"
 msgstr ""
 
-msgid "This job will automatically run after it's timer finishes. Often they are used for incremental roll-out deploys to production environments. When unscheduled it converts into a manual action."
+msgid "This job will automatically run after its timer finishes. Often they are used for incremental roll-out deploys to production environments. When unscheduled it converts into a manual action."
 msgstr ""
 
 msgid "This means you can not push code until you create an empty repository or import existing one."

qa/Gemfile.lock

@@ -56,7 +56,7 @@ GEM
       byebug (~> 9.1)
       pry (~> 0.10)
     public_suffix (3.0.1)
-    rack (2.0.3)
+    rack (2.0.6)
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rake (12.3.0)
@@ -103,4 +103,4 @@ DEPENDENCIES
   selenium-webdriver (~> 3.8.0)
 
 BUNDLED WITH
-   1.16.4
+   1.17.1

qa/qa/fixtures/auto_devops_rack/Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
-    rack (2.0.4)
+    rack (2.0.6)
     rake (12.3.0)
 
 PLATFORMS
@@ -12,4 +12,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

rubocop/cop/safe_params.rb

+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    class SafeParams < RuboCop::Cop::Cop
+      MSG = 'Use `safe_params` instead of `params` in url_for.'.freeze
+
+      METHOD_NAME_PATTERN = :url_for
+      UNSAFE_PARAM = :params
+
+      def on_send(node)
+        return unless method_name(node) == METHOD_NAME_PATTERN
+
+        add_offense(node, location: :expression) unless safe_params?(node)
+      end
+
+      private
+
+      def safe_params?(node)
+        node.descendants.each do |param_node|
+          next unless param_node.descendants.empty?
+
+          return false if method_name(param_node) == UNSAFE_PARAM
+        end
+
+        true
+      end
+
+      def method_name(node)
+        node.children[1]
+      end
+    end
+  end
+end

rubocop/rubocop.rb

@@ -5,6 +5,7 @@ require_relative 'cop/gitlab/httparty'
 require_relative 'cop/gitlab/finder_with_find_by'
 require_relative 'cop/gitlab/union'
 require_relative 'cop/include_sidekiq_worker'
+require_relative 'cop/safe_params'
 require_relative 'cop/avoid_return_from_blocks'
 require_relative 'cop/avoid_break_from_strong_memoize'
 require_relative 'cop/avoid_route_redirect_leading_slash'

scripts/frontend/prettier.js

@@ -111,6 +111,6 @@ Promise.all(matchedFiles.map(checkFileWithPrettierConfig))
     if (didWarn) process.exit(1);
   })
   .catch(e => {
-    console.log(`\nAn error occured while processing files with prettier: ${e.message}\n`);
+    console.log(`\nAn error occurred while processing files with prettier: ${e.message}\n`);
     process.exit(1);
   });

scripts/trigger-build

@@ -106,6 +106,7 @@ module Trigger
     def extra_variables
       {
         'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'],
+        'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'],
         'ALTERNATIVE_SOURCES' => 'true',
         'ee' => Trigger.ee? ? 'true' : 'false',
         'QA_BRANCH' => ENV['QA_BRANCH'] || 'master'

spec/features/projects/jobs_spec.rb

@@ -596,7 +596,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
 
       it 'shows delayed job', :js do
         expect(page).to have_content('This is a delayed job to run in')
-        expect(page).to have_content("This job will automatically run after it's timer finishes.")
+        expect(page).to have_content("This job will automatically run after its timer finishes.")
         expect(page).to have_link('Unschedule job')
       end
 

spec/features/projects/wiki/user_updates_wiki_page_spec.rb

 require 'spec_helper'
 
 describe 'User updates wiki page' do
-  shared_examples 'wiki page user update' do
   let(:user) { create(:user) }
 
   before do
@@ -16,7 +15,7 @@ describe 'User updates wiki page' do
     end
 
     context 'in a user namespace' do
-        let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
+      let(:project) { create(:project, :wiki_repo) }
 
       it 'redirects back to the home edit page' do
         page.within(:css, '.wiki-form .form-actions') do
@@ -72,7 +71,7 @@ describe 'User updates wiki page' do
     end
 
     context 'in a user namespace' do
-        let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
+      let(:project) { create(:project, :wiki_repo) }
 
       it 'updates a page' do
         # Commit message field should have correct value.
@@ -151,7 +150,7 @@ describe 'User updates wiki page' do
   end
 
   context 'when the page is in a subdir' do
-      let!(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
+    let!(:project) { create(:project, :wiki_repo) }
     let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
     let(:page_name) { 'page_name' }
     let(:page_dir) { "foo/bar/#{page_name}" }
@@ -161,7 +160,7 @@ describe 'User updates wiki page' do
       visit(project_wiki_edit_path(project, wiki_page))
     end
 
-      it 'moves the page to the root folder', :skip_gitaly_mock do
+    it 'moves the page to the root folder' do
       fill_in(:wiki_title, with: "/#{page_name}")
 
       click_button('Save changes')
@@ -221,13 +220,4 @@ describe 'User updates wiki page' do
 
     it_behaves_like 'wiki file attachments'
   end
-  end
-
-  context 'when Gitaly is enabled' do
-    it_behaves_like 'wiki page user update'
-  end
-
-  context 'when Gitaly is disabled', :skip_gitaly_mock do
-    it_behaves_like 'wiki page user update'
-  end
 end

spec/features/projects/wiki/user_views_wiki_page_spec.rb

 require 'spec_helper'
 
 describe 'User views a wiki page' do
-  shared_examples 'wiki page user view' do
   include WikiHelpers
 
   let(:user) { create(:user) }
@@ -162,13 +161,4 @@ describe 'User views a wiki page' do
 
     expect(page).to have_content('Home · Create Page')
   end
-  end
-
-  context 'when Gitaly is enabled' do
-    it_behaves_like 'wiki page user view'
-  end
-
-  context 'when Gitaly is disabled', :skip_gitaly_mock do
-    it_behaves_like 'wiki page user view'
-  end
 end

spec/javascripts/ide/stores/actions/file_spec.js

@@ -296,7 +296,7 @@ describe('IDE store file actions', () => {
           .getFileData({ state: store.state, commit() {}, dispatch }, { path: localFile.path })
           .then(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
-              text: 'An error occured whilst loading the file.',
+              text: 'An error occurred whilst loading the file.',
               action: jasmine.any(Function),
               actionText: 'Please try again',
               actionPayload: {
@@ -408,7 +408,7 @@ describe('IDE store file actions', () => {
           .then(done.fail)
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
-              text: 'An error occured whilst loading the file content.',
+              text: 'An error occurred whilst loading the file content.',
               action: jasmine.any(Function),
               actionText: 'Please try again',
               actionPayload: {

spec/javascripts/ide/stores/actions/merge_request_spec.js

@@ -82,7 +82,7 @@ describe('IDE store merge request actions', () => {
           .then(done.fail)
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
-              text: 'An error occured whilst loading the merge request.',
+              text: 'An error occurred whilst loading the merge request.',
               action: jasmine.any(Function),
               actionText: 'Please try again',
               actionPayload: {
@@ -155,7 +155,7 @@ describe('IDE store merge request actions', () => {
           .then(done.fail)
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
-              text: 'An error occured whilst loading the merge request changes.',
+              text: 'An error occurred whilst loading the merge request changes.',
               action: jasmine.any(Function),
               actionText: 'Please try again',
               actionPayload: {
@@ -225,7 +225,7 @@ describe('IDE store merge request actions', () => {
           .then(done.fail)
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
-              text: 'An error occured whilst loading the merge request version data.',
+              text: 'An error occurred whilst loading the merge request version data.',
               action: jasmine.any(Function),
               actionText: 'Please try again',
               actionPayload: {

spec/javascripts/ide/stores/actions/tree_spec.js

@@ -143,7 +143,7 @@ describe('Multi-file store tree actions', () => {
           .then(done.fail)
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
-              text: 'An error occured whilst loading all the files.',
+              text: 'An error occurred whilst loading all the files.',
               action: jasmine.any(Function),
               actionText: 'Please try again',
               actionPayload: { projectId: 'abc/def', branchId: 'master-testing' },

spec/javascripts/ide/stores/modules/pipelines/actions_spec.js

@@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => {
           {
             type: 'setErrorMessage',
             payload: {
-              text: 'An error occured whilst fetching the latest pipeline.',
+              text: 'An error occurred whilst fetching the latest pipeline.',
               action: jasmine.any(Function),
               actionText: 'Please try again',
               actionPayload: null,
@@ -223,7 +223,7 @@ describe('IDE pipelines actions', () => {
           {
             type: 'setErrorMessage',
             payload: {
-              text: 'An error occured whilst loading the pipelines jobs.',
+              text: 'An error occurred whilst loading the pipelines jobs.',
               action: jasmine.anything(),
               actionText: 'Please try again',
               actionPayload: { id: 1 },
@@ -360,7 +360,7 @@ describe('IDE pipelines actions', () => {
           {
             type: 'setErrorMessage',
             payload: {
-              text: 'An error occured whilst fetching the job trace.',
+              text: 'An error occurred whilst fetching the job trace.',
               action: jasmine.any(Function),
               actionText: 'Please try again',
               actionPayload: null,

spec/lib/extracts_path_spec.rb

@@ -205,7 +205,6 @@ describe ExtractsPath do
   end
 
   describe '#lfs_blob_ids' do
-    shared_examples '#lfs_blob_ids' do
     let(:tag) { @project.repository.add_tag(@project.owner, 'my-annotated-tag', 'master', 'test tag') }
     let(:ref) { tag.target }
     let(:params) { { ref: ref, path: 'README.md' } }
@@ -220,13 +219,4 @@ describe ExtractsPath do
       expect(lfs_blob_ids).to eq([])
     end
   end
-
-    context 'when gitaly is enabled' do
-      it_behaves_like '#lfs_blob_ids'
-    end
-
-    context 'when gitaly is disabled', :skip_gitaly_mock do
-      it_behaves_like '#lfs_blob_ids'
-    end
-  end
 end

spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb

@@ -37,17 +37,7 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do
     let(:stub_path) { '.gitignore' }
   end
 
-  shared_examples 'initializes a DiffCollection' do
   it 'returns a valid instance of a DiffCollection' do
     expect(diff_files).to be_a(Gitlab::Git::DiffCollection)
   end
-  end
-
-  context 'with Gitaly disabled', :disable_gitaly do
-    it_behaves_like 'initializes a DiffCollection'
-  end
-
-  context 'with Gitaly enabled' do
-    it_behaves_like 'initializes a DiffCollection'
-  end
 end

spec/lib/gitlab/git/blob_spec.rb

@@ -128,7 +128,7 @@ describe Gitlab::Git::Blob, :seed_helper do
     end
   end
 
-  shared_examples 'finding blobs by ID' do
+  describe '.raw' do
     let(:raw_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::RubyBlob::ID) }
     let(:bad_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::BigCommit::ID) }
 
@@ -166,16 +166,6 @@ describe Gitlab::Git::Blob, :seed_helper do
     end
   end
 
-  describe '.raw' do
-    context 'when the blob_raw Gitaly feature is enabled' do
-      it_behaves_like 'finding blobs by ID'
-    end
-
-    context 'when the blob_raw Gitaly feature is disabled', :skip_gitaly_mock do
-      it_behaves_like 'finding blobs by ID'
-    end
-  end
-
   describe '.batch' do
     let(:blob_references) do
       [

spec/lib/gitlab/git/commit_spec.rb

@@ -183,7 +183,6 @@ describe Gitlab::Git::Commit, :seed_helper do
       end
     end
 
-    shared_examples '.where' do
     context 'path is empty string' do
       subject do
         commits = described_class.where(
@@ -279,15 +278,6 @@ describe Gitlab::Git::Commit, :seed_helper do
       it { is_expected.to include("874797c3a73b60d2187ed6e2fcabd289ff75171e") }
       it { is_expected.not_to include(SeedRepo::Commit::ID) }
     end
-    end
-
-    describe '.where with gitaly' do
-      it_should_behave_like '.where'
-    end
-
-    describe '.where without gitaly', :skip_gitaly_mock do
-      it_should_behave_like '.where'
-    end
 
     describe '.between' do
       subject do
@@ -508,7 +498,7 @@ describe Gitlab::Git::Commit, :seed_helper do
     end
   end
 
-  shared_examples '#stats' do
+  describe '#stats' do
     subject { commit.stats }
 
     describe '#additions' do
@@ -527,14 +517,6 @@ describe Gitlab::Git::Commit, :seed_helper do
     end
   end
 
-  describe '#stats with gitaly on' do
-    it_should_behave_like '#stats'
-  end
-
-  describe '#stats with gitaly disabled', :skip_gitaly_mock do
-    it_should_behave_like '#stats'
-  end
-
   describe '#has_zero_stats?' do
     it { expect(commit.has_zero_stats?).to eq(false) }
   end
@@ -577,28 +559,18 @@ describe Gitlab::Git::Commit, :seed_helper do
       commit_ids.map { |id| described_class.get_message(repository, id) }
     end
 
-    shared_examples 'getting commit messages' do
     it 'gets commit messages' do
       expect(subject).to contain_exactly(
         "Added contributing guide\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
         "Add submodule\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n"
       )
     end
-    end
-
-    context 'when Gitaly commit_messages feature is enabled' do
-      it_behaves_like 'getting commit messages'
 
     it 'gets messages in one batch', :request_store do
       expect { subject.map(&:itself) }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
     end
   end
 
-    context 'when Gitaly commit_messages feature is disabled', :disable_gitaly do
-      it_behaves_like 'getting commit messages'
-    end
-  end
-
   def sample_commit_hash
     {
       author_email: "dmitriy.zaporozhets@gmail.com",

spec/lib/gitlab/git/tag_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Gitlab::Git::Tag, :seed_helper do
   let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') }
 
-  shared_examples 'Gitlab::Git::Repository#tags' do
+  describe '#tags' do
     describe 'first tag' do
       let(:tag) { repository.tags.first }
 
@@ -25,14 +25,6 @@ describe Gitlab::Git::Tag, :seed_helper do
     it { expect(repository.tags.size).to eq(SeedRepo::Repo::TAGS.size) }
   end
 
-  context 'when Gitaly tags feature is enabled' do
-    it_behaves_like 'Gitlab::Git::Repository#tags'
-  end
-
-  context 'when Gitaly tags feature is disabled', :skip_gitaly_mock do
-    it_behaves_like 'Gitlab::Git::Repository#tags'
-  end
-
   describe '.get_message' do
     let(:tag_ids) { %w[f4e6814c3e4e7a0de82a9e7cd20c626cc963a2f8 8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b] }
 
@@ -40,26 +32,16 @@ describe Gitlab::Git::Tag, :seed_helper do
       tag_ids.map { |id| described_class.get_message(repository, id) }
     end
 
-    shared_examples 'getting tag messages' do
     it 'gets tag messages' do
       expect(subject[0]).to eq("Release\n")
       expect(subject[1]).to eq("Version 1.1.0\n")
     end
-    end
-
-    context 'when Gitaly tag_messages feature is enabled' do
-      it_behaves_like 'getting tag messages'
 
     it 'gets messages in one batch', :request_store do
       expect { subject.map(&:itself) }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
     end
   end
 
-    context 'when Gitaly tag_messages feature is disabled', :disable_gitaly do
-      it_behaves_like 'getting tag messages'
-    end
-  end
-
   describe 'tag into from Gitaly tag' do
     context 'message_size != message.size' do
       let(:gitaly_tag) { build(:gitaly_tag, message: ''.b, message_size: message_size) }

spec/lib/gitlab/git/tree_spec.rb

@@ -80,18 +80,8 @@ describe Gitlab::Git::Tree, :seed_helper do
   end
 
   describe '#where' do
-    shared_examples '#where' do
     it 'returns an empty array when called with an invalid ref' do
       expect(described_class.where(repository, 'foobar-does-not-exist')).to eq([])
     end
   end
-
-    context 'with gitaly' do
-      it_behaves_like '#where'
-    end
-
-    context 'without gitaly', :skip_gitaly_mock do
-      it_behaves_like '#where'
-    end
-  end
 end

spec/lib/gitlab/gitaly_client_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # We stub Gitaly in `spec/support/gitaly.rb` for other tests. We don't want
 # those stubs while testing the GitalyClient itself.
-describe Gitlab::GitalyClient, skip_gitaly_mock: true do
+describe Gitlab::GitalyClient do
   describe '.stub_class' do
     it 'returns the gRPC health check stub' do
       expect(described_class.stub_class(:health_check)).to eq(::Grpc::Health::V1::Health::Stub)
@@ -191,117 +191,53 @@ describe Gitlab::GitalyClient, skip_gitaly_mock: true do
     let(:feature_name) { 'my_feature' }
     let(:real_feature_name) { "gitaly_#{feature_name}" }
 
-    context 'when Gitaly is disabled' do
     before do
-        allow(described_class).to receive(:enabled?).and_return(false)
+      allow(Feature).to receive(:enabled?).and_return(false)
     end
 
     it 'returns false' do
+      expect(Feature).to receive(:enabled?).with(real_feature_name)
       expect(described_class.feature_enabled?(feature_name)).to be(false)
     end
   end
 
-    context 'when the feature status is DISABLED' do
-      let(:feature_status) { Gitlab::GitalyClient::MigrationStatus::DISABLED }
-
-      it 'returns false' do
-        expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
-      end
-    end
-
-    context 'when the feature_status is OPT_IN' do
-      let(:feature_status) { Gitlab::GitalyClient::MigrationStatus::OPT_IN }
-
-      context "when the feature flag hasn't been set" do
-        it 'returns false' do
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
-        end
-      end
-
-      context "when the feature flag is set to disable" do
+  describe 'timeouts' do
+    context 'with default values' do
       before do
-          Feature.get(real_feature_name).disable
+        stub_application_setting(gitaly_timeout_default: 55)
+        stub_application_setting(gitaly_timeout_medium: 30)
+        stub_application_setting(gitaly_timeout_fast: 10)
       end
 
-        it 'returns false' do
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
+      it 'returns expected values' do
+        expect(described_class.default_timeout).to be(55)
+        expect(described_class.medium_timeout).to be(30)
+        expect(described_class.fast_timeout).to be(10)
       end
     end
-
-      context "when the feature flag is set to enable" do
-        before do
-          Feature.get(real_feature_name).enable
   end
 
-        it 'returns true' do
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
-        end
-      end
+  describe 'Peek Performance bar details' do
+    let(:gitaly_server) { Gitaly::Server.all.first }
 
-      context "when the feature flag is set to a percentage of time" do
     before do
-          Feature.get(real_feature_name).enable_percentage_of_time(70)
-        end
-
-        it 'bases the result on pseudo-random numbers' do
-          expect(Random).to receive(:rand).and_return(0.3)
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
-
-          expect(Random).to receive(:rand).and_return(0.8)
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
-        end
+      Gitlab::SafeRequestStore[:peek_enabled] = true
     end
 
-      context "when a feature is not persisted" do
-        it 'returns false when opt_into_all_features is off' do
-          allow(Feature).to receive(:persisted?).and_return(false)
-          allow(described_class).to receive(:opt_into_all_features?).and_return(false)
+    context 'when the request store is active', :request_store do
+      it 'records call details if a RPC is called' do
+        gitaly_server.server_version
 
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
-        end
-
-        it 'returns true when the override is on' do
-          allow(Feature).to receive(:persisted?).and_return(false)
-          allow(described_class).to receive(:opt_into_all_features?).and_return(true)
-
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
-        end
-      end
-    end
-
-    context 'when the feature_status is OPT_OUT' do
-      let(:feature_status) { Gitlab::GitalyClient::MigrationStatus::OPT_OUT }
-
-      context "when the feature flag hasn't been set" do
-        it 'returns true' do
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
-        end
-      end
-
-      context "when the feature flag is set to disable" do
-        before do
-          Feature.get(real_feature_name).disable
-        end
-
-        it 'returns false' do
-          expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
-        end
-      end
+        expect(described_class.list_call_details).not_to be_empty
+        expect(described_class.list_call_details.size).to be(1)
       end
     end
 
-  describe 'timeouts' do
-    context 'with default values' do
-      before do
-        stub_application_setting(gitaly_timeout_default: 55)
-        stub_application_setting(gitaly_timeout_medium: 30)
-        stub_application_setting(gitaly_timeout_fast: 10)
-      end
+    context 'when no request store is active' do
+      it 'records nothing' do
+        gitaly_server.server_version
 
-      it 'returns expected values' do
-        expect(described_class.default_timeout).to be(55)
-        expect(described_class.medium_timeout).to be(30)
-        expect(described_class.fast_timeout).to be(10)
+        expect(described_class.list_call_details).to be_empty
       end
     end
   end

spec/models/merge_request_spec.rb

@@ -30,7 +30,6 @@ describe MergeRequest do
   end
 
   describe '#squash_in_progress?' do
-    shared_examples 'checking whether a squash is in progress' do
     let(:repo_path) do
       Gitlab::GitalyClient::StorageSettings.allow_disk_access do
         subject.source_project.repository.path
@@ -66,15 +65,6 @@ describe MergeRequest do
     end
   end
 
-    context 'when Gitaly squash_in_progress is enabled' do
-      it_behaves_like 'checking whether a squash is in progress'
-    end
-
-    context 'when Gitaly squash_in_progress is disabled', :disable_gitaly do
-      it_behaves_like 'checking whether a squash is in progress'
-    end
-  end
-
   describe '#squash?' do
     let(:merge_request) { build(:merge_request, squash: squash) }
     subject { merge_request.squash? }
@@ -3016,14 +3006,6 @@ describe MergeRequest do
         expect(subject.rebase_in_progress?).to be_falsey
       end
     end
-
-    context 'when Gitaly rebase_in_progress is enabled' do
-      it_behaves_like 'checking whether a rebase is in progress'
-    end
-
-    context 'when Gitaly rebase_in_progress is enabled', :disable_gitaly do
-      it_behaves_like 'checking whether a rebase is in progress'
-    end
   end
 
   describe '#allow_collaboration' do

spec/models/project_wiki_spec.rb

@@ -138,7 +138,6 @@ describe ProjectWiki do
   end
 
   describe "#find_page" do
-    shared_examples 'finding a wiki page' do
     before do
       create_page("index page", "This is an awesome Gollum Wiki")
     end
@@ -189,15 +188,6 @@ describe ProjectWiki do
     end
   end
 
-    context 'when Gitaly wiki_find_page is enabled' do
-      it_behaves_like 'finding a wiki page'
-    end
-
-    context 'when Gitaly wiki_find_page is disabled', :skip_gitaly_mock do
-      it_behaves_like 'finding a wiki page'
-    end
-  end
-
   describe '#find_sidebar' do
     before do
       create_page(described_class::SIDEBAR, 'This is an awesome Sidebar')
@@ -215,7 +205,6 @@ describe ProjectWiki do
   end
 
   describe '#find_file' do
-    shared_examples 'finding a wiki file' do
     let(:image) { File.open(Rails.root.join('spec', 'fixtures', 'big-image.png')) }
 
     before do
@@ -250,17 +239,7 @@ describe ProjectWiki do
     end
   end
 
-    context 'when Gitaly wiki_find_file is enabled' do
-      it_behaves_like 'finding a wiki file'
-    end
-
-    context 'when Gitaly wiki_find_file is disabled', :skip_gitaly_mock do
-      it_behaves_like 'finding a wiki file'
-    end
-  end
-
   describe "#create_page" do
-    shared_examples 'creating a wiki page' do
     after do
       destroy_page(subject.pages.first.page)
     end
@@ -303,15 +282,6 @@ describe ProjectWiki do
     end
   end
 
-    context 'when Gitaly wiki_write_page is enabled' do
-      it_behaves_like 'creating a wiki page'
-    end
-
-    context 'when Gitaly wiki_write_page is disabled', :skip_gitaly_mock do
-      it_behaves_like 'creating a wiki page'
-    end
-  end
-
   describe "#update_page" do
     before do
       create_page("update-page", "some content")
@@ -359,7 +329,6 @@ describe ProjectWiki do
   end
 
   describe "#delete_page" do
-    shared_examples 'deleting a wiki page' do
     before do
       create_page("index", "some content")
       @page = subject.wiki.page(title: "index")
@@ -388,15 +357,6 @@ describe ProjectWiki do
     end
   end
 
-    context 'when Gitaly wiki_delete_page is enabled' do
-      it_behaves_like 'deleting a wiki page'
-    end
-
-    context 'when Gitaly wiki_delete_page is disabled', :skip_gitaly_mock do
-      it_behaves_like 'deleting a wiki page'
-    end
-  end
-
   describe '#create_repo!' do
     let(:project) { create(:project) }
 

spec/models/repository_spec.rb

@@ -38,7 +38,6 @@ describe Repository do
   end
 
   describe '#branch_names_contains' do
-    shared_examples '#branch_names_contains' do
     set(:project) { create(:project, :repository) }
     let(:repository) { project.repository }
 
@@ -57,32 +56,13 @@ describe Repository do
     end
   end
 
-    context 'when gitaly is enabled' do
-      it_behaves_like '#branch_names_contains'
-    end
-
-    context 'when gitaly is disabled', :skip_gitaly_mock do
-      it_behaves_like '#branch_names_contains'
-    end
-  end
-
   describe '#tag_names_contains' do
-    shared_examples '#tag_names_contains' do
     subject { repository.tag_names_contains(sample_commit.id) }
 
     it { is_expected.to include('v1.1.0') }
     it { is_expected.not_to include('v1.0.0') }
   end
 
-    context 'when gitaly is enabled' do
-      it_behaves_like '#tag_names_contains'
-    end
-
-    context 'when gitaly is enabled', :skip_gitaly_mock do
-      it_behaves_like '#tag_names_contains'
-    end
-  end
-
   describe 'tags_sorted_by' do
     context 'name_desc' do
       subject { repository.tags_sorted_by('name_desc').map(&:name) }
@@ -238,7 +218,6 @@ describe Repository do
   end
 
   describe '#last_commit_for_path' do
-    shared_examples 'getting last commit for path' do
     subject { repository.last_commit_for_path(sample_commit.id, '.gitignore').id }
 
     it { is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8') }
@@ -252,17 +231,7 @@ describe Repository do
     end
   end
 
-    context 'when Gitaly feature last_commit_for_path is enabled' do
-      it_behaves_like 'getting last commit for path'
-    end
-
-    context 'when Gitaly feature last_commit_for_path is disabled', :skip_gitaly_mock do
-      it_behaves_like 'getting last commit for path'
-    end
-  end
-
   describe '#last_commit_id_for_path' do
-    shared_examples 'getting last commit ID for path' do
     subject { repository.last_commit_id_for_path(sample_commit.id, '.gitignore') }
 
     it "returns last commit id for a given path" do
@@ -286,15 +255,6 @@ describe Repository do
     end
   end
 
-    context 'when Gitaly feature last_commit_for_path is enabled' do
-      it_behaves_like 'getting last commit ID for path'
-    end
-
-    context 'when Gitaly feature last_commit_for_path is disabled', :skip_gitaly_mock do
-      it_behaves_like 'getting last commit ID for path'
-    end
-  end
-
   describe '#commits' do
     context 'when neither the all flag nor a ref are specified' do
       it 'returns every commit from default branch' do
@@ -374,8 +334,6 @@ describe Repository do
 
   describe '#commits_by' do
     set(:project) { create(:project, :repository) }
-
-    shared_examples 'batch commits fetching' do
     let(:oids) { TestEnv::BRANCH_SHA.values }
 
     subject { project.repository.commits_by(oids: oids) }
@@ -411,17 +369,7 @@ describe Repository do
     end
   end
 
-    context 'when Gitaly list_commits_by_oid is enabled' do
-      it_behaves_like 'batch commits fetching'
-    end
-
-    context 'when Gitaly list_commits_by_oid is enabled', :disable_gitaly do
-      it_behaves_like 'batch commits fetching'
-    end
-  end
-
   describe '#find_commits_by_message' do
-    shared_examples 'finding commits by message' do
     it 'returns commits with messages containing a given string' do
       commit_ids = repository.find_commits_by_message('submodule').map(&:id)
 
@@ -438,15 +386,6 @@ describe Repository do
 
       expect(commit_ids).to include('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
     end
-    end
-
-    context 'when Gitaly commits_by_message feature is enabled' do
-      it_behaves_like 'finding commits by message'
-    end
-
-    context 'when Gitaly commits_by_message feature is disabled', :skip_gitaly_mock do
-      it_behaves_like 'finding commits by message'
-    end
 
     describe 'when storage is broken', :broken_storage do
       it 'should raise a storage error' do
@@ -1328,10 +1267,8 @@ describe Repository do
 
   describe '#merge' do
     let(:merge_request) { create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project) }
-
     let(:message) { 'Test \r\n\r\n message' }
 
-    shared_examples '#merge' do
     it 'merges the code and returns the commit id' do
       expect(merge_commit).to be_present
       expect(repository.blob_at(merge_commit.id, 'files/ruby/feature.rb')).to be_present
@@ -1348,15 +1285,6 @@ describe Repository do
 
       expect(repository.commit(merge_commit_id).message).to eq(message.delete("\r"))
     end
-    end
-
-    context 'with gitaly' do
-      it_behaves_like '#merge'
-    end
-
-    context 'without gitaly', :skip_gitaly_mock do
-      it_behaves_like '#merge'
-    end
 
     def merge(repository, user, merge_request, message)
       repository.merge(user, merge_request.diff_head_sha, merge_request, message)
@@ -1392,7 +1320,6 @@ describe Repository do
   end
 
   describe '#revert' do
-    shared_examples 'reverting a commit' do
     let(:new_image_commit) { repository.commit('33f3729a45c02fc67d00adb1b8bca394b0e761d9') }
     let(:update_image_commit) { repository.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
     let(:message) { 'revert message' }
@@ -1428,17 +1355,7 @@ describe Repository do
     end
   end
 
-    context 'when Gitaly revert feature is enabled' do
-      it_behaves_like 'reverting a commit'
-    end
-
-    context 'when Gitaly revert feature is disabled', :disable_gitaly do
-      it_behaves_like 'reverting a commit'
-    end
-  end
-
   describe '#cherry_pick' do
-    shared_examples 'cherry-picking a commit' do
     let(:conflict_commit) { repository.commit('c642fe9b8b9f28f9225d7ea953fe14e74748d53b') }
     let(:pickable_commit) { repository.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
     let(:pickable_merge) { repository.commit('e56497bb5f03a90a51293fc6d516788730953899') }
@@ -1477,15 +1394,6 @@ describe Repository do
     end
   end
 
-    context 'when Gitaly cherry_pick feature is enabled' do
-      it_behaves_like 'cherry-picking a commit'
-    end
-
-    context 'when Gitaly cherry_pick feature is disabled', :disable_gitaly do
-      it_behaves_like 'cherry-picking a commit'
-    end
-  end
-
   describe '#before_delete' do
     describe 'when a repository does not exist' do
       before do
@@ -2190,7 +2098,6 @@ describe Repository do
     let(:commit) { repository.commit }
     let(:ancestor) { commit.parents.first }
 
-    shared_examples '#ancestor?' do
     it 'it is an ancestor' do
       expect(repository.ancestor?(ancestor.id, commit.id)).to eq(true)
     end
@@ -2211,15 +2118,6 @@ describe Repository do
     end
   end
 
-    context 'with Gitaly enabled' do
-      it_behaves_like('#ancestor?')
-    end
-
-    context 'with Gitaly disabled', :skip_gitaly_mock do
-      it_behaves_like('#ancestor?')
-    end
-  end
-
   describe '#archive_metadata' do
     let(:ref) { 'master' }
     let(:storage_path) { '/tmp' }

spec/models/wiki_page_spec.rb

@@ -200,7 +200,6 @@ describe WikiPage do
   end
 
   describe '#create' do
-    shared_examples 'create method' do
     context 'with valid attributes' do
       it 'raises an error if a page with the same path already exists' do
         create_page('New Page', 'content')
@@ -222,17 +221,7 @@ describe WikiPage do
     end
   end
 
-    context 'when Gitaly is enabled' do
-      it_behaves_like 'create method'
-    end
-
-    context 'when Gitaly is disabled', :skip_gitaly_mock do
-      it_behaves_like 'create method'
-    end
-  end
-
   describe "#update" do
-    shared_examples 'update method' do
     before do
       create_page("Update", "content")
       @page = wiki.find_page("Update")
@@ -331,7 +320,7 @@ describe WikiPage do
           @page = wiki.find_page('foo/Existing Page')
         end
 
-          it 'moves the page to the root folder if the title is preceded by /', :skip_gitaly_mock do
+        it 'moves the page to the root folder if the title is preceded by /' do
           expect(@page.slug).to eq 'foo/Existing-Page'
           expect(@page.update(title: '/Existing Page', content: 'new_content')).to be_truthy
           expect(@page.slug).to eq 'Existing-Page'
@@ -368,15 +357,6 @@ describe WikiPage do
     end
   end
 
-    context 'when Gitaly is enabled' do
-      it_behaves_like 'update method'
-    end
-
-    context 'when Gitaly is disabled', :skip_gitaly_mock do
-      it_behaves_like 'update method'
-    end
-  end
-
   describe "#destroy" do
     before do
       create_page("Delete Page", "content")
@@ -394,7 +374,6 @@ describe WikiPage do
   end
 
   describe "#versions" do
-    shared_examples 'wiki page versions' do
     let(:page) { wiki.find_page("Update") }
 
     before do
@@ -416,15 +395,6 @@ describe WikiPage do
     end
   end
 
-    context 'when Gitaly is enabled' do
-      it_behaves_like 'wiki page versions'
-    end
-
-    context 'when Gitaly is disabled', :disable_gitaly do
-      it_behaves_like 'wiki page versions'
-    end
-  end
-
   describe "#title" do
     before do
       create_page("Title", "content")
@@ -555,7 +525,6 @@ describe WikiPage do
   end
 
   describe '#formatted_content' do
-    shared_examples 'fetching page formatted content' do
     it 'returns processed content of the page' do
       subject.create({ title: "RDoc", content: "*bold*", format: "rdoc" })
       page = wiki.find_page('RDoc')
@@ -566,15 +535,6 @@ describe WikiPage do
     end
   end
 
-    context 'when Gitaly wiki_page_formatted_data is enabled' do
-      it_behaves_like 'fetching page formatted content'
-    end
-
-    context 'when Gitaly wiki_page_formatted_data is disabled', :disable_gitaly do
-      it_behaves_like 'fetching page formatted content'
-    end
-  end
-
   describe '#hook_attrs' do
     it 'adds absolute urls for images in the content' do
       create_page("test page", "test![WikiPage_Image](/uploads/abc/WikiPage_Image.png)")

spec/rubocop/cop/safe_params_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rubocop'
+require 'rubocop/rspec/support'
+require_relative '../../../rubocop/cop/safe_params'
+
+describe RuboCop::Cop::SafeParams do
+  include CopHelper
+
+  subject(:cop) { described_class.new }
+
+  it 'flags the params as an argument of url_for' do
+    expect_offense(<<~SOURCE)
+      url_for(params)
+      ^^^^^^^^^^^^^^^ Use `safe_params` instead of `params` in url_for.
+    SOURCE
+  end
+
+  it 'flags the merged params as an argument of url_for' do
+    expect_offense(<<~SOURCE)
+      url_for(params.merge(additional_params))
+      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `safe_params` instead of `params` in url_for.
+    SOURCE
+  end
+
+  it 'flags the merged params arg as an argument of url_for' do
+    expect_offense(<<~SOURCE)
+      url_for(something.merge(additional).merge(params))
+      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `safe_params` instead of `params` in url_for.
+    SOURCE
+  end
+
+  it 'does not flag other argument of url_for' do
+    expect_no_offenses(<<~SOURCE)
+      url_for(something)
+    SOURCE
+  end
+end

spec/support/gitaly.rb

-RSpec.configure do |config|
-  config.before(:each) do |example|
-    if example.metadata[:disable_gitaly]
-      # Use 'and_wrap_original' to make sure the arguments are valid
-      allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_wrap_original { |m, *args| m.call(*args) && false }
-    else
-      next if example.metadata[:skip_gitaly_mock]
-
-      # Use 'and_wrap_original' to make sure the arguments are valid
-      allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_wrap_original do |m, *args|
-        m.call(*args)
-        !Gitlab::GitalyClient.explicit_opt_in_required.include?(args.first)
-      end
-    end
-  end
-end