diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-03-22 00:09:20 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-03-22 00:09:20 +0100 |
| commit | 31266c5be4748f57a7d56bbcc6f06d570cbf5356 (patch) | |
| tree | 1ee744a7303335cf1a270d92ec6b9e955a52cace /app/controllers | |
| parent | ae7b2ef62cdf61c990f914d776a6fdfc2bc49fa2 (diff) | |
| download | gitlab-ce-31266c5be4748f57a7d56bbcc6f06d570cbf5356.tar.gz | |
Address feedback
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/projects/uploads_controller.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 9c8433c260b..657ee94cfd7 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -1,6 +1,7 @@ class Projects::ApplicationController < ApplicationController skip_before_action :authenticate_user! - before_action :project, :repository + before_action :project + before_action :repository layout 'project' helper_method :repository, :can_collaborate_with_project? diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb index 94c51eeb94d..caed064dfbc 100644 --- a/app/controllers/projects/uploads_controller.rb +++ b/app/controllers/projects/uploads_controller.rb @@ -2,7 +2,7 @@ class Projects::UploadsController < Projects::ApplicationController skip_before_action :reject_blocked!, :project, :repository, if: -> { action_name == 'show' && image? } - before_action :authenticate_user!, only: [:create] + before_action :authorize_upload_file!, only: [:create] def create link_to_file = ::Projects::UploadService.new(project, params[:file]). |