diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-04-24 16:26:32 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-04-24 16:26:32 +0000 |
| commit | ea9089647ce789f36ecb2b1a0de1ce028ccf6ff0 (patch) | |
| tree | 0aaec6fbf5474e2d99059a3ea7e4d3d73b395863 | |
| parent | 54d7962fb434538eba6fee243cadec375a4893c7 (diff) | |
| parent | 10053b173d6e26eaa603475b2bdfde2e3c407eba (diff) | |
| download | gitlab-ce-ea9089647ce789f36ecb2b1a0de1ce028ccf6ff0.tar.gz | |
Merge branch 'rs-simplify-uploads-controller' into 'master'
Simplify the `skip_before_action` logic for UploadsController
See merge request !547
| -rw-r--r-- | app/controllers/projects/uploads_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb index 6153ca2dc1b..e2d0b0d9459 100644 --- a/app/controllers/projects/uploads_controller.rb +++ b/app/controllers/projects/uploads_controller.rb @@ -1,11 +1,8 @@ class Projects::UploadsController < Projects::ApplicationController layout 'project' - # 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_action *skipped_filters, only: [:show] - before_action *skipped_filters, only: [:show], unless: :image? + skip_before_action :authenticate_user!, :reject_blocked!, :project, + :repository, if: -> { action_name == 'show' && image? } def create link_to_file = ::Projects::UploadService.new(project, params[:file]). |