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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
9049cdff
Commit
9049cdff
authored
Aug 08, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add "Check out branch" button to the MR page.
parent
a71bed53
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
10 deletions
+23
-10
CHANGELOG
CHANGELOG
+3
-0
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-0
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+16
-10
No files found.
CHANGELOG
View file @
9049cdff
...
@@ -43,6 +43,9 @@ v 7.14.0 (unreleased)
...
@@ -43,6 +43,9 @@ v 7.14.0 (unreleased)
- Fetch code from forks to refs/merge-requests/:id/head when merge request created
- Fetch code from forks to refs/merge-requests/:id/head when merge request created
- Remove satellites
- Remove satellites
- Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
- Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
- Improve MR merge widget text and UI consistency.
- Improve text in MR "How To Merge" modal.
- Add "Check out branch" button to the MR page.
v 7.13.3
v 7.13.3
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
9049cdff
...
@@ -179,3 +179,7 @@
...
@@ -179,3 +179,7 @@
.merge-request-form
.select2-container
{
.merge-request-form
.select2-container
{
width
:
250px
!
important
;
width
:
250px
!
important
;
}
}
.mr-source-target
{
line-height
:
31px
;
}
app/views/projects/merge_requests/_show.html.haml
View file @
9049cdff
...
@@ -5,19 +5,25 @@
...
@@ -5,19 +5,25 @@
%hr
%hr
=
render
"projects/merge_requests/show/mr_box"
=
render
"projects/merge_requests/show/mr_box"
%hr
%hr
.append-bottom-20
.append-bottom-20
.mr-source-target
-
if
@merge_request
.
open?
-
if
@merge_request
.
open?
.btn-group.btn-group-sm.pull-right
.pull-right
%a
.btn.btn-sm.dropdown-toggle
{
data:
{
toggle: :dropdown
}
}
-
if
@merge_request
.
source_branch_exists?
=
icon
(
'download'
)
=
link_to
"#modal_merge_info"
,
class:
"btn btn-sm"
,
"data-toggle"
=>
"modal"
do
Download as
=
icon
(
'cloud-download fw'
)
%span
.caret
Check out branch
%ul
.dropdown-menu
%li
=
link_to
"Email Patches"
,
merge_request_path
(
@merge_request
,
format: :patch
)
%span
.dropdown
%li
=
link_to
"Plain Diff"
,
merge_request_path
(
@merge_request
,
format: :diff
)
%a
.btn.btn-sm.dropdown-toggle
{
data:
{
toggle: :dropdown
}
}
=
icon
(
'download'
)
Download as
%span
.caret
%ul
.dropdown-menu
%li
=
link_to
"Email Patches"
,
merge_request_path
(
@merge_request
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
merge_request_path
(
@merge_request
,
format: :diff
)
.light
.light
%div
%div
%span
From
%span
Request to merge
%span
.label-branch
#{
source_branch_with_namespace
(
@merge_request
)
}
%span
.label-branch
#{
source_branch_with_namespace
(
@merge_request
)
}
%span
into
%span
into
%span
.label-branch
#{
@merge_request
.
target_branch
}
%span
.label-branch
#{
@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