diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-29 09:30:00 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-29 09:30:00 +0000 |
| commit | 4754123e2e5f8260debc3de0ed2f2b1248360504 (patch) | |
| tree | b456ad47d12521cfb57bd32c0949550aef46172a | |
| parent | dbfcccaf7754d4501dc253b4409fc9f026248e67 (diff) | |
| parent | d75a8297b82117389bee4d075b1b17747570368d (diff) | |
| download | gitlab-ce-4754123e2e5f8260debc3de0ed2f2b1248360504.tar.gz | |
Merge branch 'rs-blacklist-well-known' into 'master'
Add '.well-known' to the list of reserved namespaces
See https://gitlab.com/gitlab-org/gitlab-ce/issues/22759
See merge request !6585
| -rw-r--r-- | app/validators/namespace_validator.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/validators/namespace_validator.rb b/app/validators/namespace_validator.rb index 7a35958cc5f..4dc3b2ab9a0 100644 --- a/app/validators/namespace_validator.rb +++ b/app/validators/namespace_validator.rb @@ -5,7 +5,8 @@ # Values are checked for formatting and exclusion from a list of reserved path # names. class NamespaceValidator < ActiveModel::EachValidator - RESERVED = %w( + RESERVED = %w[ + .well-known admin all assets @@ -31,7 +32,7 @@ class NamespaceValidator < ActiveModel::EachValidator u unsubscribes users - ).freeze + ].freeze def validate_each(record, attribute, value) unless value =~ Gitlab::Regex.namespace_regex |