Skip to content
Snippets Groups Projects
Verified Commit 99fd58ce authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Show full commit info at MR form

parent 1e106756
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -31,10 +31,10 @@
 
.mr_source_commit,
.mr_target_commit {
margin-top: 10px;
.commit {
margin: 0;
padding: 0;
padding: 5px 0;
padding: 2px 0;
list-style: none;
&:hover {
background: none;
Loading
Loading
Loading
Loading
@@ -6,19 +6,22 @@
%li= msg
 
.merge-request-branches
.row
.col-md-5
.form-group
= label_tag nil, class: 'control-label' do
From
.col-sm-10
.clearfix
.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? })
.pull-left
 
= f.select(:source_branch, @merge_request.source_branches, { include_blank: "Select branch" }, {class: 'source_branch select2 span2'})
.mr_source_commit.prepend-top-10
.col-md-2
.merge-request-angle
%i.icon-long-arrow-right
.col-md-5
.mr_source_commit
%br
.form-group
= label_tag nil, class: 'control-label' do
To
.col-sm-10
.clearfix
.pull-left
- projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
Loading
Loading
@@ -26,7 +29,7 @@
.pull-left
 
= 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
.merge-request-form-info
Loading
Loading
: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');
 
if(mrTitle.val().length == 0) {
Loading
Loading
:plain
$(".mr_target_commit").html("#{commit_to_html(@commit, @target_project)}");
$(".mr_target_commit").html("#{commit_to_html(@commit, @target_project, false)}");
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment