Skip to content

G
gitlab-ce
Commit 16b13cbc authored by Fatih Acet's avatar Fatih Acet
Browse files
Options

Put file blob link as href.

parent e47e537b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
app/views/projects/merge_requests/conflicts.html.haml
View file @ 16b13cbc
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
.file-title .file-title
%span {{{file.filePath}}} %span {{{file.filePath}}}
.file-actions .file-actions
%a.btn.btn-sm View file @{{conflictsData.shortCommitSha}} %a.btn.view-file.btn-file-option{":href" => "file.blobLink"}
View file @{{conflictsData.shortCommitSha}}
.diff-content.diff-wrap-lines .diff-content.diff-wrap-lines
.diff-wrap-lines.code.file-content.js-syntax-highlight.white .diff-wrap-lines.code.file-content.js-syntax-highlight.white
...@@ -72,7 +73,8 @@ ...@@ -72,7 +73,8 @@
.file-title .file-title
%span {{{file.filePath}}} %span {{{file.filePath}}}
.file-actions .file-actions
%a.btn.btn-sm View file @{{conflictsData.shortCommitSha}} %a.btn.view-file.btn-file-option{":href" => "file.blobLink"}
View file @{{conflictsData.shortCommitSha}}
.diff-content.diff-wrap-lines .diff-content.diff-wrap-lines
.diff-wrap-lines.code.file-content.js-syntax-highlight.white .diff-wrap-lines.code.file-content.js-syntax-highlight.white
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7