diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-21 11:58:45 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-24 14:49:22 +0200 |
| commit | c0116926c743818b2593474946abb40b56d8fefa (patch) | |
| tree | 9c6d57d7d45f922bef051f2e46a04f1d5b9f7527 /app | |
| parent | 164a29df86f70910ac0bc6bd29f0fe6f4037b56e (diff) | |
| download | gitlab-ce-c0116926c743818b2593474946abb40b56d8fefa.tar.gz | |
Rename namespace_regex to namespace_path_regex.
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 e1de114375e..24363a853d8 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_regex, - message: Gitlab::Regex.namespace_regex_message } + format: { with: Gitlab::Regex.namespace_path_regex, + message: Gitlab::Regex.namespace_path_regex_message } delegate :name, to: :owner, allow_nil: true, prefix: true diff --git a/app/models/user.rb b/app/models/user.rb index d6b93afe739..7d7faa64f72 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_regex, - message: Gitlab::Regex.namespace_regex_message } + format: { with: Gitlab::Regex.namespace_path_regex, + message: Gitlab::Regex.namespace_path_regex_message } validates :notification_level, inclusion: { in: Notification.notification_levels }, presence: true validate :namespace_uniq, if: ->(user) { user.username_changed? } |