Merge branch 'routing-for-groups' into 'master'
Routing for groups Implements http://feedback.gitlab.com/forums/176466-general/suggestions/5723800-group-url-on-root-path-groups-name-instead-of-g
This commit is contained in:
commit
fd61e3e901
|
@ -327,5 +327,7 @@ Gitlab::Application.routes.draw do
|
|||
end
|
||||
end
|
||||
|
||||
get ':id' => "groups#show", constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
|
||||
|
||||
root to: "dashboard#show"
|
||||
end
|
||||
|
|
|
@ -238,3 +238,14 @@ end
|
|||
describe "Authentication", "routing" do
|
||||
# pending
|
||||
end
|
||||
|
||||
describe "Groups", "routing" do
|
||||
it "to #show" do
|
||||
get("/groups/1").should route_to('groups#show', id: '1')
|
||||
end
|
||||
|
||||
it "also display group#show on the short path" do
|
||||
get("/1").should route_to('groups#show', id: '1')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue