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
Boxiang Sun
gitlab-ce
Commits
99fd58ce
Commit
99fd58ce
authored
Feb 15, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show full commit info at MR form
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1e106756
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
12 deletions
+15
-12
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+2
-2
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+11
-8
app/views/projects/merge_requests/branch_from.js.haml
app/views/projects/merge_requests/branch_from.js.haml
+1
-1
app/views/projects/merge_requests/branch_to.js.haml
app/views/projects/merge_requests/branch_to.js.haml
+1
-1
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
99fd58ce
...
@@ -31,10 +31,10 @@
...
@@ -31,10 +31,10 @@
.mr_source_commit
,
.mr_source_commit
,
.mr_target_commit
{
.mr_target_commit
{
margin-top
:
10px
;
.commit
{
.commit
{
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
2px
0
;
padding
:
5px
0
;
list-style
:
none
;
list-style
:
none
;
&
:hover
{
&
:hover
{
background
:
none
;
background
:
none
;
...
...
app/views/projects/merge_requests/_form.html.haml
View file @
99fd58ce
...
@@ -6,19 +6,22 @@
...
@@ -6,19 +6,22 @@
%li
=
msg
%li
=
msg
.merge-request-branches
.merge-request-branches
.row
.form-group
.col-md-5
=
label_tag
nil
,
class:
'control-label'
do
From
.col-sm-10
.clearfix
.clearfix
.pull-left
.pull-left
=
f
.
select
(
:source_project_id
,
[[
@merge_request
.
source_project_path
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project select2 span3'
,
disabled:
@merge_request
.
persisted?
})
=
f
.
select
(
:source_project_id
,
[[
@merge_request
.
source_project_path
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project select2 span3'
,
disabled:
@merge_request
.
persisted?
})
.pull-left
.pull-left
=
f
.
select
(
:source_branch
,
@merge_request
.
source_branches
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch select2 span2'
})
=
f
.
select
(
:source_branch
,
@merge_request
.
source_branches
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch select2 span2'
})
.mr_source_commit.prepend-top-10
.mr_source_commit
.col-md-2
%br
.merge-request-angle
.form-group
%i
.icon-long-arrow-right
=
label_tag
nil
,
class:
'control-label'
do
.col-md-5
To
.col-sm-10
.clearfix
.clearfix
.pull-left
.pull-left
-
projects
=
@project
.
forked_from_project
.
nil?
?
[
@project
]
:
[
@project
,
@project
.
forked_from_project
]
-
projects
=
@project
.
forked_from_project
.
nil?
?
[
@project
]
:
[
@project
,
@project
.
forked_from_project
]
...
@@ -26,7 +29,7 @@
...
@@ -26,7 +29,7 @@
.pull-left
.pull-left
=
f
.
select
(
:target_branch
,
@merge_request
.
target_branches
,
{
include_blank:
"Select branch"
},
{
class:
'target_branch select2 span2'
})
=
f
.
select
(
:target_branch
,
@merge_request
.
target_branches
,
{
include_blank:
"Select branch"
},
{
class:
'target_branch select2 span2'
})
.mr_target_commit
.prepend-top-10
.mr_target_commit
%hr
%hr
.merge-request-form-info
.merge-request-form-info
...
...
app/views/projects/merge_requests/branch_from.js.haml
View file @
99fd58ce
:plain
:plain
$(".mr_source_commit").html("
#{
commit_to_html
(
@commit
,
@source_project
)
}
");
$(".mr_source_commit").html("
#{
commit_to_html
(
@commit
,
@source_project
,
false
)
}
");
var mrTitle = $('#merge_request_title');
var mrTitle = $('#merge_request_title');
if(mrTitle.val().length == 0) {
if(mrTitle.val().length == 0) {
...
...
app/views/projects/merge_requests/branch_to.js.haml
View file @
99fd58ce
:plain
:plain
$(".mr_target_commit").html("
#{
commit_to_html
(
@commit
,
@target_project
)
}
");
$(".mr_target_commit").html("
#{
commit_to_html
(
@commit
,
@target_project
,
false
)
}
");
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