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
Jérome Perrin
gitlab-ce
Commits
17c42cb8
Commit
17c42cb8
authored
Jan 13, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'clipboard-button-text' into 'master'
Copy <some text> to clipboard See merge request !8535
parents
7ddeefe0
96cec4fe
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
7 deletions
+10
-7
app/views/profiles/personal_access_tokens/index.html.haml
app/views/profiles/personal_access_tokens/index.html.haml
+1
-1
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+3
-3
app/views/shared/_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+1
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+2
-2
changelogs/unreleased/clipboard-button-text.yml
changelogs/unreleased/clipboard-button-text.yml
+3
-0
No files found.
app/views/profiles/personal_access_tokens/index.html.haml
View file @
17c42cb8
...
...
@@ -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
...
...
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
17c42cb8
...
...
@@ -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
}
...
...
app/views/shared/_clone_panel.html.haml
View file @
17c42cb8
...
...
@@ -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
){
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
17c42cb8
...
...
@@ -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
}
"}
'
);
...
...
changelogs/unreleased/clipboard-button-text.yml
0 → 100644
View file @
17c42cb8
---
title
:
'
Copy
<some
text>
to
clipboard'
merge_request
:
8535
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