diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 15:07:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 15:07:29 +0000 |
| commit | 3318518149062e5d17105f2170bd7bd9647af415 (patch) | |
| tree | a2e49b8fea4543717ca006e9d06bdc032d5d4281 /app/models/application_setting.rb | |
| parent | 4e516dbff9767a35677fdc4a6e39005b4b564376 (diff) | |
| download | gitlab-ce-3318518149062e5d17105f2170bd7bd9647af415.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index c037627570a..b47e1142cca 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -297,6 +297,12 @@ class ApplicationSetting < ApplicationRecord pass: :external_auth_client_key_pass, if: -> (setting) { setting.external_auth_client_cert.present? } + validates :default_ci_config_path, + format: { without: %r{(\.{2}|\A/)}, + message: N_('cannot include leading slash or directory traversal.') }, + length: { maximum: 255 }, + allow_blank: true + attr_encrypted :asset_proxy_secret_key, mode: :per_attribute_iv, key: Settings.attr_encrypted_db_key_base_truncated, |