home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs-simplify-uploads-controller' into 'master'

Browse Source 
Simplify the `skip_before_action` logic for UploadsController

See merge request !547
This commit is contained in:
Robert Speicher
2015-04-24 16:26:32 +00:00
parent 54d7962fb4 10053b173d
commit ea9089647c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/projects/uploads_controller.rb
+2 -5
View File
@@ -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]).