Add latest changes from gitlab-org/gitlab@master

81 files changed, 282 insertions, 113 deletions

diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb
index cdb26b0ea4f..c64301f72ba 100644
--- a/app/controllers/clusters/clusters_controller.rb
+++ b/app/controllers/clusters/clusters_controller.rb
@@ -308,7 +308,8 @@ class Clusters::ClustersController < Clusters::BaseController
   def proxy_variable_substitution_service
     @empty_service ||= Class.new(BaseService) do
       def initialize(proxyable, params)
-        @proxyable, @params = proxyable, params
+        @proxyable = proxyable
+        @params = params
       end
 
       def execute
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index 2ced72aab7e..9ca917841e9 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -63,7 +63,8 @@ class Projects::CommitsController < Projects::ApplicationController
 
   def set_commits
     render_404 unless @path.empty? || request.format == :atom || @repository.blob_at(@commit.id, @path) || @repository.tree(@commit.id, @path).entries.present?
-    @limit, @offset = (params[:limit] || 40).to_i, (params[:offset] || 0).to_i
+    @limit = (params[:limit] || 40).to_i
+    @offset = (params[:offset] || 0).to_i
     search = params[:search]
     author = params[:author]
 
diff --git a/app/finders/ci/variables_finder.rb b/app/finders/ci/variables_finder.rb
index d1546b27995..39a1a60596d 100644
--- a/app/finders/ci/variables_finder.rb
+++ b/app/finders/ci/variables_finder.rb
@@ -3,7 +3,8 @@
 module Ci
   class VariablesFinder
     def initialize(resource, params)
-      @resource, @params = resource, params
+      @resource = resource
+      @params = params
 
       raise ArgumentError, 'Please provide params[:key]' if params[:key].blank?
     end
diff --git a/app/finders/environments_by_deployments_finder.rb b/app/finders/environments_by_deployments_finder.rb
index 7c0fb4c5424..76e1c050ea5 100644
--- a/app/finders/environments_by_deployments_finder.rb
+++ b/app/finders/environments_by_deployments_finder.rb
@@ -4,7 +4,9 @@ class EnvironmentsByDeploymentsFinder
   attr_reader :project, :current_user, :params
 
   def initialize(project, current_user, params = {})
-    @project, @current_user, @params = project, current_user, params
+    @project = project
+    @current_user = current_user
+    @params = params
   end
 
   # rubocop: disable CodeReuse/ActiveRecord
diff --git a/app/finders/environments_finder.rb b/app/finders/environments_finder.rb
index 688c241dfb2..c64e850f440 100644
--- a/app/finders/environments_finder.rb
+++ b/app/finders/environments_finder.rb
@@ -6,7 +6,9 @@ class EnvironmentsFinder
   InvalidStatesError = Class.new(StandardError)
 
   def initialize(project, current_user, params = {})
-    @project, @current_user, @params = project, current_user, params
+    @project = project
+    @current_user = current_user
+    @params = params
   end
 
   def execute
diff --git a/app/finders/metrics/dashboards/annotations_finder.rb b/app/finders/metrics/dashboards/annotations_finder.rb
index c42b8bf40e5..e97704738ea 100644
--- a/app/finders/metrics/dashboards/annotations_finder.rb
+++ b/app/finders/metrics/dashboards/annotations_finder.rb
@@ -4,7 +4,8 @@ module Metrics
   module Dashboards
     class AnnotationsFinder
       def initialize(dashboard:, params:)
-        @dashboard, @params = dashboard, params
+        @dashboard = dashboard
+        @params = params
       end
 
       def execute
diff --git a/app/finders/metrics/users_starred_dashboards_finder.rb b/app/finders/metrics/users_starred_dashboards_finder.rb
index 7244c51f9a7..2ef706c1b11 100644
--- a/app/finders/metrics/users_starred_dashboards_finder.rb
+++ b/app/finders/metrics/users_starred_dashboards_finder.rb
@@ -3,7 +3,9 @@
 module Metrics
   class UsersStarredDashboardsFinder
     def initialize(user:, project:, params: {})
-      @user, @project, @params = user, project, params
+      @user = user
+      @project = project
+      @params = params
     end
 
     def execute
diff --git a/app/finders/packages/debian/distributions_finder.rb b/app/finders/packages/debian/distributions_finder.rb
index 98afc918fb1..a5ac9f7e2f7 100644
--- a/app/finders/packages/debian/distributions_finder.rb
+++ b/app/finders/packages/debian/distributions_finder.rb
@@ -4,7 +4,8 @@ module Packages
   module Debian
     class DistributionsFinder
       def initialize(container, params = {})
-        @container, @params = container, params
+        @container = container
+        @params = params
       end
 
       def execute
diff --git a/app/graphql/gitlab_schema.rb b/app/graphql/gitlab_schema.rb
index 76ac29fedeb..8369d0e120f 100644
--- a/app/graphql/gitlab_schema.rb
+++ b/app/graphql/gitlab_schema.rb
@@ -111,6 +111,7 @@ class GitlabSchema < GraphQL::Schema
     #
     # Options:
     #  * :expected_type [Class] - the type of object this GlobalID should refer to.
+    #  * :expected_type [[Class]] - array of the types of object this GlobalID should refer to.
     #
     # e.g.
     #
@@ -120,14 +121,14 @@ class GitlabSchema < GraphQL::Schema
     #   gid.model_class == ::Project
     # ```
     def parse_gid(global_id, ctx = {})
-      expected_type = ctx[:expected_type]
+      expected_types = Array(ctx[:expected_type])
       gid = GlobalID.parse(global_id)
 
       raise Gitlab::Graphql::Errors::ArgumentError, "#{global_id} is not a valid GitLab ID." unless gid
 
-      if expected_type && gid.model_class.ancestors.exclude?(expected_type)
-        vars = { global_id: global_id, expected_type: expected_type }
-        msg = _('%{global_id} is not a valid ID for %{expected_type}.') % vars
+      if expected_types.any? && expected_types.none? { |type| gid.model_class.ancestors.include?(type) }
+        vars = { global_id: global_id, expected_types: expected_types.join(', ') }
+        msg = _('%{global_id} is not a valid ID for %{expected_types}.') % vars
         raise Gitlab::Graphql::Errors::ArgumentError, msg
       end
 
diff --git a/app/graphql/resolvers/alert_management/http_integrations_resolver.rb b/app/graphql/resolvers/alert_management/http_integrations_resolver.rb
index fb6682f8d7e..abc54614a59 100644
--- a/app/graphql/resolvers/alert_management/http_integrations_resolver.rb
+++ b/app/graphql/resolvers/alert_management/http_integrations_resolver.rb
@@ -3,19 +3,39 @@
 module Resolvers
   module AlertManagement
     class HttpIntegrationsResolver < BaseResolver
