Merge branch 'clipboard-button-text' into 'master'
Copy <some text> to clipboard See merge request !8535
This commit is contained in:
commit
17c42cb8a2
|
@ -19,7 +19,7 @@
|
|||
Your New Personal Access Token
|
||||
.form-group
|
||||
= text_field_tag 'created-personal-access-token', flash[:personal_access_token], readonly: true, class: "form-control", 'aria-describedby' => "created-personal-access-token-help-block"
|
||||
= clipboard_button(clipboard_text: flash[:personal_access_token])
|
||||
= clipboard_button(clipboard_text: flash[:personal_access_token], title: "Copy personal access token to clipboard", placement: "left")
|
||||
%span#created-personal-access-token-help-block.help-block.text-danger Make sure you save it - you won't be able to access it again.
|
||||
|
||||
%hr
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
%p
|
||||
%strong Step 1.
|
||||
Fetch and check out the branch for this merge request
|
||||
= clipboard_button(clipboard_target: "pre#merge-info-1")
|
||||
= clipboard_button(clipboard_target: "pre#merge-info-1", title: "Copy commands to clipboard")
|
||||
%pre.dark#merge-info-1
|
||||
- if @merge_request.for_fork?
|
||||
:preserve
|
||||
|
@ -25,7 +25,7 @@
|
|||
%p
|
||||
%strong Step 3.
|
||||
Merge the branch and fix any conflicts that come up
|
||||
= clipboard_button(clipboard_target: "pre#merge-info-3")
|
||||
= clipboard_button(clipboard_target: "pre#merge-info-3", title: "Copy commands to clipboard")
|
||||
%pre.dark#merge-info-3
|
||||
- if @merge_request.for_fork?
|
||||
:preserve
|
||||
|
@ -38,7 +38,7 @@
|
|||
%p
|
||||
%strong Step 4.
|
||||
Push the result of the merge to GitLab
|
||||
= clipboard_button(clipboard_target: "pre#merge-info-4")
|
||||
= clipboard_button(clipboard_target: "pre#merge-info-4", title: "Copy commands to clipboard")
|
||||
%pre.dark#merge-info-4
|
||||
:preserve
|
||||
git push origin #{h @merge_request.target_branch}
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
= text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#project_clone')
|
||||
= clipboard_button(clipboard_target: '#project_clone', title: "Copy URL to clipboard")
|
||||
|
||||
:javascript
|
||||
$('ul.clone-options-dropdown a').on('click',function(e){
|
||||
|
|
|
@ -153,13 +153,13 @@
|
|||
- project_ref = cross_project_reference(@project, issuable)
|
||||
.block.project-reference
|
||||
.sidebar-collapsed-icon.dont-change-state
|
||||
= clipboard_button(clipboard_text: project_ref)
|
||||
= clipboard_button(clipboard_text: project_ref, title: "Copy reference to clipboard", placement: "left")
|
||||
.cross-project-reference.hide-collapsed
|
||||
%span
|
||||
Reference:
|
||||
%cite{ title: project_ref }
|
||||
= project_ref
|
||||
= clipboard_button(clipboard_text: project_ref)
|
||||
= clipboard_button(clipboard_text: project_ref, title: "Copy reference to clipboard", placement: "left")
|
||||
|
||||
:javascript
|
||||
new MilestoneSelect('{"namespace":"#{@project.namespace.path}","path":"#{@project.path}"}');
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
title: 'Copy <some text> to clipboard'
|
||||
merge_request: 8535
|
Loading…
Reference in New Issue