summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorAndreas Brandl <abrandl@gitlab.com>2019-04-05 13:02:56 +0000
committerAndreas Brandl <abrandl@gitlab.com>2019-04-05 13:02:56 +0000
commit46b1b9c1d61c269588bd3cd4203420608ddd7f0b (patch)
treea877f5366d3367e1264e96f3f5e8a4b23bdbd62a /app/controllers/concerns
parent7a48a06cf3b454021aa466464686fee8c82d6862 (diff)
downloadgitlab-ce-46b1b9c1d61c269588bd3cd4203420608ddd7f0b.tar.gz
Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/project_unauthorized.rb19
1 files changed, 4 insertions, 15 deletions
diff --git a/app/controllers/concerns/project_unauthorized.rb b/app/controllers/concerns/project_unauthorized.rb
index d42363b8b17..f59440dbc59 100644
--- a/app/controllers/concerns/project_unauthorized.rb
+++ b/app/controllers/concerns/project_unauthorized.rb
@@ -1,21 +1,10 @@
# frozen_string_literal: true
module ProjectUnauthorized
- def project_unauthorized_proc
- lambda do |project|
- if project
- label = project.external_authorization_classification_label
- rejection_reason = nil
-
- unless ::Gitlab::ExternalAuthorization.access_allowed?(current_user, label)
- rejection_reason = ::Gitlab::ExternalAuthorization.rejection_reason(current_user, label)
- rejection_reason ||= _('External authorization denied access to this project')
- end
+ extend ActiveSupport::Concern
- if rejection_reason
- access_denied!(rejection_reason)
- end
- end
- end
+ # EE would override this
+ def project_unauthorized_proc
+ # no-op
end
end