+      include ::Gitlab::Graphql::Laziness
+
       alias_method :project, :object
 
+      argument :id, Types::GlobalIDType[::AlertManagement::HttpIntegration],
+               required: false,
+               description: 'ID of the integration.'
+
       type Types::AlertManagement::HttpIntegrationType.connection_type, null: true
 
-      def resolve(**args)
-        http_integrations
+      def resolve(id: nil)
+        return [] unless Ability.allowed?(current_user, :admin_operations, project)
+
+        if id
+          integrations_by(gid: id)
+        else
+          http_integrations
+        end
       end
 
       private
 
-      def http_integrations
-        return [] unless Ability.allowed?(current_user, :admin_operations, project)
+      def integrations_by(gid:)
+        id = Types::GlobalIDType[::AlertManagement::HttpIntegration].coerce_isolated_input(gid)
+        object = GitlabSchema.find_by_gid(id)
+
+        defer { object }.then do |integration|
+          ret = integration if project == integration&.project
+          Array.wrap(ret)
+        end
+      end
 
+      def http_integrations
         ::AlertManagement::HttpIntegrationsFinder.new(project, {}).execute
       end
     end
diff --git a/app/graphql/resolvers/alert_management/integrations_resolver.rb b/app/graphql/resolvers/alert_management/integrations_resolver.rb
index e027e0412bd..cb7e73c2d1a 100644
--- a/app/graphql/resolvers/alert_management/integrations_resolver.rb
+++ b/app/graphql/resolvers/alert_management/integrations_resolver.rb
@@ -3,27 +3,60 @@
 module Resolvers
   module AlertManagement
     class IntegrationsResolver < BaseResolver
+      include ::Gitlab::Graphql::Laziness
+
       alias_method :project, :object
 
+      argument :id, ::Types::GlobalIDType,
+               required: false,
+               description: 'ID of the integration.'
+
       type Types::AlertManagement::IntegrationType.connection_type, null: true
 
-      def resolve(**args)
-        http_integrations + prometheus_integrations
+      def resolve(id: nil)
+        if id
+          integrations_by(gid: id)
+        else
+          http_integrations + prometheus_integrations
+        end
       end
 
       private
 
+      def integrations_by(gid:)
+        object = GitlabSchema.object_from_id(gid, expected_type: expected_integration_types)
+        defer { object }.then do |integration|
+          ret = integration if project == integration&.project
+          Array.wrap(ret)
+        end
+      end
+
       def prometheus_integrations
-        return [] unless Ability.allowed?(current_user, :admin_project, project)
+        return [] unless prometheus_integrations_allowed?
 
         Array(project.prometheus_service)
       end
 
       def http_integrations
-        return [] unless Ability.allowed?(current_user, :admin_operations, project)
+        return [] unless http_integrations_allowed?
 
         ::AlertManagement::HttpIntegrationsFinder.new(project, {}).execute
       end
+
+      def prometheus_integrations_allowed?
+        Ability.allowed?(current_user, :admin_project, project)
+      end
+
+      def http_integrations_allowed?
+        Ability.allowed?(current_user, :admin_operations, project)
+      end
+
+      def expected_integration_types
+        [].tap do |types|
+          types << ::AlertManagement::HttpIntegration if http_integrations_allowed?
+          types << ::PrometheusService if prometheus_integrations_allowed?
+        end
+      end
     end
   end
 end
diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb
index 959178c47d7..f1e0be3a622 100644
--- a/app/helpers/submodule_helper.rb
+++ b/app/helpers/submodule_helper.rb
@@ -18,7 +18,8 @@ module SubmoduleHelper
     end
 
     if url =~ %r{([^/:]+)/([^/]+(?:\.git)?)\Z}
-      namespace, project = Regexp.last_match(1), Regexp.last_match(2)
+      namespace = Regexp.last_match(1)
+      project = Regexp.last_match(2)
       gitlab_hosts = [Gitlab.config.gitlab.url,
                       Gitlab.config.gitlab_shell.ssh_path_prefix]
 
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 514e923c380..ba46a98b951 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -58,7 +58,8 @@ class Ability
 
     def allowed?(user, action, subject = :global, opts = {})
       if subject.is_a?(Hash)
-        opts, subject = subject, :global
+        opts = subject
+        subject = :global
       end
 
       policy = policy_for(user, subject)
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb
index e67d261d3b4..66a8d1f8105 100644
--- a/app/models/application_setting_implementation.rb
+++ b/app/models/application_setting_implementation.rb
@@ -438,11 +438,14 @@ module ApplicationSettingImplementation
   def parse_addr_and_port(str)
     case str
     when /\A\[(?<address> .* )\]:(?<port> \d+ )\z/x      # string like "[::1]:80"
-      address, port = $~[:address], $~[:port]
+      address = $~[:address]
+      port = $~[:port]
     when /\A(?<address> [^:]+ ):(?<port> \d+ )\z/x       # string like "127.0.0.1:80"
-      address, port = $~[:address], $~[:port]
+      address = $~[:address]
+      port = $~[:port]
     else                                                 # string with no port number
-      address, port = str, nil
+      address = str
+      port = nil
     end
 
     [address, port&.to_i]
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 9d3b89c5996..5c3e3685c64 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -62,7 +62,8 @@ class Commit
       collection.sort do |a, b|
         operands = [a, b].tap { |o| o.reverse! if sort == 'desc' }
 
-        attr1, attr2 = operands.first.public_send(order_by), operands.second.public_send(order_by) # rubocop:disable GitlabSecurity/PublicSend
+        attr1 = operands.first.public_send(order_by) # rubocop:disable GitlabSecurity/PublicSend
+        attr2 = operands.second.public_send(order_by) # rubocop:disable GitlabSecurity/PublicSend
 
         # use case insensitive comparison for string values
         order_by.in?(%w[email name]) ? attr1.casecmp(attr2) : attr1 <=> attr2
diff --git a/app/models/concerns/taskable.rb b/app/models/concerns/taskable.rb
index 5debfa6f834..d8867177059 100644
--- a/app/models/concerns/taskable.rb
+++ b/app/models/concerns/taskable.rb
@@ -30,7 +30,8 @@ module Taskable
   end
 
   def self.get_updated_tasks(old_content:, new_content:)
-    old_tasks, new_tasks = get_tasks(old_content), get_tasks(new_content)
+    old_tasks = get_tasks(old_content)
+    new_tasks = get_tasks(new_content)
 
     new_tasks.select.with_index do |new_task, i|
       old_task = old_tasks[i]
