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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
327f7ae8
Commit
327f7ae8
authored
Nov 09, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group hooks routing after merge conflicts
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
dbaeb025
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
config/routes/group.rb
config/routes/group.rb
+6
-6
No files found.
config/routes/group.rb
View file @
327f7ae8
...
...
@@ -47,15 +47,15 @@ scope(path: 'groups/:group_id', module: :groups, as: :group) do
resource
:notification_setting
,
only:
[
:update
]
resources
:audit_events
,
only:
[
:index
]
## EE-specific
end
## EE-specific
resources
:hooks
,
only:
[
:index
,
:create
,
:destroy
],
constraints:
{
id:
/\d+/
},
module: :groups
do
member
do
get
:test
## EE-specific
resources
:hooks
,
only:
[
:index
,
:create
,
:destroy
],
constraints:
{
id:
/\d+/
}
do
member
do
get
:test
end
end
## EE-specific
end
## EE-specific
# Must be last route in this file
get
'groups/:id'
=>
'groups#show'
,
as: :group_canonical
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