Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-02-01 21:21:28 +0300
committerRobert Speicher <rspeicher@gmail.com>2017-02-10 19:51:14 +0300
commit191bcb4d1b5e983583e183d8945f638604c7f0e1 (patch)
tree98aa8d8ea8b6d8eb56158cde0127cbea630c610c /app/controllers/projects/uploads_controller.rb
parent4a9258371bf25ef0ce8687c3d7750d06b4337fe4 (diff)
Don't perform Devise trackable updates on blocked User records
Diffstat (limited to 'app/controllers/projects/uploads_controller.rb')
-rw-r--r--app/controllers/projects/uploads_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
index 50ba33ed570..61686499bd3 100644
--- a/app/controllers/projects/uploads_controller.rb
+++ b/app/controllers/projects/uploads_controller.rb
@@ -1,6 +1,6 @@
class Projects::UploadsController < Projects::ApplicationController
- skip_before_action :reject_blocked!, :project,
- :repository, if: -> { action_name == 'show' && image_or_video? }
+ skip_before_action :project, :repository,
+ if: -> { action_name == 'show' && image_or_video? }
before_action :authorize_upload_file!, only: [:create]