diff --git a/app/models/design_management/design_action.rb b/app/models/design_management/design_action.rb
index 22baa916296..43dcce545d2 100644
--- a/app/models/design_management/design_action.rb
+++ b/app/models/design_management/design_action.rb
@@ -29,7 +29,9 @@ module DesignManagement
     # - design [DesignManagement::Design]: the design that was changed
     # - action [Symbol]: the action that gitaly performed
     def initialize(design, action, content = nil)
-      @design, @action, @content = design, action, content
+      @design = design
+      @action = action
+      @content = content
       validate!
     end
 
diff --git a/app/models/design_management/design_at_version.rb b/app/models/design_management/design_at_version.rb
index 211211144f4..2f045358914 100644
--- a/app/models/design_management/design_at_version.rb
+++ b/app/models/design_management/design_at_version.rb
@@ -18,7 +18,8 @@ module DesignManagement
     validate :design_and_version_have_issue_id
 
     def initialize(design: nil, version: nil)
-      @design, @version = design, version
+      @design = design
+      @version = version
     end
 
     # The ID, needed by GraphQL types and as part of the Lazy-fetch
diff --git a/app/models/design_management/version.rb b/app/models/design_management/version.rb
index 49aec8b9720..5cfd8f3ec8e 100644
--- a/app/models/design_management/version.rb
+++ b/app/models/design_management/version.rb
@@ -14,7 +14,9 @@ module DesignManagement
       attr_reader :sha, :issue_id, :actions
 
       def initialize(sha, issue_id, actions)
-        @sha, @issue_id, @actions = sha, issue_id, actions
+        @sha = sha
+        @issue_id = issue_id
+        @actions = actions
       end
 
       def message
diff --git a/app/models/external_issue.rb b/app/models/external_issue.rb
index 68b2353556e..36030b80370 100644
--- a/app/models/external_issue.rb
+++ b/app/models/external_issue.rb
@@ -6,7 +6,8 @@ class ExternalIssue
   attr_reader :project
 
   def initialize(issue_identifier, project)
-    @issue_identifier, @project = issue_identifier, project
+    @issue_identifier = issue_identifier
+    @project = project
   end
 
   def to_s
diff --git a/app/models/member.rb b/app/models/member.rb
index ae9f6cb9eca..e978552592d 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -291,7 +291,9 @@ class Member < ApplicationRecord
     private
 
     def parse_users_list(source, list)
-      emails, user_ids, users = [], [], []
+      emails = []
+      user_ids = []
+      users = []
       existing_members = {}
 
       list.each do |item|
diff --git a/app/models/preloaders/labels_preloader.rb b/app/models/preloaders/labels_preloader.rb
index aad51748e65..427f2869aac 100644
--- a/app/models/preloaders/labels_preloader.rb
+++ b/app/models/preloaders/labels_preloader.rb
@@ -13,7 +13,9 @@ module Preloaders
     attr_reader :labels, :user, :project
 
     def initialize(labels, user, project = nil)
-      @labels, @user, @project = labels, user, project
+      @labels = labels
+      @user = user
+      @project = project
     end
 
     def preload_all
diff --git a/app/models/project_services/external_wiki_service.rb b/app/models/project_services/external_wiki_service.rb
index 7dd5b1fb00f..c41783d1af4 100644
--- a/app/models/project_services/external_wiki_service.rb
+++ b/app/models/project_services/external_wiki_service.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class ExternalWikiService < Service
+  include ActionView::Helpers::UrlHelper
   prop_accessor :external_wiki_url
-
   validates :external_wiki_url, presence: true, public_url: true, if: :activated?
 
   def title
@@ -10,7 +10,7 @@ class ExternalWikiService < Service
   end
 
   def description
-    s_('ExternalWikiService|Replaces the link to the internal wiki with a link to an external wiki.')
+    s_('ExternalWikiService|Link to an external wiki from the sidebar.')
   end
 
   def self.to_param
@@ -23,12 +23,19 @@ class ExternalWikiService < Service
         type: 'text',
         name: 'external_wiki_url',
         title: s_('ExternalWikiService|External wiki URL'),
-        placeholder: s_('ExternalWikiService|The URL of the external wiki'),
+        placeholder: s_('ExternalWikiService|https://example.com/xxx/wiki/...'),
+        help: 'Enter the URL to the external wiki.',
         required: true
       }
     ]
   end
 
