diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 17:33:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 17:33:30 +0000 |
| commit | 5049b3cd2362d119d0f6147bb45b449609b07cb4 (patch) | |
| tree | 69c89f0b19c09d3600ab3772be20209d4d702d36 /app/controllers | |
| parent | d5cc1255b64367c04f208150dbafa0be7b50dc45 (diff) | |
| download | gitlab-ce-5049b3cd2362d119d0f6147bb45b449609b07cb4.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/enforces_two_factor_authentication.rb | 2 | ||||
| -rw-r--r-- | app/controllers/uploads_controller.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/enforces_two_factor_authentication.rb b/app/controllers/concerns/enforces_two_factor_authentication.rb index 02082f81598..bf38e4ad117 100644 --- a/app/controllers/concerns/enforces_two_factor_authentication.rb +++ b/app/controllers/concerns/enforces_two_factor_authentication.rb @@ -11,7 +11,7 @@ module EnforcesTwoFactorAuthentication extend ActiveSupport::Concern included do - before_action :check_two_factor_requirement + before_action :check_two_factor_requirement, except: [:route_not_found] # to include this in controllers inheriting from `ActionController::Metal` # we need to add this block diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 0b092d2622b..9510734bc9b 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -19,6 +19,7 @@ class UploadsController < ApplicationController rescue_from UnknownUploadModelError, with: :render_404 skip_before_action :authenticate_user! + skip_before_action :check_two_factor_requirement, only: [:show] before_action :upload_mount_satisfied? before_action :authorize_access!, only: [:show] before_action :authorize_create_access!, only: [:create, :authorize] |