From 218eae87754711b9e89a98301ae04ca293fdf934 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 24 May 2017 15:08:05 +0000 Subject: Merge branch 'dm-fix-routes' into 'master' Fix ambiguous routing issues by teaching router about reserved words See merge request !11570 --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') 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 } -- cgit v1.2.3