diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-20 17:34:04 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-20 17:51:07 +0100 |
| commit | 6448368b5b71d9c93b865d2cad0206b475db4553 (patch) | |
| tree | ac26a315400e40ceba27eb37cadef461f2d77e54 /app/controllers/projects/application_controller.rb | |
| parent | 115ffa3749300b58d7161610e27a41b844b3fb80 (diff) | |
| parent | 7f78a78a36a4341680a71afa5a12a1f4d4876c66 (diff) | |
| download | gitlab-ce-6448368b5b71d9c93b865d2cad0206b475db4553.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 3d7ce4f0222..95de3a44641 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -76,13 +76,13 @@ class Projects::ApplicationController < ApplicationController def require_non_empty_project # Be sure to return status code 303 to avoid a double DELETE: # http://api.rubyonrails.org/classes/ActionController/Redirecting.html - redirect_to namespace_project_path(@project.namespace, @project), status: 303 if @project.empty_repo? + redirect_to project_path(@project), status: 303 if @project.empty_repo? end def require_branch_head unless @repository.branch_exists?(@ref) redirect_to( - namespace_project_tree_path(@project.namespace, @project, @ref), + project_tree_path(@project, @ref), notice: "This action is not allowed unless you are on a branch" ) end |