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
f2d8c2fa
Commit
f2d8c2fa
authored
Oct 06, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-add EE-specific routes lost in the splitting of config/routes.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
3e254b80
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
110 additions
and
1 deletion
+110
-1
config/routes/admin.rb
config/routes/admin.rb
+22
-0
config/routes/group.rb
config/routes/group.rb
+31
-0
config/routes/project.rb
config/routes/project.rb
+48
-1
config/routes/user.rb
config/routes/user.rb
+9
-0
No files found.
config/routes/admin.rb
View file @
f2d8c2fa
...
...
@@ -51,6 +51,11 @@ namespace :admin do
resource
:logs
,
only:
[
:show
]
resource
:health_check
,
controller:
'health_check'
,
only:
[
:show
]
resource
:background_jobs
,
controller:
'background_jobs'
,
only:
[
:show
]
## EE-specific
resource
:email
,
only:
[
:show
,
:create
]
## EE-specific
resource
:system_info
,
controller:
'system_info'
,
only:
[
:show
]
resources
:requests_profiles
,
only:
[
:index
,
:show
],
param: :name
,
constraints:
{
name:
/.+\.html/
}
...
...
@@ -82,11 +87,28 @@ namespace :admin do
resource
:application_settings
,
only:
[
:show
,
:update
]
do
resources
:services
,
only:
[
:index
,
:edit
,
:update
]
## EE-specific
get
:usage_data
## EE-specific
put
:reset_runners_token
put
:reset_health_check_token
put
:clear_repository_check_states
end
## EE-specific
resource
:license
,
only:
[
:show
,
:new
,
:create
,
:destroy
]
do
get
:download
,
on: :member
end
resources
:geo_nodes
,
only:
[
:index
,
:create
,
:destroy
]
do
member
do
post
:repair
end
end
## EE-specific
resources
:labels
resources
:runners
,
only:
[
:index
,
:show
,
:update
,
:destroy
]
do
...
...
config/routes/group.rb
View file @
f2d8c2fa
...
...
@@ -6,7 +6,25 @@ resources :groups, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
get
:activity
end
## EE-specific
collection
do
get
:autocomplete
end
## EE-specific
scope
module: :groups
do
## EE-specific
resource
:analytics
,
only:
[
:show
]
resource
:ldap
,
only:
[]
do
member
do
put
:sync
end
end
resources
:ldap_group_links
,
only:
[
:index
,
:create
,
:destroy
]
## EE-specific
resources
:group_members
,
only:
[
:index
,
:create
,
:update
,
:destroy
],
concerns: :access_requestable
do
post
:resend_invite
,
on: :member
delete
:leave
,
on: :collection
...
...
@@ -14,5 +32,18 @@ resources :groups, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
resource
:avatar
,
only:
[
:destroy
]
resources
:milestones
,
constraints:
{
id:
/[^\/]+/
},
only:
[
:index
,
:show
,
:update
,
:new
,
:create
]
## EE-specific
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
end
end
## EE-specific
end
config/routes/project.rb
View file @
f2d8c2fa
...
...
@@ -178,6 +178,12 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
end
end
## EE-specific
resource
:pages
,
only:
[
:show
,
:destroy
]
do
resources
:domains
,
only:
[
:show
,
:new
,
:create
,
:destroy
],
controller:
'pages_domains'
end
## EE-specific
resources
:compare
,
only:
[
:index
,
:create
]
do
collection
do
get
:diff_for_path
...
...
@@ -274,6 +280,12 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
post
:cancel_merge_when_build_succeeds
get
:ci_status
post
:toggle_subscription
## EE-specific
post
:approve
post
:rebase
## EE-specific
post
:remove_wip
get
:diff_for_path
post
:resolve_conflicts
...
...
@@ -287,6 +299,10 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
post
:bulk_update
end
## EE-specific
resources
:approvers
,
only: :destroy
## EE-specific
resources
:discussions
,
only:
[],
constraints:
{
id:
/\h{40}/
}
do
member
do
post
:resolve
...
...
@@ -300,10 +316,33 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
resource
:release
,
only:
[
:edit
,
:update
]
end
resources
:protected_branches
,
only:
[
:index
,
:show
,
:create
,
:update
,
:destroy
],
constraints:
{
id:
Gitlab
::
Regex
.
git_reference_regex
}
## EE-specific
resources
:path_locks
,
only:
[
:index
,
:destroy
]
do
collection
do
post
:toggle
end
end
resources
:protected_branches
,
only:
[
:index
,
:show
,
:create
,
:update
,
:destroy
,
:patch
],
constraints:
{
id:
Gitlab
::
Regex
.
git_reference_regex
}
do
scope
module: :protected_branches
do
resources
:merge_access_levels
,
only:
[
:destroy
]
resources
:push_access_levels
,
only:
[
:destroy
]
end
end
## EE-specific
resources
:variables
,
only:
[
:index
,
:show
,
:update
,
:create
,
:destroy
]
resources
:triggers
,
only:
[
:index
,
:create
,
:destroy
]
## EE-specific
resource
:mirror
,
only:
[
:show
,
:update
]
do
member
do
post
:update_now
end
end
resources
:push_rules
,
constraints:
{
id:
/\d+/
}
## EE-specific
resources
:pipelines
,
only:
[
:index
,
:new
,
:create
,
:show
]
do
collection
do
resource
:pipelines_settings
,
path:
'settings'
,
only:
[
:show
,
:update
]
...
...
@@ -448,6 +487,10 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
end
end
## EE-specific
resources
:approvers
,
only: :destroy
## EE-specific
resources
:runner_projects
,
only:
[
:create
,
:destroy
]
resources
:badges
,
only:
[
:index
]
do
collection
do
...
...
@@ -459,6 +502,10 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
end
end
end
## EE-specific
resources
:audit_events
,
only:
[
:index
]
## EE-specific
end
end
end
config/routes/user.rb
View file @
f2d8c2fa
...
...
@@ -11,6 +11,11 @@ scope(path: 'u/:username',
get
'/'
,
action: :show
end
## EE-specific
get
'unsubscribes/:email'
,
to:
'unsubscribes#show'
,
as: :unsubscribe
post
'unsubscribes/:email'
,
to:
'unsubscribes#create'
## EE-specific
devise_for
:users
,
controllers:
{
omniauth_callbacks: :omniauth_callbacks
,
registrations: :registrations
,
passwords: :passwords
,
...
...
@@ -20,4 +25,8 @@ devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks,
devise_scope
:user
do
get
'/users/auth/:provider/omniauth_error'
=>
'omniauth_callbacks#omniauth_error'
,
as: :omniauth_error
get
'/users/almost_there'
=>
'confirmations#almost_there'
## EE-specific
get
'/users/auth/kerberos_spnego/negotiate'
=>
'omniauth_kerberos_spnego#negotiate'
## EE-specific
end
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