diff options
| author | Yar <YarTheGreat@gmail.com> | 2016-11-13 21:18:03 +0300 |
|---|---|---|
| committer | YarNayar <YarTheGreat@gmail.com> | 2016-11-15 20:51:21 +0300 |
| commit | 8782bb96cca3ade2b367f588fd8332906dcc2d1b (patch) | |
| tree | 9f46f21807532db46d72cd5f4936d088368f5fd7 /app/controllers/projects/blob_controller.rb | |
| parent | 5b876592b47209e431d37b281aacb187df870ea3 (diff) | |
| download | gitlab-ce-8782bb96cca3ade2b367f588fd8332906dcc2d1b.tar.gz | |
Unify anchor link format for MR diff files !7298
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.
Inspired by #24010 and !7298
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index b78cc6585ba..56ced786311 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -42,7 +42,7 @@ class Projects::BlobController < Projects::ApplicationController after_edit_path = if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + - "#file-path-#{hexdigest(@path)}" + "##{hexdigest(@path)}" else namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end |