diff options
| author | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 16:02:56 +0300 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 16:02:56 +0300 |
| commit | 46b1b9c1d61c269588bd3cd4203420608ddd7f0b (patch) | |
| tree | a877f5366d3367e1264e96f3f5e8a4b23bdbd62a /app/controllers | |
| parent | 7a48a06cf3b454021aa466464686fee8c82d6862 (diff) | |
Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/concerns/project_unauthorized.rb | 19 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 |
3 files changed, 5 insertions, 19 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index b681949ab36..ab792cf7403 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -124,9 +124,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end def visible_application_setting_attributes - [ - *::ApplicationSettingsHelper.visible_attributes, - *::ApplicationSettingsHelper.external_authorization_service_attributes, + ApplicationSettingsHelper.visible_attributes + [ :domain_blacklist_file, disabled_oauth_sign_in_sources: [], import_sources: [], 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 diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b7beac00eda..f76e6663995 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -343,7 +343,6 @@ class ProjectsController < Projects::ApplicationController :container_registry_enabled, :default_branch, :description, - :external_authorization_classification_label, :import_url, :issues_tracker, :issues_tracker_id, |