Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f8a2f6f1
Commit
f8a2f6f1
authored
Jul 03, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wrap additional routes by dash(-). And remove those routes from path_regex.rb.
parent
d633bf0a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
config/routes/group.rb
config/routes/group.rb
+6
-4
lib/gitlab/path_regex.rb
lib/gitlab/path_regex.rb
+0
-2
No files found.
config/routes/group.rb
View file @
f8a2f6f1
...
@@ -24,11 +24,13 @@ scope(path: 'groups/*group_id',
...
@@ -24,11 +24,13 @@ scope(path: 'groups/*group_id',
post
:toggle_subscription
,
on: :member
post
:toggle_subscription
,
on: :member
end
end
scope
path:
'-'
do
namespace
:settings
do
namespace
:settings
do
resource
:ci_cd
,
only:
[
:show
],
controller:
'ci_cd'
resource
:ci_cd
,
only:
[
:show
],
controller:
'ci_cd'
end
end
resources
:variables
,
only:
[
:index
,
:show
,
:update
,
:create
,
:destroy
]
resources
:variables
,
only:
[
:index
,
:show
,
:update
,
:create
,
:destroy
]
end
end
end
scope
(
path:
'groups/*id'
,
scope
(
path:
'groups/*id'
,
...
...
lib/gitlab/path_regex.rb
View file @
f8a2f6f1
...
@@ -129,8 +129,6 @@ module Gitlab
...
@@ -129,8 +129,6 @@ module Gitlab
pipeline_quota
pipeline_quota
projects
projects
subgroups
subgroups
settings
variables
]
.
freeze
]
.
freeze
ILLEGAL_PROJECT_PATH_WORDS
=
PROJECT_WILDCARD_ROUTES
ILLEGAL_PROJECT_PATH_WORDS
=
PROJECT_WILDCARD_ROUTES
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment