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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
80108725
Commit
80108725
authored
Oct 23, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add clipboard buttons to each step of "How to merge"
parent
18762583
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+9
-0
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+5
-2
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
80108725
...
@@ -205,6 +205,15 @@
...
@@ -205,6 +205,15 @@
#modal_merge_info
.modal-dialog
{
#modal_merge_info
.modal-dialog
{
width
:
600px
;
width
:
600px
;
.btn-clipboard
{
@extend
.pull-right
;
margin-right
:
18px
;
margin-top
:
5px
;
position
:
absolute
;
right
:
0
;
}
}
}
.mr-source-target
{
.mr-source-target
{
...
...
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
80108725
...
@@ -3,11 +3,12 @@
...
@@ -3,11 +3,12 @@
.modal-content
.modal-content
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
Check out, review and merge locally
%h3
Check out, review
,
and merge locally
.modal-body
.modal-body
%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
%pre
.dark
%pre
.dark
-
if
@merge_request
.
for_fork?
-
if
@merge_request
.
for_fork?
:preserve
:preserve
...
@@ -24,6 +25,7 @@
...
@@ -24,6 +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
%pre
.dark
%pre
.dark
-
if
@merge_request
.
for_fork?
-
if
@merge_request
.
for_fork?
:preserve
:preserve
...
@@ -36,6 +38,7 @@
...
@@ -36,6 +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
%pre
.dark
%pre
.dark
:preserve
:preserve
git push origin
#{
h
@merge_request
.
target_branch
}
git push origin
#{
h
@merge_request
.
target_branch
}
...
...
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