summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2015-09-16 19:52:57 -0500
committerPatricio Cano <suprnova32@gmail.com>2015-09-16 19:52:57 -0500
commit1ef2ce95d507c3d21598f26dd8a0e77dfc3c33cf (patch)
treedc7a80b0f77f98e9f1a6898644f4961cac2c2d60 /app/controllers/projects_controller.rb
parent4c98357f16b1acfa793d8a5b28c7147e21f20356 (diff)
parentc99473e57ca90f95c4e31fc1582fb94731257442 (diff)
downloadgitlab-ce-1ef2ce95d507c3d21598f26dd8a0e77dfc3c33cf.tar.gz
Merge branch 'master' into notification-levels
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 14c3a6028c9..009e856d93c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -10,6 +10,10 @@ class ProjectsController < ApplicationController
layout :determine_layout
+ def index
+ redirect_to(current_user ? root_path : explore_root_path)
+ end
+
def new
@project = Project.new
end
@@ -108,7 +112,7 @@ class ProjectsController < ApplicationController
if request.referer.include?('/admin')
redirect_to admin_namespaces_projects_path
else
- redirect_to dashboard_path
+ redirect_to dashboard_projects_path
end
rescue Projects::DestroyService::DestroyError => ex
redirect_to edit_project_path(@project), alert: ex.message