Merge pull request #7204 from cirosantilli/user-validation-msg

Fix username validation message to match regexp.

1 files changed, 23 insertions, 0 deletions

diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index e932b64f4f0..153613760fe 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -6,18 +6,35 @@ module Gitlab
       default_regex
     end
 
+    def username_regex_message
+      default_regex_message
+    end
+
     def project_name_regex
       /\A[a-zA-Z0-9_][a-zA-Z0-9_\-\. ]*\z/
     end
 
+    def project_regex_message
+      "can contain only letters, digits, '_', '-' and '.' and space. " \
+      "It must start with letter, digit or '_'."
+    end
+
     def name_regex
       /\A[a-zA-Z0-9_\-\. ]*\z/
     end
 
+    def name_regex_message
+      "can contain only letters, digits, '_', '-' and '.' and space."
+    end
+
     def path_regex
       default_regex
     end
 
+    def path_regex_message
+      default_regex_message
+    end
+
     def archive_formats_regex
       #|zip|tar|    tar.gz    |         tar.bz2         |
       /(zip|tar|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/
@@ -48,6 +65,12 @@ module Gitlab
 
     protected
 
+    def default_regex_message
+      "can contain only letters, digits, '_', '-' and '.'. " \
+      "It must start with letter, digit or '_', optionally preceeded by '.'. " \
+      "It must not end in '.git'."
+    end
+
     def default_regex
       /\A[.?]?[a-zA-Z0-9_][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
     end