Add latest changes from gitlab-org/gitlab@master

8 files changed, 23 insertions, 23 deletions

diff --git a/app/controllers/admin/ci/variables_controller.rb b/app/controllers/admin/ci/variables_controller.rb
index c07d2c333f0..7d643435ddb 100644
--- a/app/controllers/admin/ci/variables_controller.rb
+++ b/app/controllers/admin/ci/variables_controller.rb
@@ -31,7 +31,7 @@ class Admin::Ci::VariablesController < Admin::ApplicationController
 
   def render_instance_variables
     render status: :ok,
-      json: {
+           json: {
         variables: Ci::InstanceVariableSerializer.new.represent(variables)
       }
   end
diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
index f81b02ad31f..e872a959aa3 100644
--- a/app/controllers/admin/system_info_controller.rb
+++ b/app/controllers/admin/system_info_controller.rb
@@ -52,9 +52,9 @@ class Admin::SystemInfoController < Admin::ApplicationController
         disk = Sys::Filesystem.stat(mount.mount_point)
         @disks.push({
           bytes_total: disk.bytes_total,
-          bytes_used:  disk.bytes_used,
-          disk_name:   mount.name,
-          mount_path:  disk.path
+          bytes_used: disk.bytes_used,
+          disk_name: mount.name,
+          mount_path: disk.path
         })
       rescue Sys::Filesystem::Error
       end
diff --git a/app/controllers/oauth/token_info_controller.rb b/app/controllers/oauth/token_info_controller.rb
index 789356f4410..626184150bd 100644
--- a/app/controllers/oauth/token_info_controller.rb
+++ b/app/controllers/oauth/token_info_controller.rb
@@ -9,7 +9,7 @@ class Oauth::TokenInfoController < Doorkeeper::TokenInfoController
 
       # maintain backwards compatibility
       render json: token_json.merge(
-        'scopes'             => token_json[:scope],
+        'scopes' => token_json[:scope],
         'expires_in_seconds' => token_json[:expires_in]
       ), status: :ok
     else
diff --git a/app/controllers/projects/feature_flags_controller.rb b/app/controllers/projects/feature_flags_controller.rb
index 1d1fe91ad70..16392775c09 100644
--- a/app/controllers/projects/feature_flags_controller.rb
+++ b/app/controllers/projects/feature_flags_controller.rb
@@ -111,9 +111,9 @@ class Projects::FeatureFlagsController < Projects::ApplicationController
           .permit(:name, :description, :active,
                   scopes_attributes: [:id, :environment_scope, :active, :_destroy,
                                       strategies: [:name, parameters: [:groupId, :percentage, :userIds]]],
-                 strategies_attributes: [:id, :name, :user_list_id, :_destroy,
-                                         parameters: [:groupId, :percentage, :userIds, :rollout, :stickiness],
-                                         scopes_attributes: [:id, :environment_scope, :_destroy]])
+                  strategies_attributes: [:id, :name, :user_list_id, :_destroy,
+                                          parameters: [:groupId, :percentage, :userIds, :rollout, :stickiness],
+                                          scopes_attributes: [:id, :environment_scope, :_destroy]])
   end
 
   def feature_flag_json(feature_flag)
diff --git a/app/controllers/repositories/git_http_client_controller.rb b/app/controllers/repositories/git_http_client_controller.rb
index 24520a187e3..8d7ba3e38c0 100644
--- a/app/controllers/repositories/git_http_client_controller.rb
+++ b/app/controllers/repositories/git_http_client_controller.rb
@@ -107,7 +107,7 @@ module Repositories
       render plain: "HTTP Basic: Access denied\n" \
                     "You must use a personal access token with 'read_repository' or 'write_repository' scope for Git over HTTP.\n" \
                     "You can generate one at #{profile_personal_access_tokens_url}",
-            status: :unauthorized
+             status: :unauthorized
     end
 
     def repository
diff --git a/app/controllers/repositories/lfs_api_controller.rb b/app/controllers/repositories/lfs_api_controller.rb
index 7deda473b9d..83973d07a17 100644
--- a/app/controllers/repositories/lfs_api_controller.rb
+++ b/app/controllers/repositories/lfs_api_controller.rb
@@ -173,12 +173,12 @@ module Repositories
       LfsObjectsProject.link_to_project!(lfs_object, project)
 
       Gitlab::AppJsonLogger.info(message: "LFS object auto-linked to forked project",
-        lfs_object_oid: lfs_object.oid,
-        lfs_object_size: lfs_object.size,
-        source_project_id: project.fork_source.id,
-        source_project_path: project.fork_source.full_path,
-        target_project_id: project.project_id,
-        target_project_path: project.full_path)
+                                 lfs_object_oid: lfs_object.oid,
+                                 lfs_object_size: lfs_object.size,
+                                 source_project_id: project.fork_source.id,
+                                 source_project_path: project.fork_source.full_path,
+                                 target_project_id: project.project_id,
+                                 target_project_path: project.full_path)
     end
   end
 end
diff --git a/app/controllers/repositories/lfs_locks_api_controller.rb b/app/controllers/repositories/lfs_locks_api_controller.rb
index 1d091a5bfcd..f36126d67ff 100644
--- a/app/controllers/repositories/lfs_locks_api_controller.rb
+++ b/app/controllers/repositories/lfs_locks_api_controller.rb
@@ -38,8 +38,8 @@ module Repositories
 
     def render_json(data, process = true)
       render json: build_payload(data, process),
-            content_type: LfsRequest::CONTENT_TYPE,
-            status: @result[:http_status]
+             content_type: LfsRequest::CONTENT_TYPE,
+             status: @result[:http_status]
     end
 
     def build_payload(data, process)
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 97bbb96eae6..09419a4589d 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -7,13 +7,13 @@ class UploadsController < ApplicationController
   UnknownUploadModelError = Class.new(StandardError)
 
   MODEL_CLASSES = {
-    "user"             => User,
-    "project"          => Project,
-    "note"             => Note,
-    "group"            => Group,
-    "appearance"       => Appearance,
+    "user" => User,
+    "project" => Project,
+    "note" => Note,
+    "group" => Group,
+    "appearance" => Appearance,
     "personal_snippet" => PersonalSnippet,
-    "projects/topic"   => Projects::Topic,
+    "projects/topic" => Projects::Topic,
     'alert_management_metric_image' => ::AlertManagement::MetricImage,
     nil => PersonalSnippet
   }.freeze