+  def help
+    docs_link = link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/wiki/index', anchor: 'link-an-external-wiki'), target: '_blank', rel: 'noopener noreferrer'
+
+    s_('Link an external wiki from the project\'s sidebar. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
+  end
+
   def execute(_data)
     response = Gitlab::HTTP.get(properties['external_wiki_url'], verify: true)
     response.body if response.code == 200
diff --git a/app/services/application_settings/base_service.rb b/app/services/application_settings/base_service.rb
index ebe067536ca..0929b30b7e9 100644
--- a/app/services/application_settings/base_service.rb
+++ b/app/services/application_settings/base_service.rb
@@ -3,7 +3,9 @@
 module ApplicationSettings
   class BaseService < ::BaseService
     def initialize(application_setting, user, params = {})
-      @application_setting, @current_user, @params = application_setting, user, params.dup
+      @application_setting = application_setting
+      @current_user = user
+      @params = params.dup
     end
   end
 end
diff --git a/app/services/base_container_service.rb b/app/services/base_container_service.rb
index 56e4b8c908c..6852237dc25 100644
--- a/app/services/base_container_service.rb
+++ b/app/services/base_container_service.rb
@@ -7,6 +7,8 @@ class BaseContainerService
   attr_reader :container, :current_user, :params
 
   def initialize(container:, current_user: nil, params: {})
-    @container, @current_user, @params = container, current_user, params.dup
+    @container = container
+    @current_user = current_user
+    @params = params.dup
   end
 end
diff --git a/app/services/base_service.rb b/app/services/base_service.rb
index b4c4b6980a8..20dfeb67815 100644
--- a/app/services/base_service.rb
+++ b/app/services/base_service.rb
@@ -15,7 +15,9 @@ class BaseService
   attr_accessor :project, :current_user, :params
 
   def initialize(project, user = nil, params = {})
-    @project, @current_user, @params = project, user, params.dup
+    @project = project
+    @current_user = user
+    @params = params.dup
   end
 
   delegate :repository, to: :project
diff --git a/app/services/boards/base_service.rb b/app/services/boards/base_service.rb
index 439a5c06223..83bb69b3822 100644
--- a/app/services/boards/base_service.rb
+++ b/app/services/boards/base_service.rb
@@ -6,7 +6,9 @@ module Boards
     attr_accessor :parent, :current_user, :params
 
     def initialize(parent, user, params = {})
-      @parent, @current_user, @params = parent, user, params.dup
+      @parent = parent
+      @current_user = user
+      @params = params.dup
     end
   end
 end
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 0fd47e625fd..ca936307acc 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -96,7 +96,8 @@ module Ci
     # rubocop: enable Metrics/ParameterLists
 
     def execute!(*args, &block)
-      source, params = args[0], Hash(args[1])
+      source = args[0]
+      params = Hash(args[1])
 
       execute(source, **params, &block).tap do |pipeline|
         unless pipeline.persisted?
diff --git a/app/services/clusters/create_service.rb b/app/services/clusters/create_service.rb
index 6693a58683f..cb2de8b943c 100644
--- a/app/services/clusters/create_service.rb
+++ b/app/services/clusters/create_service.rb
@@ -5,7 +5,8 @@ module Clusters
     attr_reader :current_user, :params
 
     def initialize(user = nil, params = {})
-      @current_user, @params = user, params.dup
+      @current_user = user
+      @params = params.dup
     end
 
     def execute(access_token: nil)
diff --git a/app/services/clusters/destroy_service.rb b/app/services/clusters/destroy_service.rb
index a8de04683fa..371f947add7 100644
--- a/app/services/clusters/destroy_service.rb
+++ b/app/services/clusters/destroy_service.rb
@@ -5,7 +5,8 @@ module Clusters
     attr_reader :current_user, :params
 
     def initialize(user = nil, params = {})
-      @current_user, @params = user, params.dup
+      @current_user = user
+      @params = params.dup
       @response = {}
     end
 
diff --git a/app/services/clusters/update_service.rb b/app/services/clusters/update_service.rb
index ba20826848d..5432d9fbca1 100644
--- a/app/services/clusters/update_service.rb
+++ b/app/services/clusters/update_service.rb
@@ -5,7 +5,8 @@ module Clusters
     attr_reader :current_user, :params
 
     def initialize(user = nil, params = {})
-      @current_user, @params = user, params.dup
+      @current_user = user
+      @params = params.dup
     end
 
     def execute(cluster)
diff --git a/app/services/draft_notes/base_service.rb b/app/services/draft_notes/base_service.rb
index 95c291ea800..66f9e04ef24 100644
--- a/app/services/draft_notes/base_service.rb
+++ b/app/services/draft_notes/base_service.rb
@@ -5,7 +5,9 @@ module DraftNotes
     attr_accessor :merge_request, :current_user, :params
 
     def initialize(merge_request, current_user, params = nil)
-      @merge_request, @current_user, @params = merge_request, current_user, params.dup
+      @merge_request = merge_request
+      @current_user = current_user
+      @params = params.dup
     end
 
     def merge_request_activity_counter
diff --git a/app/services/git/wiki_push_service.rb b/app/services/git/wiki_push_service.rb
index 0905b2d98df..82958abfe6e 100644
--- a/app/services/git/wiki_push_service.rb
+++ b/app/services/git/wiki_push_service.rb
@@ -8,7 +8,9 @@ module Git
     attr_reader :wiki
 
     def initialize(wiki, current_user, params)
-      @wiki, @current_user, @params = wiki, current_user, params.dup
+      @wiki = wiki
+      @current_user = current_user
+      @params = params.dup
     end
 
     def execute
diff --git a/app/services/git/wiki_push_service/change.rb b/app/services/git/wiki_push_service/change.rb
index 3d1d0fe8c4e..9109a7f9d58 100644
--- a/app/services/git/wiki_push_service/change.rb
+++ b/app/services/git/wiki_push_service/change.rb
@@ -9,7 +9,9 @@ module Git
       # @param [Hash] change - must have keys `:oldrev` and `:newrev`
       # @param [Gitlab::Git::RawDiffChange] raw_change
       def initialize(wiki, change, raw_change)
-        @wiki, @raw_change, @change = wiki, raw_change, change
+        @wiki = wiki
+        @raw_change = raw_change
+        @change = change
       end
 
       def page
diff --git a/app/services/groups/base_service.rb b/app/services/groups/base_service.rb
index d6589970951..06136aff50e 100644
--- a/app/services/groups/base_service.rb
+++ b/app/services/groups/base_service.rb
@@ -5,7 +5,9 @@ module Groups
     attr_accessor :group, :current_user, :params
 
     def initialize(group, user, params = {})
-      @group, @current_user, @params = group, user, params.dup
+      @group = group
+      @current_user = user
+      @params = params.dup
     end
 
     private
diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index da9afe86e36..9ddb8ae7695 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -3,7 +3,8 @@
 module Groups
   class CreateService < Groups::BaseService
     def initialize(user, params = {})
-      @current_user, @params = user, params.dup
+      @current_user = user
+      @params = params.dup
       @chat_team = @params.delete(:create_chat_team)
     end
 
diff --git a/app/services/groups/nested_create_service.rb b/app/services/groups/nested_create_service.rb
index a51ac9aa593..35d45aaf0cc 100644
--- a/app/services/groups/nested_create_service.rb
+++ b/app/services/groups/nested_create_service.rb
@@ -5,7 +5,8 @@ module Groups
     attr_reader :group_path, :visibility_level
 
     def initialize(user, params)
-      @current_user, @params = user, params.dup
+      @current_user = user
+      @params = params.dup
       @group_path = @params.delete(:group_path)
       @visibility_level = @params.delete(:visibility_level) ||
         Gitlab::CurrentSettings.current_application_settings.default_group_visibility
diff --git a/app/services/issuable/bulk_update_service.rb b/app/services/issuable/bulk_update_service.rb
index 13e289716ef..8bcbb92cd0e 100644
--- a/app/services/issuable/bulk_update_service.rb
+++ b/app/services/issuable/bulk_update_service.rb
@@ -7,7 +7,9 @@ module Issuable
     attr_accessor :parent, :current_user, :params
 
     def initialize(parent, user = nil, params = {})
-      @parent, @current_user, @params = parent, user, params.dup
+      @parent = parent
+      @current_user = user
+      @params = params.dup
     end
 
     def execute(type)
diff --git a/app/services/issuable_links/create_service.rb b/app/services/issuable_links/create_service.rb
index 4816be566dd..cbb81f1f521 100644
--- a/app/services/issuable_links/create_service.rb
+++ b/app/services/issuable_links/create_service.rb
@@ -7,7 +7,9 @@ module IssuableLinks
     attr_reader :issuable, :current_user, :params
 
     def initialize(issuable, user, params)
-      @issuable, @current_user, @params = issuable, user, params.dup
+      @issuable = issuable
+      @current_user = user
+      @params = params.dup
     end
 
     def execute
diff --git a/app/services/issuable_links/list_service.rb b/app/services/issuable_links/list_service.rb
index 10a2da7eb03..fe9678dcc32 100644
--- a/app/services/issuable_links/list_service.rb
+++ b/app/services/issuable_links/list_service.rb
@@ -7,7 +7,8 @@ module IssuableLinks
     attr_reader :issuable, :current_user
 
     def initialize(issuable, user)
-      @issuable, @current_user = issuable, user
+      @issuable = issuable
+      @current_user = user
     end
 
     def execute
diff --git a/app/services/jira_connect_subscriptions/base_service.rb b/app/services/jira_connect_subscriptions/base_service.rb
index 0e5bb91660e..042169acb6f 100644
--- a/app/services/jira_connect_subscriptions/base_service.rb
+++ b/app/services/jira_connect_subscriptions/base_service.rb
@@ -5,7 +5,9 @@ module JiraConnectSubscriptions
     attr_accessor :jira_connect_installation, :current_user, :params
 
     def initialize(jira_connect_installation, user = nil, params = {})
-      @jira_connect_installation, @current_user, @params = jira_connect_installation, user, params.dup
+      @jira_connect_installation = jira_connect_installation
+      @current_user = user
+      @params = params.dup
     end
   end
 end
diff --git a/app/services/keys/base_service.rb b/app/services/keys/base_service.rb
index 113e22b01ce..9b238e2f176 100644
--- a/app/services/keys/base_service.rb
+++ b/app/services/keys/base_service.rb
@@ -5,7 +5,8 @@ module Keys
     attr_accessor :user, :params
 
     def initialize(user, params = {})
-      @user, @params = user, params
+      @user = user
+      @params = params
       @ip_address = @params.delete(:ip_address)
     end
 
diff --git a/app/services/keys/create_service.rb b/app/services/keys/create_service.rb
index c256de7b35d..c1c3ef8792f 100644
--- a/app/services/keys/create_service.rb
+++ b/app/services/keys/create_service.rb
@@ -5,7 +5,8 @@ module Keys
     attr_accessor :current_user
 
     def initialize(current_user, params = {})
-      @current_user, @params = current_user, params
+      @current_user = current_user
+      @params = params
       @ip_address = @params.delete(:ip_address)
       @user = params.delete(:user) || current_user
     end
diff --git a/app/services/mattermost/create_team_service.rb b/app/services/mattermost/create_team_service.rb
index afcd6439a14..2cbcaaad5e1 100644
--- a/app/services/mattermost/create_team_service.rb
+++ b/app/services/mattermost/create_team_service.rb
@@ -3,7 +3,8 @@
 module Mattermost
   class CreateTeamService < ::BaseService
     def initialize(group, current_user)
-      @group, @current_user = group, current_user
+      @group = group
+      @current_user = current_user
     end
 
     def execute
diff --git a/app/services/metrics/dashboard/annotations/create_service.rb b/app/services/metrics/dashboard/annotations/create_service.rb
index c04f4c56b51..54f4e96378c 100644
--- a/app/services/metrics/dashboard/annotations/create_service.rb
+++ b/app/services/metrics/dashboard/annotations/create_service.rb
@@ -13,7 +13,8 @@ module Metrics
               :create
 
         def initialize(user, params)
-          @user, @params = user, params
+          @user = user
+          @params = params
         end
 
         def execute
diff --git a/app/services/metrics/dashboard/annotations/delete_service.rb b/app/services/metrics/dashboard/annotations/delete_service.rb
index c6a6c4f5fbf..3efe6924a9b 100644
--- a/app/services/metrics/dashboard/annotations/delete_service.rb
+++ b/app/services/metrics/dashboard/annotations/delete_service.rb
@@ -11,7 +11,8 @@ module Metrics
               :delete
 
         def initialize(user, annotation)
-          @user, @annotation = user, annotation
+          @user = user
+          @annotation = annotation
         end
 
         def execute
diff --git a/app/services/metrics/dashboard/grafana_metric_embed_service.rb b/app/services/metrics/dashboard/grafana_metric_embed_service.rb
index b8c5c17c738..6069d236e82 100644
--- a/app/services/metrics/dashboard/grafana_metric_embed_service.rb
+++ b/app/services/metrics/dashboard/grafana_metric_embed_service.rb
@@ -122,7 +122,8 @@ module Metrics
     # Identifies the uid of the dashboard based on url format
     class GrafanaUidParser
       def initialize(grafana_url, project)
-        @grafana_url, @project = grafana_url, project
+        @grafana_url = grafana_url
+        @project = project
       end
 
       def parse
@@ -145,7 +146,8 @@ module Metrics
     # If no panel is specified, defaults to the first valid panel.
     class DatasourceNameParser
       def initialize(grafana_url, grafana_dashboard)
-        @grafana_url, @grafana_dashboard = grafana_url, grafana_dashboard
+        @grafana_url = grafana_url
+        @grafana_dashboard = grafana_dashboard
       end
 
       def parse
diff --git a/app/services/metrics/dashboard/panel_preview_service.rb b/app/services/metrics/dashboard/panel_preview_service.rb
index 5b24d817fb6..02dd908e229 100644
--- a/app/services/metrics/dashboard/panel_preview_service.rb
+++ b/app/services/metrics/dashboard/panel_preview_service.rb
@@ -22,7 +22,9 @@ module Metrics
       ].freeze
 
       def initialize(project, panel_yaml, environment)
