diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-08-15 19:53:41 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-08-15 19:53:41 +0000 |
commit | 2024198da7052b69a206d53a7accc2f9b1291b2f (patch) | |
tree | 64530a3621bf92394cc051d9976a69156317829c /app/controllers | |
parent | 8615e78560837ec6b802c64fa81e621d5a4c0949 (diff) | |
download | gitlab-ce-2024198da7052b69a206d53a7accc2f9b1291b2f.tar.gz |
Many Repo Fixes
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/blob_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index a2e8c10857d..2b8f3977e6e 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -198,6 +198,10 @@ class Projects::BlobController < Projects::ApplicationController json = blob_json(@blob) return render_404 unless json + path_segments = @path.split('/') + path_segments.pop + tree_path = path_segments.join('/') + render json: json.merge( path: blob.path, name: blob.name, @@ -212,6 +216,7 @@ class Projects::BlobController < Projects::ApplicationController raw_path: project_raw_path(project, @id), blame_path: project_blame_path(project, @id), commits_path: project_commits_path(project, @id), + tree_path: project_tree_path(project, File.join(@ref, tree_path)), permalink: project_blob_path(project, File.join(@commit.id, @path)) ) end |