summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-28 18:06:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-28 18:06:11 +0000
commit4f05a630951858cc2b7dafada27f3dcf87ba29bd (patch)
tree1b87468300c53594465ca10f89e082651a08707c /app/controllers
parent7cdd70dcec27402e89e65451b4b1feb75b5eb267 (diff)
downloadgitlab-ce-4f05a630951858cc2b7dafada27f3dcf87ba29bd.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/uploads_controller.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 635db386792..67d33648470 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -20,7 +20,6 @@ class UploadsController < ApplicationController
skip_before_action :authenticate_user!
before_action :upload_mount_satisfied?
- before_action :find_model
before_action :authorize_access!, only: [:show]
before_action :authorize_create_access!, only: [:create, :authorize]
before_action :verify_workhorse_api!, only: [:authorize]