-        @project, @panel_yaml, @environment = project, panel_yaml, environment
+        @project = project
+        @panel_yaml = panel_yaml
+        @environment = environment
       end
 
       def execute
diff --git a/app/services/metrics/users_starred_dashboards/create_service.rb b/app/services/metrics/users_starred_dashboards/create_service.rb
index 7784ed4eb4e..9642df87861 100644
--- a/app/services/metrics/users_starred_dashboards/create_service.rb
+++ b/app/services/metrics/users_starred_dashboards/create_service.rb
@@ -11,7 +11,9 @@ module Metrics
             :create
 
       def initialize(user, project, dashboard_path)
-        @user, @project, @dashboard_path = user, project, dashboard_path
+        @user = user
+        @project = project
+        @dashboard_path = dashboard_path
       end
 
       def execute
diff --git a/app/services/metrics/users_starred_dashboards/delete_service.rb b/app/services/metrics/users_starred_dashboards/delete_service.rb
index 579715bd49f..229c0e8cfc0 100644
--- a/app/services/metrics/users_starred_dashboards/delete_service.rb
+++ b/app/services/metrics/users_starred_dashboards/delete_service.rb
@@ -5,7 +5,9 @@ module Metrics
   module UsersStarredDashboards
     class DeleteService < ::BaseService
       def initialize(user, project, dashboard_path = nil)
-        @user, @project, @dashboard_path = user, project, dashboard_path
+        @user = user
+        @project = project
+        @dashboard_path = dashboard_path
       end
 
       def execute
