Merge branch 'clipboard-buttons-fix' into 'master'
Fix clipboard buttons on "Check out branch" modal. Closes #18794 See merge request !4760
This commit is contained in:
commit
6c37e0f617
|
@ -22,6 +22,16 @@ module ButtonHelper
|
||||||
type: :button
|
type: :button
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Output a "Copy to Clipboard" button with a custom CSS class
|
||||||
|
#
|
||||||
|
# data - Data attributes passed to `content_tag`
|
||||||
|
# css_class - Class passed to the `content_tag`
|
||||||
|
#
|
||||||
|
# Examples:
|
||||||
|
#
|
||||||
|
# # Define the target element
|
||||||
|
# clipboard_button_with_class({clipboard_target: "div#foo"}, css_class: "btn-clipboard")
|
||||||
|
# # => "<button class='btn btn-clipboard' data-clipboard-target='div#foo'>...</button>"
|
||||||
def clipboard_button_with_class(data = {}, css_class: 'btn-clipboard')
|
def clipboard_button_with_class(data = {}, css_class: 'btn-clipboard')
|
||||||
content_tag :button,
|
content_tag :button,
|
||||||
icon('clipboard'),
|
icon('clipboard'),
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
%p
|
%p
|
||||||
%strong Step 1.
|
%strong Step 1.
|
||||||
Fetch and check out the branch for this merge request
|
Fetch and check out the branch for this merge request
|
||||||
= clipboard_button(clipboard_target: 'pre#merge-info-1')
|
= clipboard_button_with_class({clipboard_target: "pre#merge-info-1"}, css_class: "btn-clipboard")
|
||||||
%pre.dark#merge-info-1
|
%pre.dark#merge-info-1
|
||||||
- if @merge_request.for_fork?
|
- if @merge_request.for_fork?
|
||||||
:preserve
|
:preserve
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
%p
|
%p
|
||||||
%strong Step 3.
|
%strong Step 3.
|
||||||
Merge the branch and fix any conflicts that come up
|
Merge the branch and fix any conflicts that come up
|
||||||
= clipboard_button(clipboard_target: 'pre#merge-info-3')
|
= clipboard_button_with_class({clipboard_target: "pre#merge-info-3"}, css_class: "btn-clipboard")
|
||||||
%pre.dark#merge-info-3
|
%pre.dark#merge-info-3
|
||||||
- if @merge_request.for_fork?
|
- if @merge_request.for_fork?
|
||||||
:preserve
|
:preserve
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
%p
|
%p
|
||||||
%strong Step 4.
|
%strong Step 4.
|
||||||
Push the result of the merge to GitLab
|
Push the result of the merge to GitLab
|
||||||
= clipboard_button(clipboard_target: 'pre#merge-info-4')
|
= clipboard_button_with_class({clipboard_target: "pre#merge-info-4"}, css_class: "btn-clipboard")
|
||||||
%pre.dark#merge-info-4
|
%pre.dark#merge-info-4
|
||||||
:preserve
|
:preserve
|
||||||
git push origin #{h @merge_request.target_branch}
|
git push origin #{h @merge_request.target_branch}
|
||||||
|
|
Loading…
Reference in New Issue