summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-10-27 16:47:08 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2017-11-07 19:52:10 +0100
commite070e216c80efb897eb6c5a7d13872e4762205c1 (patch)
tree7f86e1ae9450e0983a81440d28b38b296bf903e8
parent58d1d6a5c7e0a45c9aa8a9d4d1be24dbdce5a08a (diff)
downloadgitlab-ce-e070e216c80efb897eb6c5a7d13872e4762205c1.tar.gz
Update failure message when finding new routes in `PathRegex`
-rw-r--r--spec/lib/gitlab/path_regex_spec.rb13
1 files changed, 4 insertions, 9 deletions
diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index 98fcc84c416..751cde79a94 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -45,21 +45,16 @@ describe Gitlab::PathRegex do
Found new routes that could cause conflicts with existing namespaced routes
for groups or projects.
- Add <#{missing_words.join(', ')}> to `Gitlab::PathRegex::#{constant_name}
- to make sure no projects or namespaces can be created with those paths.
-
- To rename any existing records with those paths you can use the
- `Gitlab::Database::RenameReservedpathsMigration::<VERSION>.#{migration_helper}`
- migration helper.
-
- Make sure to make a note of the renamed records in the release blog post.
+ Nest <#{missing_words.join(', ')}> in a route containing `-`, that way
+ we know there will be no conflicts with groups or projects created with those
+ paths.
MISSING
end
if additional_words.any?
message += <<-ADDITIONAL
- Why are <#{additional_words.join(', ')}> in `#{constant_name}`?
+ Is <#{additional_words.join(', ')}> in `#{constant_name}` required?
If they are really required, update these specs to reflect that.
ADDITIONAL