diff --git a/app/services/milestones/base_service.rb b/app/services/milestones/base_service.rb
index f30194c0bfe..0d7d855bf5e 100644
--- a/app/services/milestones/base_service.rb
+++ b/app/services/milestones/base_service.rb
@@ -6,7 +6,9 @@ module Milestones
     attr_accessor :parent, :current_user, :params
 
     def initialize(parent, user, params = {})
-      @parent, @current_user, @params = parent, user, params.dup
+      @parent = parent
+      @current_user = user
+      @params = params.dup
       super
     end
   end
diff --git a/app/services/milestones/find_or_create_service.rb b/app/services/milestones/find_or_create_service.rb
index 881011e5106..b467ff98f54 100644
--- a/app/services/milestones/find_or_create_service.rb
+++ b/app/services/milestones/find_or_create_service.rb
@@ -5,7 +5,9 @@ module Milestones
     attr_accessor :project, :current_user, :params
 
     def initialize(project, user, params = {})
-      @project, @current_user, @params = project, user, params.dup
+      @project = project
+      @current_user = user
+      @params = params.dup
     end
 
     def execute
diff --git a/app/services/notification_recipients/builder/request_review.rb b/app/services/notification_recipients/builder/request_review.rb
index 911d89c6a8e..8dd0c5d1587 100644
--- a/app/services/notification_recipients/builder/request_review.rb
+++ b/app/services/notification_recipients/builder/request_review.rb
@@ -6,7 +6,9 @@ module NotificationRecipients
       attr_reader :merge_request, :current_user, :reviewer
 
       def initialize(merge_request, current_user, reviewer)
-        @merge_request, @current_user, @reviewer = merge_request, current_user, reviewer
+        @merge_request = merge_request
+        @current_user = current_user
+        @reviewer = reviewer
       end
 
       def target
diff --git a/app/services/packages/composer/composer_json_service.rb b/app/services/packages/composer/composer_json_service.rb
index 98aabd84d3d..f346b654c59 100644
--- a/app/services/packages/composer/composer_json_service.rb
+++ b/app/services/packages/composer/composer_json_service.rb
@@ -6,7 +6,8 @@ module Packages
       InvalidJson = Class.new(StandardError)
 
       def initialize(project, target)
-        @project, @target = project, target
+        @project = project
+        @target = target
       end
 
       def execute
diff --git a/app/services/packages/composer/version_parser_service.rb b/app/services/packages/composer/version_parser_service.rb
index 811cac0b3b7..36275d1b680 100644
--- a/app/services/packages/composer/version_parser_service.rb
+++ b/app/services/packages/composer/version_parser_service.rb
@@ -4,7 +4,8 @@ module Packages
   module Composer
     class VersionParserService
       def initialize(tag_name: nil, branch_name: nil)
-        @tag_name, @branch_name = tag_name, branch_name
+        @tag_name = tag_name
+        @branch_name = branch_name
       end
 
       def execute
diff --git a/app/services/packages/debian/create_distribution_service.rb b/app/services/packages/debian/create_distribution_service.rb
index c6df033e3c1..f947d2e4293 100644
--- a/app/services/packages/debian/create_distribution_service.rb
+++ b/app/services/packages/debian/create_distribution_service.rb
@@ -4,7 +4,8 @@ module Packages
   module Debian
     class CreateDistributionService
       def initialize(container, user, params)
-        @container, @params = container, params
+        @container = container
+        @params = params
         @params[:creator] = user
 
         @components = params.delete(:components) || ['main']
diff --git a/app/services/packages/debian/process_changes_service.rb b/app/services/packages/debian/process_changes_service.rb
index bf42cb78d39..881ad2c46f4 100644
--- a/app/services/packages/debian/process_changes_service.rb
+++ b/app/services/packages/debian/process_changes_service.rb
@@ -10,7 +10,8 @@ module Packages
       DEFAULT_LEASE_TIMEOUT = 1.hour.to_i.freeze
 
       def initialize(package_file, creator)
-        @package_file, @creator = package_file, creator
+        @package_file = package_file
+        @creator = creator
       end
 
       def execute
diff --git a/app/services/packages/debian/update_distribution_service.rb b/app/services/packages/debian/update_distribution_service.rb
index 5bb59b854e9..95face912d5 100644
--- a/app/services/packages/debian/update_distribution_service.rb
+++ b/app/services/packages/debian/update_distribution_service.rb
@@ -4,7 +4,8 @@ module Packages
   module Debian
     class UpdateDistributionService
       def initialize(distribution, params)
-        @distribution, @params = distribution, params
+        @distribution = distribution
+        @params = params
 
         @components = params.delete(:components)
 
diff --git a/app/services/packages/maven/find_or_create_package_service.rb b/app/services/packages/maven/find_or_create_package_service.rb
index 401e52f7e51..a6cffa3038c 100644
--- a/app/services/packages/maven/find_or_create_package_service.rb
+++ b/app/services/packages/maven/find_or_create_package_service.rb
@@ -33,7 +33,8 @@ module Packages
           #
           # The first upload has to create the proper package (the one with the version set).
           if params[:file_name] == Packages::Maven::Metadata.filename && !params[:path]&.ends_with?(SNAPSHOT_TERM)
-            package_name, version = params[:path], nil
+            package_name = params[:path]
+            version = nil
           else
             package_name, _, version = params[:path].rpartition('/')
           end
diff --git a/app/services/projects/branches_by_mode_service.rb b/app/services/projects/branches_by_mode_service.rb
index fb66bfa073b..dbdcef066f4 100644
--- a/app/services/projects/branches_by_mode_service.rb
+++ b/app/services/projects/branches_by_mode_service.rb
@@ -71,7 +71,8 @@ class Projects::BranchesByModeService
     # And increase it whenever we go to the next page
     previous_offset = params[:offset].to_i
 
-    previous_path, next_path = nil, nil
+    previous_path = nil
+    next_path = nil
 
     return [branches, previous_path, next_path] if branches.blank?
 
diff --git a/app/services/projects/create_from_template_service.rb b/app/services/projects/create_from_template_service.rb
index 45b52a1861c..3c66ff709c9 100644
--- a/app/services/projects/create_from_template_service.rb
+++ b/app/services/projects/create_from_template_service.rb
@@ -7,7 +7,8 @@ module Projects
     attr_reader :template_name
 
     def initialize(user, params)
-      @current_user, @params = user, params.to_h.dup
+      @current_user = user
+      @params = params.to_h.dup
       @template_name = @params.delete(:template_name).presence
     end
 
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 6478398301d..5fb0bda912e 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -5,11 +5,12 @@ module Projects
     include ValidatesClassificationLabel
 
     def initialize(user, params)
