summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-04-04 12:13:04 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-04-04 12:13:04 +0000
commit2fdc7c1fd6884cf120bf82cb870f66d1bf73811a (patch)
tree20f189b945e7660d69044f664cd582f57825d976 /spec
parent7af1ba122fb425214d6b7c9e51ea621a515d6ac0 (diff)
parent9f3f45bfb0fe0597822d1200cd89f6a4cff4cc94 (diff)
downloadgitlab-ce-2fdc7c1fd6884cf120bf82cb870f66d1bf73811a.tar.gz
Merge branch 'dz-reserve-v2-root-path' into 'master'
Add v2 to reserved top level routes See merge request gitlab-org/gitlab-ce!26540
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/path_regex_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index 312e5e55af8..71e69a0d418 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -100,7 +100,7 @@ describe Gitlab::PathRegex do
end
let(:ee_top_level_words) do
- ['unsubscribes']
+ %w(unsubscribes v2)
end
let(:files_in_public) do