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/tree_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/tree_controller.rb')
| -rw-r--r-- | app/controllers/projects/tree_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb index 98f3a72e3c1..1fc276b8c03 100644 --- a/app/controllers/projects/tree_controller.rb +++ b/app/controllers/projects/tree_controller.rb @@ -16,7 +16,7 @@ class Projects::TreeController < Projects::ApplicationController if tree.entries.empty? if @repository.blob_at(@commit.id, @path) return redirect_to( - namespace_project_blob_path(@project.namespace, @project, + project_blob_path(@project, File.join(@ref, @path)) ) elsif @path.present? @@ -44,8 +44,8 @@ class Projects::TreeController < Projects::ApplicationController return render_404 unless @commit_params.values.all? create_commit(Files::CreateDirService, success_notice: "The directory has been successfully created.", - success_path: namespace_project_tree_path(@project.namespace, @project, File.join(@branch_name, @dir_name)), - failure_path: namespace_project_tree_path(@project.namespace, @project, @ref)) + success_path: project_tree_path(@project, File.join(@branch_name, @dir_name)), + failure_path: project_tree_path(@project, @ref)) end private |