2013-06-03 20:20:50 +00:00
|
|
|
= form_for [@source_project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |form_helper|
|
2012-01-28 15:21:00 +00:00
|
|
|
-if @merge_request.errors.any?
|
2013-01-30 14:53:18 +00:00
|
|
|
.alert.alert-error
|
2012-01-28 15:21:00 +00:00
|
|
|
%ul
|
|
|
|
- @merge_request.errors.full_messages.each do |msg|
|
|
|
|
%li= msg
|
2011-12-13 21:24:31 +00:00
|
|
|
|
2013-07-17 12:48:22 +00:00
|
|
|
%h3.page-title
|
|
|
|
%i.icon-code-fork
|
|
|
|
Branches
|
|
|
|
.merge-request-branches
|
|
|
|
.row
|
|
|
|
.span5
|
|
|
|
.light-well
|
2013-04-25 14:15:33 +00:00
|
|
|
%h5.cgray From
|
|
|
|
.padded= form_helper.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span4'})
|
|
|
|
.padded= form_helper.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span4'})
|
2013-07-17 12:48:22 +00:00
|
|
|
.mr_source_commit.prepend-top-10
|
|
|
|
.span2
|
|
|
|
%h1.merge-request-angle
|
|
|
|
%i.icon-angle-right
|
|
|
|
.span5
|
|
|
|
.light-well
|
2013-04-25 14:15:33 +00:00
|
|
|
%h5.cgray To
|
|
|
|
- projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
|
|
|
|
.padded= form_helper.select(:target_project_id, projects.map { |proj| [proj.path_with_namespace,proj.id] }, {include_blank: "Select Target Project" }, {class: 'target_project chosen span4'})
|
|
|
|
.padded= form_helper.select(:target_branch, @target_branches, { include_blank: "Select branch" }, {class: 'target_branch chosen span4'})
|
|
|
|
.mr_target_commit.prepend-top-10
|
2012-06-13 06:03:53 +00:00
|
|
|
|
2013-07-17 12:48:22 +00:00
|
|
|
%hr
|
2012-06-13 06:03:53 +00:00
|
|
|
|
2013-07-17 12:48:22 +00:00
|
|
|
%h3.page-title
|
|
|
|
%i.icon-paper-clip
|
|
|
|
Details
|
2013-07-17 15:35:28 +00:00
|
|
|
.merge-request-form-info
|
2013-07-17 12:48:22 +00:00
|
|
|
.clearfix
|
|
|
|
= f.label :title do
|
|
|
|
%strong= "Title *"
|
|
|
|
.input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
|
|
|
|
.clearfix
|
|
|
|
.left
|
|
|
|
= f.label :assignee_id do
|
|
|
|
%i.icon-user
|
|
|
|
Assign to
|
|
|
|
.input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
|
|
|
|
.left
|
|
|
|
= f.label :milestone_id do
|
|
|
|
%i.icon-time
|
|
|
|
Milestone
|
|
|
|
.input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
|
2012-07-17 05:19:16 +00:00
|
|
|
|
2012-04-10 05:51:08 +00:00
|
|
|
.form-actions
|
2013-01-05 22:08:02 +00:00
|
|
|
- if @merge_request.new_record?
|
2013-04-25 14:15:33 +00:00
|
|
|
= form_helper.submit 'Submit merge request', class: "btn btn-create"
|
2013-01-05 22:08:02 +00:00
|
|
|
-else
|
2013-04-25 14:15:33 +00:00
|
|
|
= form_helper.submit 'Save changes', class: "btn btn-save"
|
2012-01-28 15:21:00 +00:00
|
|
|
- if @merge_request.new_record?
|
2013-06-03 20:20:50 +00:00
|
|
|
= link_to project_merge_requests_path(@source_project), class: "btn btn-cancel" do
|
2012-01-28 15:21:00 +00:00
|
|
|
Cancel
|
2012-06-03 22:37:27 +00:00
|
|
|
- else
|
2013-06-03 20:20:50 +00:00
|
|
|
= link_to project_merge_request_path(@target_project, @merge_request), class: "btn btn-cancel" do
|
2012-01-28 15:21:00 +00:00
|
|
|
Cancel
|
2011-11-28 07:39:43 +00:00
|
|
|
|
|
|
|
:javascript
|
2013-06-21 19:08:16 +00:00
|
|
|
disableButtonIfEmptyField("#merge_request_title", ".btn-save");
|
2013-01-05 01:18:39 +00:00
|
|
|
|
2013-06-08 15:51:18 +00:00
|
|
|
var source_branch = $("#merge_request_source_branch")
|
|
|
|
, target_branch = $("#merge_request_target_branch")
|
|
|
|
, target_project = $("#merge_request_target_project_id");
|
2012-03-13 21:54:49 +00:00
|
|
|
|
2013-06-08 15:51:18 +00:00
|
|
|
$.get("#{branch_from_project_merge_requests_path(@source_project)}", {ref: source_branch.val() });
|
|
|
|
$.get("#{branch_to_project_merge_requests_path(@source_project)}", {target_project_id: target_project.val(),ref: target_branch.val() });
|
2012-03-13 21:54:49 +00:00
|
|
|
|
2013-06-08 15:51:18 +00:00
|
|
|
target_project.live("change", function() {
|
|
|
|
$.get("#{update_branches_project_merge_requests_path(@source_project)}", {target_project_id: $(this).val() });
|
|
|
|
});
|
|
|
|
source_branch.live("change", function() {
|
|
|
|
$.get("#{branch_from_project_merge_requests_path(@source_project)}", {ref: $(this).val() });
|
|
|
|
});
|
|
|
|
target_branch.live("change", function() {
|
|
|
|
$.get("#{branch_to_project_merge_requests_path(@source_project)}", {target_project_id: target_project.val(),ref: $(this).val() });
|
2013-06-03 20:20:50 +00:00
|
|
|
});
|