-      @current_user, @params  = user, params.dup
-      @skip_wiki              = @params.delete(:skip_wiki)
+      @current_user = user
+      @params = params.dup
+      @skip_wiki = @params.delete(:skip_wiki)
       @initialize_with_readme = Gitlab::Utils.to_boolean(@params.delete(:initialize_with_readme))
-      @import_data            = @params.delete(:import_data)
-      @relations_block        = @params.delete(:relations_block)
+      @import_data = @params.delete(:import_data)
+      @relations_block = @params.delete(:relations_block)
     end
 
     def execute
diff --git a/app/services/projects/download_service.rb b/app/services/projects/download_service.rb
index 9810db84605..72cb3997045 100644
--- a/app/services/projects/download_service.rb
+++ b/app/services/projects/download_service.rb
@@ -7,7 +7,8 @@ module Projects
     ].freeze
 
     def initialize(project, url)
-      @project, @url = project, url
+      @project = project
+      @url = url
     end
 
     def execute
diff --git a/app/services/projects/gitlab_projects_import_service.rb b/app/services/projects/gitlab_projects_import_service.rb
index 27cce15f97d..38f0e2f7c1a 100644
--- a/app/services/projects/gitlab_projects_import_service.rb
+++ b/app/services/projects/gitlab_projects_import_service.rb
@@ -11,7 +11,9 @@ module Projects
     attr_reader :current_user, :params
 
     def initialize(user, import_params, override_params = nil)
-      @current_user, @params, @override_params = user, import_params.dup, override_params
+      @current_user = user
+      @params = import_params.dup
+      @override_params = override_params
     end
 
     def execute
diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb
index 5e092e887e1..6fa42b293c5 100644
--- a/app/services/projects/update_pages_service.rb
+++ b/app/services/projects/update_pages_service.rb
@@ -23,7 +23,8 @@ module Projects
     attr_reader :build
 
     def initialize(project, build)
-      @project, @build = project, build
+      @project = project
+      @build = build
     end
 
     def execute
diff --git a/app/services/prometheus/proxy_variable_substitution_service.rb b/app/services/prometheus/proxy_variable_substitution_service.rb
index 820b551c30a..846dfeb33ce 100644
--- a/app/services/prometheus/proxy_variable_substitution_service.rb
+++ b/app/services/prometheus/proxy_variable_substitution_service.rb
@@ -41,7 +41,8 @@ module Prometheus
     #        }
     #      })
     def initialize(environment, params = {})
-      @environment, @params = environment, params.deep_dup
+      @environment = environment
+      @params = params.deep_dup
     end
 
     # @return - params [Hash<Symbol,Any>] Returns a Hash containing a params key which is
diff --git a/app/services/releases/base_service.rb b/app/services/releases/base_service.rb
index d0e1577bd8d..de7c97b3518 100644
--- a/app/services/releases/base_service.rb
+++ b/app/services/releases/base_service.rb
@@ -8,7 +8,9 @@ module Releases
     attr_accessor :project, :current_user, :params
 
     def initialize(project, user = nil, params = {})
-      @project, @current_user, @params = project, user, params.dup
+      @project = project
+      @current_user = user
+      @params = params.dup
     end
 
     def tag_name
diff --git a/app/services/resource_events/change_labels_service.rb b/app/services/resource_events/change_labels_service.rb
index ddf3b05ac10..89eb90e9360 100644
--- a/app/services/resource_events/change_labels_service.rb
+++ b/app/services/resource_events/change_labels_service.rb
@@ -5,7 +5,8 @@ module ResourceEvents
     attr_reader :resource, :user
 
     def initialize(resource, user)
-      @resource, @user = resource, user
+      @resource = resource
+      @user = user
     end
 
     def execute(added_labels: [], removed_labels: [])
diff --git a/app/services/resource_events/change_state_service.rb b/app/services/resource_events/change_state_service.rb
index c5120ba82e1..d68b86a1513 100644
--- a/app/services/resource_events/change_state_service.rb
+++ b/app/services/resource_events/change_state_service.rb
@@ -5,7 +5,8 @@ module ResourceEvents
     attr_reader :resource, :user
 
     def initialize(user:, resource:)
-      @user, @resource = user, resource
+      @user = user
+      @resource = resource
     end
 
     def execute(params)
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb
index 9038650adb7..055034d87a1 100644
--- a/app/services/search/global_service.rb
+++ b/app/services/search/global_service.rb
@@ -9,7 +9,8 @@ module Search
     attr_accessor :current_user, :params
 
     def initialize(user, params)
-      @current_user, @params = user, params.dup
+      @current_user = user
+      @params = params.dup
     end
 
     def execute
diff --git a/app/services/search/project_service.rb b/app/services/search/project_service.rb
index e5fc5a7a438..4227dfe2fac 100644
--- a/app/services/search/project_service.rb
+++ b/app/services/search/project_service.rb
@@ -9,7 +9,9 @@ module Search
     attr_accessor :project, :current_user, :params
 
     def initialize(project, user, params)
-      @project, @current_user, @params = project, user, params.dup
+      @project = project
+      @current_user = user
+      @params = params.dup
     end
 
     def execute
diff --git a/app/services/task_list_toggle_service.rb b/app/services/task_list_toggle_service.rb
index f6602a35033..32cfa198ce8 100644
--- a/app/services/task_list_toggle_service.rb
+++ b/app/services/task_list_toggle_service.rb
@@ -9,9 +9,11 @@ class TaskListToggleService
   attr_reader :updated_markdown, :updated_markdown_html
 
   def initialize(markdown, markdown_html, line_source:, line_number:, toggle_as_checked:)
-    @markdown, @markdown_html  = markdown, markdown_html
-    @line_source, @line_number = line_source, line_number
-    @toggle_as_checked         = toggle_as_checked
+    @markdown = markdown
+    @markdown_html = markdown_html
+    @line_source = line_source
+    @line_number = line_number
+    @toggle_as_checked = toggle_as_checked
 
     @updated_markdown, @updated_markdown_html = nil
   end
diff --git a/app/services/two_factor/base_service.rb b/app/services/two_factor/base_service.rb
index 7d3f63f3442..0957d7ebabd 100644
--- a/app/services/two_factor/base_service.rb
+++ b/app/services/two_factor/base_service.rb
@@ -7,7 +7,8 @@ module TwoFactor
     attr_reader :current_user, :params, :user
 
     def initialize(current_user, params = {})
-      @current_user, @params = current_user, params
+      @current_user = current_user
+      @params = params
       @user = params.delete(:user)
     end
   end
