diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-11 00:27:09 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-11 00:27:09 +0300 |
| commit | 0e0984952b458a617cf1f95de8b8fb88ed014d6a (patch) | |
| tree | e4afd2044d31512a4baef237a7de47587085b130 | |
| parent | 5196f6028cf57dc02c25f95edbb933e3f403b016 (diff) | |
| parent | 8592e992a0da4b966f9407ffc91f88ecd7fd750c (diff) | |
Merge branch 'mr-file-path-copy-btn' into 'master'
Added copy file path button to diffs
## What does this MR do?
Adds a copy file path button in the header of diff files.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #23108
See merge request !6769
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/button_helper.rb | 3 | ||||
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index c848aa1017b..e2480b66ae4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -27,6 +27,7 @@ v 8.13.0 (unreleased) - Revert "Label list shows all issues (opened or closed) with that label" - Expose expires_at field when sharing project on API - Fix VueJS template tags being rendered in code comments + - Added copy file path button to merge request diff files - Fix issue with page scrolling to top when closing or pinning sidebar (lukehowell) - Add Issue Board API support (andrebsguedes) - Allow the Koding integration to be configured through the API diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb index b478580978b..a695aceea76 100644 --- a/app/helpers/button_helper.rb +++ b/app/helpers/button_helper.rb @@ -15,10 +15,11 @@ module ButtonHelper # # See http://clipboardjs.com/#usage def clipboard_button(data = {}) + css_class = data[:class] || 'btn-clipboard' data = { toggle: 'tooltip', placement: 'bottom', container: 'body' }.merge(data) content_tag :button, icon('clipboard'), - class: "btn btn-clipboard", + class: "btn #{css_class}", data: data, type: :button, title: "Copy to Clipboard" diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index d07de45fdde..257e0a855bd 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -8,7 +8,7 @@ = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file", disabled: @diff_notes_disabled do = icon('comment') \ - + = clipboard_button(clipboard_text: diff_file.new_path, class: 'btn-file-option') - if editable_diff?(diff_file) - link_opts = @merge_request.id ? { from_merge_request_id: @merge_request.id } : {} = edit_blob_link(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path, |