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
34a1e963
Commit
34a1e963
authored
May 04, 2016
by
Josef Strzibny
Committed by
Rémy Coutable
Jul 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up unused routes
parent
e9946f19
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
31 deletions
+12
-31
config/routes.rb
config/routes.rb
+12
-14
spec/routing/admin_routing_spec.rb
spec/routing/admin_routing_spec.rb
+0
-5
spec/routing/project_routing_spec.rb
spec/routing/project_routing_spec.rb
+0
-4
spec/routing/routing_spec.rb
spec/routing/routing_spec.rb
+0
-8
No files found.
config/routes.rb
View file @
34a1e963
...
@@ -42,10 +42,9 @@ Rails.application.routes.draw do
...
@@ -42,10 +42,9 @@ Rails.application.routes.draw do
resource
:lint
,
only:
[
:show
,
:create
]
resource
:lint
,
only:
[
:show
,
:create
]
resources
:projects
do
resources
:projects
,
only:
[
:index
,
:show
]
do
member
do
member
do
get
:status
,
to:
'projects#badge'
get
:status
,
to:
'projects#badge'
get
:integration
end
end
end
end
...
@@ -137,20 +136,20 @@ Rails.application.routes.draw do
...
@@ -137,20 +136,20 @@ Rails.application.routes.draw do
# Import
# Import
#
#
namespace
:import
do
namespace
:import
do
resource
:github
,
only:
[
:create
,
:new
],
controller: :github
do
resource
:github
,
only:
[
:create
],
controller: :github
do
post
:personal_access_token
post
:personal_access_token
get
:status
get
:status
get
:callback
get
:callback
get
:jobs
get
:jobs
end
end
resource
:gitlab
,
only:
[
:create
,
:new
],
controller: :gitlab
do
resource
:gitlab
,
only:
[
:create
],
controller: :gitlab
do
get
:status
get
:status
get
:callback
get
:callback
get
:jobs
get
:jobs
end
end
resource
:bitbucket
,
only:
[
:create
,
:new
],
controller: :bitbucket
do
resource
:bitbucket
,
only:
[
:create
],
controller: :bitbucket
do
get
:status
get
:status
get
:callback
get
:callback
get
:jobs
get
:jobs
...
@@ -243,7 +242,6 @@ Rails.application.routes.draw do
...
@@ -243,7 +242,6 @@ Rails.application.routes.draw do
get
:projects
get
:projects
get
:keys
get
:keys
get
:groups
get
:groups
put
:team_update
put
:block
put
:block
put
:unblock
put
:unblock
put
:unlock
put
:unlock
...
@@ -296,11 +294,11 @@ Rails.application.routes.draw do
...
@@ -296,11 +294,11 @@ Rails.application.routes.draw do
post
:repository_check
post
:repository_check
end
end
resources
:runner_projects
,
only:
[
:create
,
:destroy
]
resources
:runner_projects
,
only:
[
:
index
,
:
create
,
:destroy
]
end
end
end
end
resource
:appearances
,
path:
'appearance'
do
resource
:appearances
,
only:
[
:show
,
:create
,
:update
],
path:
'appearance'
do
member
do
member
do
get
:preview
get
:preview
delete
:logo
delete
:logo
...
@@ -309,7 +307,7 @@ Rails.application.routes.draw do
...
@@ -309,7 +307,7 @@ Rails.application.routes.draw do
end
end
resource
:application_settings
,
only:
[
:show
,
:update
]
do
resource
:application_settings
,
only:
[
:show
,
:update
]
do
resources
:services
resources
:services
,
only:
[
:index
,
:edit
,
:update
]
put
:reset_runners_token
put
:reset_runners_token
put
:reset_health_check_token
put
:reset_health_check_token
put
:clear_repository_check_states
put
:clear_repository_check_states
...
@@ -346,7 +344,7 @@ Rails.application.routes.draw do
...
@@ -346,7 +344,7 @@ Rails.application.routes.draw do
end
end
scope
module: :profiles
do
scope
module: :profiles
do
resource
:account
,
only:
[
:show
,
:update
]
do
resource
:account
,
only:
[
:show
]
do
member
do
member
do
delete
:unlink
delete
:unlink
end
end
...
@@ -358,7 +356,7 @@ Rails.application.routes.draw do
...
@@ -358,7 +356,7 @@ Rails.application.routes.draw do
end
end
end
end
resource
:preferences
,
only:
[
:show
,
:update
]
resource
:preferences
,
only:
[
:show
,
:update
]
resources
:keys
resources
:keys
,
only:
[
:index
,
:show
,
:new
,
:create
,
:destroy
]
resources
:emails
,
only:
[
:index
,
:create
,
:destroy
]
resources
:emails
,
only:
[
:index
,
:create
,
:destroy
]
resource
:avatar
,
only:
[
:destroy
]
resource
:avatar
,
only:
[
:destroy
]
...
@@ -660,7 +658,7 @@ Rails.application.routes.draw do
...
@@ -660,7 +658,7 @@ Rails.application.routes.draw do
post
'/wikis/*id/markdown_preview'
,
to:
'wikis#markdown_preview'
,
constraints:
WIKI_SLUG_ID
,
as:
'wiki_markdown_preview'
post
'/wikis/*id/markdown_preview'
,
to:
'wikis#markdown_preview'
,
constraints:
WIKI_SLUG_ID
,
as:
'wiki_markdown_preview'
end
end
resource
:repository
,
only:
[
:
show
,
:
create
]
do
resource
:repository
,
only:
[
:create
]
do
member
do
member
do
get
'archive'
,
constraints:
{
format:
Gitlab
::
Regex
.
archive_formats_regex
}
get
'archive'
,
constraints:
{
format:
Gitlab
::
Regex
.
archive_formats_regex
}
end
end
...
@@ -782,7 +780,7 @@ Rails.application.routes.draw do
...
@@ -782,7 +780,7 @@ Rails.application.routes.draw do
end
end
end
end
resources
:labels
,
constraints:
{
id:
/\d+/
}
do
resources
:labels
,
except:
[
:show
],
constraints:
{
id:
/\d+/
}
do
collection
do
collection
do
post
:generate
post
:generate
post
:set_priorities
post
:set_priorities
...
@@ -807,7 +805,7 @@ Rails.application.routes.draw do
...
@@ -807,7 +805,7 @@ Rails.application.routes.draw do
end
end
end
end
resources
:project_members
,
except:
[
:new
,
:edit
],
constraints:
{
id:
/[a-zA-Z.\/0-9_\-#%+]+/
},
concerns: :access_requestable
do
resources
:project_members
,
except:
[
:
show
,
:
new
,
:edit
],
constraints:
{
id:
/[a-zA-Z.\/0-9_\-#%+]+/
},
concerns: :access_requestable
do
collection
do
collection
do
delete
:leave
delete
:leave
...
...
spec/routing/admin_routing_spec.rb
View file @
34a1e963
require
'spec_helper'
require
'spec_helper'
# team_update_admin_user PUT /admin/users/:id/team_update(.:format) admin/users#team_update
# block_admin_user PUT /admin/users/:id/block(.:format) admin/users#block
# block_admin_user PUT /admin/users/:id/block(.:format) admin/users#block
# unblock_admin_user PUT /admin/users/:id/unblock(.:format) admin/users#unblock
# unblock_admin_user PUT /admin/users/:id/unblock(.:format) admin/users#unblock
# admin_users GET /admin/users(.:format) admin/users#index
# admin_users GET /admin/users(.:format) admin/users#index
...
@@ -11,10 +10,6 @@ require 'spec_helper'
...
@@ -11,10 +10,6 @@ require 'spec_helper'
# PUT /admin/users/:id(.:format) admin/users#update
# PUT /admin/users/:id(.:format) admin/users#update
# DELETE /admin/users/:id(.:format) admin/users#destroy
# DELETE /admin/users/:id(.:format) admin/users#destroy
describe
Admin
::
UsersController
,
"routing"
do
describe
Admin
::
UsersController
,
"routing"
do
it
"to #team_update"
do
expect
(
put
(
"/admin/users/1/team_update"
)).
to
route_to
(
'admin/users#team_update'
,
id:
'1'
)
end
it
"to #block"
do
it
"to #block"
do
expect
(
put
(
"/admin/users/1/block"
)).
to
route_to
(
'admin/users#block'
,
id:
'1'
)
expect
(
put
(
"/admin/users/1/block"
)).
to
route_to
(
'admin/users#block'
,
id:
'1'
)
end
end
...
...
spec/routing/project_routing_spec.rb
View file @
34a1e963
...
@@ -135,10 +135,6 @@ describe Projects::RepositoriesController, 'routing' do
...
@@ -135,10 +135,6 @@ describe Projects::RepositoriesController, 'routing' do
it
'to #archive format:tar.bz2'
do
it
'to #archive format:tar.bz2'
do
expect
(
get
(
'/gitlab/gitlabhq/repository/archive.tar.bz2'
)).
to
route_to
(
'projects/repositories#archive'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
format:
'tar.bz2'
)
expect
(
get
(
'/gitlab/gitlabhq/repository/archive.tar.bz2'
)).
to
route_to
(
'projects/repositories#archive'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
,
format:
'tar.bz2'
)
end
end
it
'to #show'
do
expect
(
get
(
'/gitlab/gitlabhq/repository'
)).
to
route_to
(
'projects/repositories#show'
,
namespace_id:
'gitlab'
,
project_id:
'gitlabhq'
)
end
end
end
describe
Projects
::
BranchesController
,
'routing'
do
describe
Projects
::
BranchesController
,
'routing'
do
...
...
spec/routing/routing_spec.rb
View file @
34a1e963
...
@@ -176,18 +176,10 @@ describe Profiles::KeysController, "routing" do
...
@@ -176,18 +176,10 @@ describe Profiles::KeysController, "routing" do
expect
(
post
(
"/profile/keys"
)).
to
route_to
(
'profiles/keys#create'
)
expect
(
post
(
"/profile/keys"
)).
to
route_to
(
'profiles/keys#create'
)
end
end
it
"to #edit"
do
expect
(
get
(
"/profile/keys/1/edit"
)).
to
route_to
(
'profiles/keys#edit'
,
id:
'1'
)
end
it
"to #show"
do
it
"to #show"
do
expect
(
get
(
"/profile/keys/1"
)).
to
route_to
(
'profiles/keys#show'
,
id:
'1'
)
expect
(
get
(
"/profile/keys/1"
)).
to
route_to
(
'profiles/keys#show'
,
id:
'1'
)
end
end
it
"to #update"
do
expect
(
put
(
"/profile/keys/1"
)).
to
route_to
(
'profiles/keys#update'
,
id:
'1'
)
end
it
"to #destroy"
do
it
"to #destroy"
do
expect
(
delete
(
"/profile/keys/1"
)).
to
route_to
(
'profiles/keys#destroy'
,
id:
'1'
)
expect
(
delete
(
"/profile/keys/1"
)).
to
route_to
(
'profiles/keys#destroy'
,
id:
'1'
)
end
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