diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-24 15:16:38 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-24 15:16:38 +0200 |
| commit | 5f839770e720dc2f176c51d4635dceb6c34ff97a (patch) | |
| tree | 396578cfe0a4ddb7df0adf176bfce3a6e2bf2905 /app | |
| parent | 70f9893ed697873e4c95de4f3ddb3ff8c4fb82f6 (diff) | |
| download | gitlab-ce-5f839770e720dc2f176c51d4635dceb6c34ff97a.tar.gz | |
Revert "Rename namespace_regex to namespace_path_regex."
This reverts commit c0116926c743818b2593474946abb40b56d8fefa.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/namespace.rb | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index f51a14a9514..211dfa76b81 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -33,8 +33,8 @@ class Namespace < ActiveRecord::Base presence: true, length: { within: 1..255 }, exclusion: { in: Gitlab::Blacklist.path }, - format: { with: Gitlab::Regex.namespace_path_regex, - message: Gitlab::Regex.namespace_path_regex_message } + format: { with: Gitlab::Regex.namespace_regex, + message: Gitlab::Regex.namespace_regex_message } delegate :name, to: :owner, allow_nil: true, prefix: true diff --git a/app/models/user.rb b/app/models/user.rb index 7d7faa64f72..d6b93afe739 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -131,8 +131,8 @@ class User < ActiveRecord::Base presence: true, uniqueness: { case_sensitive: false }, exclusion: { in: Gitlab::Blacklist.path }, - format: { with: Gitlab::Regex.namespace_path_regex, - message: Gitlab::Regex.namespace_path_regex_message } + format: { with: Gitlab::Regex.namespace_regex, + message: Gitlab::Regex.namespace_regex_message } validates :notification_level, inclusion: { in: Notification.notification_levels }, presence: true validate :namespace_uniq, if: ->(user) { user.username_changed? } |