diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-16 14:03:37 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-20 15:39:37 +0200 |
| commit | 5a4ebfb47af40de6cfe29fe59dae82f8c244e5e3 (patch) | |
| tree | f87ac47a9d14849659a8a40a53576080593b0670 /app/controllers/projects/uploads_controller.rb | |
| parent | 76aade28e25d1f6e8924b35ed9bd365c8889987f (diff) | |
| download | gitlab-ce-5a4ebfb47af40de6cfe29fe59dae82f8c244e5e3.tar.gz | |
Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'app/controllers/projects/uploads_controller.rb')
| -rw-r--r-- | app/controllers/projects/uploads_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb index 276dced8656..6153ca2dc1b 100644 --- a/app/controllers/projects/uploads_controller.rb +++ b/app/controllers/projects/uploads_controller.rb @@ -1,11 +1,11 @@ class Projects::UploadsController < Projects::ApplicationController layout 'project' - # We want to skip these filters for only the `show` action if `image?` is true, + # We want to skip these filters for only the `show` action if `image?` is true, # but `skip_before_filter` doesn't work with both `only` and `if`, so we accomplish the same like this. skipped_filters = [:authenticate_user!, :reject_blocked!, :project, :repository] - skip_before_filter *skipped_filters, only: [:show] - before_filter *skipped_filters, only: [:show], unless: :image? + skip_before_action *skipped_filters, only: [:show] + before_action *skipped_filters, only: [:show], unless: :image? def create link_to_file = ::Projects::UploadService.new(project, params[:file]). @@ -40,7 +40,7 @@ class Projects::UploadsController < Projects::ApplicationController file_project = Project.find_with_namespace("#{namespace}/#{id}") if file_project.nil? - @uploader = nil + @uploader = nil return end |