Merge branch 'namespace-route' into 'master'

Namespace route Fixes #1312

Merge branch 'namespace-route' into 'master'
Namespace route Fixes #1312
Dmitriy Zaporozhets
2 parents 0d13abb1 3dc0bce9
Showing 2 changed files with 19 additions and 1 deletions Show diff stats
app/controllers/namespaces_controller.rb
config/routes.rb
@@ -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
+
@@ -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
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+class NamespacesController < ApplicationController
	2	+ skip_before_filter :authenticate_user!
	3	+
	4	+ def show
	5	+ namespace = Namespace.find_by(path: params[:id])
	6	+
	7	+ unless namespace
	8	+ return render_404
	9	+ end
	10	+
	11	+ if namespace.type == "Group"
	12	+ redirect_to group_path(namespace)
	13	+ else
	14	+ redirect_to user_path(namespace.owner)
	15	+ end
	16	+ end
	17	+end
	18	+
	@@ -315,7 +315,7 @@ Gitlab::Application.routes.draw do		@@ -315,7 +315,7 @@ Gitlab::Application.routes.draw do
315	end	315	end
316	end	316	end
317		317
318	- get ':id' => "groups#show", constraints: {id: /(?:[^.]\|\.(?!atom$))+/, format: /atom/}	318	+ get ':id' => "namespaces#show", constraints: {id: /(?:[^.]\|\.(?!atom$))+/, format: /atom/}
319		319
320	root to: "dashboard#show"	320	root to: "dashboard#show"
321	end	321	end