diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-17 12:49:20 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-17 12:49:20 +0200 |
| commit | 779f05ef0e0109e3d47ac7a156132a38961e6ef6 (patch) | |
| tree | 8b4250d033d81ce75d95f174f1574e39a3e7e559 | |
| parent | 3adbb8b10de29956171def2304f7a0debe85fd79 (diff) | |
| download | gitlab-ce-haynes/gitlab-ce-remove_access_control_for_images.tar.gz | |
Explain skip_before_filter workaround.haynes/gitlab-ce-remove_access_control_for_images
| -rw-r--r-- | app/controllers/projects/uploads_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb index c43d82f1288..276dced8656 100644 --- a/app/controllers/projects/uploads_controller.rb +++ b/app/controllers/projects/uploads_controller.rb @@ -1,8 +1,11 @@ class Projects::UploadsController < Projects::ApplicationController layout 'project' - skip_before_filter :authenticate_user!, :reject_blocked!, :project, :repository, only: [:show] - before_filter :authenticate_user!, :reject_blocked!, :project, :repository, only: [:show], unless: :image? + # 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? def create link_to_file = ::Projects::UploadService.new(project, params[:file]). |