diff --git a/app/services/upload_service.rb b/app/services/upload_service.rb
index 2bf4fcd90a0..39d1ffa4d6b 100644
--- a/app/services/upload_service.rb
+++ b/app/services/upload_service.rb
@@ -5,7 +5,10 @@ class UploadService
   attr_accessor :override_max_attachment_size
 
   def initialize(model, file, uploader_class = FileUploader, **uploader_context)
-    @model, @file, @uploader_class, @uploader_context = model, file, uploader_class, uploader_context
+    @model = model
+    @file = file
+    @uploader_class = uploader_class
+    @uploader_context = uploader_context
   end
 
   def execute
diff --git a/app/services/user_agent_detail_service.rb b/app/services/user_agent_detail_service.rb
index 5cb42e879a0..9302c86d3e6 100644
--- a/app/services/user_agent_detail_service.rb
+++ b/app/services/user_agent_detail_service.rb
@@ -4,7 +4,8 @@ class UserAgentDetailService
   attr_accessor :spammable, :request
 
   def initialize(spammable, request)
-    @spammable, @request = spammable, request
+    @spammable = spammable
+    @request = request
   end
 
   def create
diff --git a/app/services/users/respond_to_terms_service.rb b/app/services/users/respond_to_terms_service.rb
index 254480304f9..7cdfef1489b 100644
--- a/app/services/users/respond_to_terms_service.rb
+++ b/app/services/users/respond_to_terms_service.rb
@@ -3,7 +3,8 @@
 module Users
   class RespondToTermsService
     def initialize(user, term)
-      @user, @term = user, term
+      @user = user
+      @term = term
     end
 
     # rubocop: disable CodeReuse/ActiveRecord
diff --git a/app/services/users/set_status_service.rb b/app/services/users/set_status_service.rb
index a907937070f..2b4be8c833b 100644
--- a/app/services/users/set_status_service.rb
+++ b/app/services/users/set_status_service.rb
@@ -7,7 +7,8 @@ module Users
     attr_reader :current_user, :target_user, :params
 
     def initialize(current_user, params)
-      @current_user, @params = current_user, params.dup
+      @current_user = current_user
+      @params = params.dup
       @target_user = params.delete(:user) || current_user
     end
 
diff --git a/app/views/devise/mailer/_confirmation_instructions_account.text.erb b/app/views/devise/mailer/_confirmation_instructions_account.text.erb
index 5bccb68bbe2..e6da78e3a3d 100644
--- a/app/views/devise/mailer/_confirmation_instructions_account.text.erb
+++ b/app/views/devise/mailer/_confirmation_instructions_account.text.erb
@@ -1,13 +1,13 @@
 <% if @resource.unconfirmed_email.present? || !@resource.created_recently? %>
 <%= @resource.unconfirmed_email || @resource.email %>,
-Use the link below to confirm your email address.
+<%= _('Use the link below to confirm your email address.') %>
 <% else %>
   <% if Gitlab.com? %>
-Thanks for signing up to GitLab!
+<%= _('Thanks for signing up to GitLab!') %>
   <% else %>
-Welcome, <%= @resource.name %>!
+<%= _("Welcome, %{name}!") % { name: @resource.name } %>
   <% end %>
-To get started, use the link below to confirm your account.
-<% end %>  
+<%= _('To get started, use the link below to confirm your account.') %>
+<% end %>
 
 <%= confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/help/instance_configuration/_gitlab_pages.html.haml b/app/views/help/instance_configuration/_gitlab_pages.html.haml
index 94c25edaf82..55f043214f6 100644
--- a/app/views/help/instance_configuration/_gitlab_pages.html.haml
+++ b/app/views/help/instance_configuration/_gitlab_pages.html.haml
@@ -1,35 +1,35 @@
 - gitlab_pages = @instance_configuration.settings[:gitlab_pages]
 - content_for :table_content do
-  %li= link_to 'GitLab Pages', '#gitlab-pages'
+  %li= link_to _('GitLab Pages'), '#gitlab-pages'
 
 - content_for :settings_content do
   %h2#gitlab-pages
-    GitLab Pages
+    = _('GitLab Pages')
 
   %p
-    Below are the settings for
-    = succeed('.') { link_to('GitLab Pages', gitlab_pages[:url], target: '_blank') }
+    - link_to_gitlab_pages = link_to(_('GitLab Pages'), gitlab_pages[:url], target: '_blank')
+    = _('Below are the settings for %{link_to_gitlab_pages}.').html_safe % { link_to_gitlab_pages: link_to_gitlab_pages }
   .table-responsive
     %table
       %thead
         %tr
-          %th Setting
+          %th= _('Setting')
           %th= instance_configuration_host(@instance_configuration.settings[:host])
       %tbody
         %tr
-          %td Domain Name
+          %td= _('Domain Name')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:host])
         %tr
-          %td IP Address
+          %td= _('IP Address')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:ip_address])
         %tr
-          %td Port
+          %td= _('Port')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:port])
   %br
 
   %p
-    The maximum size of your Pages site is regulated by the artifacts maximum
-    size which is part of #{succeed('.') { link_to('GitLab CI', '#gitlab-ci') }}
+    - link_to_gitlab_ci = link_to(_('GitLab CI'), '#gitlab-ci')
+    = _("The maximum size of your Pages site is regulated by the artifacts maximum size which is part of %{link_to_gitlab_ci}.").html_safe % { link_to_gitlab_ci: link_to_gitlab_ci }
diff --git a/app/views/shared/_issuable_meta_data.html.haml b/app/views/shared/_issuable_meta_data.html.haml
index 4b006bddbf6..6c3e15cbace 100644
--- a/app/views/shared/_issuable_meta_data.html.haml
+++ b/app/views/shared/_issuable_meta_data.html.haml
@@ -1,6 +1,7 @@
 - note_count         = @issuable_meta_data[issuable.id].user_notes_count
 - issue_votes        = @issuable_meta_data[issuable.id]
-- upvotes, downvotes = issue_votes.upvotes, issue_votes.downvotes
+- upvotes            = issue_votes.upvotes
+- downvotes          = issue_votes.downvotes
 - issuable_path      = issuable_path(issuable, anchor: 'notes')
 - issuable_mr        = @issuable_meta_data[issuable.id].merge_requests_count
 
diff --git a/app/workers/object_storage/migrate_uploads_worker.rb b/app/workers/object_storage/migrate_uploads_worker.rb
index f489e428e8d..666bacb0188 100644
--- a/app/workers/object_storage/migrate_uploads_worker.rb
+++ b/app/workers/object_storage/migrate_uploads_worker.rb
@@ -16,7 +16,8 @@ module ObjectStorage
       attr_accessor :error
 
       def initialize(upload, error = nil)
-        @upload, @error = upload, error
+        @upload = upload
+        @error = error
       end
 
       def success?