Commit fd61e3e9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents da4c13f1 61ef72e5
...@@ -327,5 +327,7 @@ Gitlab::Application.routes.draw do ...@@ -327,5 +327,7 @@ Gitlab::Application.routes.draw do
end end
end end
get ':id' => "groups#show", constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
root to: "dashboard#show" root to: "dashboard#show"
end end
...@@ -238,3 +238,14 @@ end ...@@ -238,3 +238,14 @@ end
describe "Authentication", "routing" do describe "Authentication", "routing" do
# pending # pending
end 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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment