summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-27 10:54:30 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-12-27 10:54:30 +0000
commit2a830f87cfae686aa88f995b179f155d1e3537b5 (patch)
treef1e7b24d432450f3d5538f0426c914c821a6a29b
parentfe60079454cd2d59ea53d81660836fd3c697c4fb (diff)
parentd56d2a02c3542f09093e7c904b658dd3f6dc45dc (diff)
downloadgitlab-ce-2a830f87cfae686aa88f995b179f155d1e3537b5.tar.gz
Merge branch 'filename-to-file-path' into 'master'
Rename filename to file path in tooltip of file header in merge request diff See merge request !8314
-rw-r--r--app/views/projects/diffs/_file_header.html.haml2
-rw-r--r--changelogs/unreleased/filename-to-file-path.yml3
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_file_header.html.haml b/app/views/projects/diffs/_file_header.html.haml
index d3ed8e1bf38..90c9a0c6c2b 100644
--- a/app/views/projects/diffs/_file_header.html.haml
+++ b/app/views/projects/diffs/_file_header.html.haml
@@ -21,7 +21,7 @@
- if diff_file.deleted_file
deleted
- = clipboard_button(clipboard_text: diff_file.new_path, class: 'btn-clipboard btn-transparent prepend-left-5', title: 'Copy filename to clipboard')
+ = clipboard_button(clipboard_text: diff_file.new_path, class: 'btn-clipboard btn-transparent prepend-left-5', title: 'Copy file path to clipboard')
- if diff_file.mode_changed?
%small
diff --git a/changelogs/unreleased/filename-to-file-path.yml b/changelogs/unreleased/filename-to-file-path.yml
new file mode 100644
index 00000000000..3c6c838595a
--- /dev/null
+++ b/changelogs/unreleased/filename-to-file-path.yml
@@ -0,0 +1,3 @@
+---
+title: Rename filename to file path in tooltip of file header in merge request diff
+merge_request: 8314 \ No newline at end of file