diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-24 18:08:05 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-25 08:04:04 +0300 |
| commit | 218eae87754711b9e89a98301ae04ca293fdf934 (patch) | |
| tree | 97c4e9216e9390e468e2ee152facc00a31e99e41 /app/models | |
| parent | a17b740a0b3e6c1570b1d2147074c2acbf2f2c1c (diff) | |
Merge branch 'dm-fix-routes' into 'master'
Fix ambiguous routing issues by teaching router about reserved words
See merge request !11570
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index a0413b4e651..7722db5375b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -204,7 +204,7 @@ class Project < ActiveRecord::Base presence: true, dynamic_path: true, length: { maximum: 255 }, - format: { with: Gitlab::Regex.project_path_regex, + format: { with: Gitlab::Regex.project_path_format_regex, message: Gitlab::Regex.project_path_regex_message }, uniqueness: { scope: :namespace_id } |