summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-03-20 22:55:08 +0100
committerDouwe Maan <douwe@selenight.nl>2016-03-20 22:55:08 +0100
commit7c51d5efecdad1a7f52ffecdf57c86b7b90ca166 (patch)
tree770615e2c9fe547f064a0de0246f397e32ff83c8 /app/controllers
parent3058a8fa4c1dfdf50a6f274bfbf280f8d2137168 (diff)
downloadgitlab-ce-7c51d5efecdad1a7f52ffecdf57c86b7b90ca166.tar.gz
Fix some specs
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/projects_controller.rb1
-rw-r--r--app/controllers/projects/application_controller.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index ae1de06b983..8b212225b2d 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -1,7 +1,6 @@
class Admin::ProjectsController < Admin::ApplicationController
before_action :project, only: [:show, :transfer]
before_action :group, only: [:show, :transfer]
- before_action :repository, only: [:show, :transfer]
def index
@projects = Project.all
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 276f80f800a..9c8433c260b 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -67,7 +67,7 @@ class Projects::ApplicationController < ApplicationController
end
def require_non_empty_project
- redirect_to @project if @project.empty_repo?
+ redirect_to namespace_project_path(@project.namespace, @project) if @project.empty_repo?
end
def require_branch_head