diff options
author | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 13:02:56 +0000 |
---|---|---|
committer | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 13:02:56 +0000 |
commit | 46b1b9c1d61c269588bd3cd4203420608ddd7f0b (patch) | |
tree | a877f5366d3367e1264e96f3f5e8a4b23bdbd62a /app/models/application_setting.rb | |
parent | 7a48a06cf3b454021aa466464686fee8c82d6862 (diff) | |
download | gitlab-ce-46b1b9c1d61c269588bd3cd4203420608ddd7f0b.tar.gz |
Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r-- | app/models/application_setting.rb | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index d28a12413bf..7ec8505b33a 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -213,40 +213,6 @@ class ApplicationSetting < ApplicationRecord validate :terms_exist, if: :enforce_terms? - validates :external_authorization_service_default_label, - presence: true, - if: :external_authorization_service_enabled - - validates :external_authorization_service_url, - url: true, allow_blank: true, - if: :external_authorization_service_enabled - - validates :external_authorization_service_timeout, - numericality: { greater_than: 0, less_than_or_equal_to: 10 }, - if: :external_authorization_service_enabled - - validates :external_auth_client_key, - presence: true, - if: -> (setting) { setting.external_auth_client_cert.present? } - - validates_with X509CertificateCredentialsValidator, - certificate: :external_auth_client_cert, - pkey: :external_auth_client_key, - pass: :external_auth_client_key_pass, - if: -> (setting) { setting.external_auth_client_cert.present? } - - attr_encrypted :external_auth_client_key, - mode: :per_attribute_iv, - key: Settings.attr_encrypted_db_key_base_truncated, - algorithm: 'aes-256-gcm', - encode: true - - attr_encrypted :external_auth_client_key_pass, - mode: :per_attribute_iv, - key: Settings.attr_encrypted_db_key_base_truncated, - algorithm: 'aes-256-gcm', - encode: true - before_validation :ensure_uuid! before_validation :strip_sentry_values |