Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
3a40842f
Commit
3a40842f
authored
Oct 31, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated positioning of copy file path button in diffs
Closes #23591
parent
5566f277
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
app/helpers/button_helper.rb
app/helpers/button_helper.rb
+2
-1
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+0
-1
app/views/projects/diffs/_file_header.html.haml
app/views/projects/diffs/_file_header.html.haml
+2
-0
No files found.
app/helpers/button_helper.rb
View file @
3a40842f
...
...
@@ -16,13 +16,14 @@ module ButtonHelper
# See http://clipboardjs.com/#usage
def
clipboard_button
(
data
=
{})
css_class
=
data
[
:class
]
||
'btn-clipboard btn-transparent'
title
=
data
[
:title
]
||
'Copy to Clipboard'
data
=
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}.
merge
(
data
)
content_tag
:button
,
icon
(
'clipboard'
),
class:
"btn
#{
css_class
}
"
,
data:
data
,
type: :button
,
title:
'Copy to Clipboard'
title:
title
end
def
http_clone_button
(
project
,
placement
=
'right'
,
append_link:
true
)
...
...
app/views/projects/diffs/_file.html.haml
View file @
3a40842f
...
...
@@ -8,7 +8,6 @@
=
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
,
...
...
app/views/projects/diffs/_file_header.html.haml
View file @
3a40842f
...
...
@@ -21,6 +21,8 @@
-
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'
)
-
if
diff_file
.
mode_changed?
%small
=
"
#{
diff_file
.
a_mode
}
→
#{
diff_file
.
b_mode
}
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment