Merge branch 'namespace-route' into 'master'

Namespace route

Fixes #1312
This commit is contained in:
Dmitriy Zaporozhets
2014-06-07 12:50:45 +00:00
2 changed files with 19 additions and 1 deletions
+18
View File
@@ -0,0 +1,18 @@
class NamespacesController < ApplicationController
skip_before_filter :authenticate_user!
def show
namespace = Namespace.find_by(path: params[:id])
unless namespace
return render_404
end
if namespace.type == "Group"
redirect_to group_path(namespace)
else
redirect_to user_path(namespace.owner)
end
end
end
+1 -1
View File
@@ -315,7 +315,7 @@ Gitlab::Application.routes.draw do
end
end
get ':id' => "groups#show", constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
get ':id' => "namespaces#show", constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
root to: "dashboard#show"
end