summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-07-07 12:42:02 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-07-07 12:42:02 +0000
commitc0e18e865778a4886eb9aada33c7e6bdd80ee099 (patch)
treebbdc876abef8bab95a910175a8cd2d231e1ddd9b /lib
parent5c0d8d59ff676373659e4215067f3640604576e0 (diff)
parent3b2f09289f64850586af2b2db54466fe230c907c (diff)
downloadgitlab-ce-c0e18e865778a4886eb9aada33c7e6bdd80ee099.tar.gz
Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'
Add Group secret variables Closes #12729 See merge request !12582
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/path_regex.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index 10eb99fb461..d81f825ef96 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -112,6 +112,7 @@ module Gitlab
# this group would not be accessible through `/groups/parent/activity` since
# this would map to the activity-page of its parent.
GROUP_ROUTES = %w[
+ -
activity
analytics
audit_events