diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-02-16 13:10:32 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-02-16 13:10:32 +1100 |
| commit | 8a928af0fc54a84c5b858955e7459512155d4af0 (patch) | |
| tree | 4c55ff6c1cd20405e9adf5973e2ce1c229fcebde /app/models/user.rb | |
| parent | 3f713db0da2602152aa482b57f84b7418fd20a93 (diff) | |
| parent | b05e75b8faccc50749adc63419074c91802a8f50 (diff) | |
| download | gitlab-ce-task_list_refactor.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactor
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 1649bf04eaa..ad997ce2b13 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -335,7 +335,7 @@ class User < ActiveRecord::Base def reference_pattern %r{ #{Regexp.escape(reference_prefix)} - (?<user>#{Gitlab::Regex::NAMESPACE_REGEX_STR}) + (?<user>#{Gitlab::Regex::NAMESPACE_REF_REGEX_STR}) }x end end |