2014-01-01 20:27:10 +00:00
|
|
|
= form_for [@project, @merge_request], html: { class: "merge-request-form form-horizontal" } do |f|
|
2014-03-24 13:20:29 +00:00
|
|
|
.row
|
|
|
|
.col-sm-2
|
|
|
|
.col-sm-10
|
|
|
|
- if @repository.contribution_guide && !@merge_request.persisted?
|
|
|
|
- contribution_guide_url = project_blob_path(@project, tree_join(@repository.root_ref, @repository.contribution_guide.name))
|
|
|
|
.alert.alert-info
|
|
|
|
Please review the
|
|
|
|
%strong #{link_to "guidelines for contribution", contribution_guide_url}
|
|
|
|
to this repository.
|
|
|
|
|
|
|
|
-if @merge_request.errors.any?
|
|
|
|
.alert.alert-danger
|
|
|
|
- @merge_request.errors.full_messages.each do |msg|
|
|
|
|
%div= msg
|
2011-12-13 21:24:31 +00:00
|
|
|
|
2013-07-17 15:35:28 +00:00
|
|
|
.merge-request-form-info
|
2013-12-30 23:27:02 +00:00
|
|
|
.form-group
|
2014-01-01 20:27:10 +00:00
|
|
|
= f.label :title, class: 'control-label' do
|
2013-07-17 12:48:22 +00:00
|
|
|
%strong= "Title *"
|
2014-01-01 20:11:18 +00:00
|
|
|
.col-sm-10= f.text_field :title, class: "form-control pad js-gfm-input", maxlength: 255, rows: 5, required: true
|
2013-12-30 23:27:02 +00:00
|
|
|
.form-group
|
2014-01-01 20:27:10 +00:00
|
|
|
= f.label :description, "Description", class: 'control-label'
|
|
|
|
.col-sm-10
|
2014-05-23 08:22:00 +00:00
|
|
|
= f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 14
|
|
|
|
.col-sm-12.hint
|
2014-05-28 13:58:02 +00:00
|
|
|
.pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
|
2014-06-03 07:56:40 +00:00
|
|
|
.pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
|
2014-05-23 08:22:00 +00:00
|
|
|
.clearfix
|
|
|
|
.error-alert
|
2014-05-08 12:40:02 +00:00
|
|
|
%hr
|
|
|
|
.form-group
|
|
|
|
.issue-assignee
|
|
|
|
= f.label :assignee_id, class: 'control-label' do
|
|
|
|
%i.icon-user
|
|
|
|
Assign to
|
|
|
|
.col-sm-10
|
|
|
|
= project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id)
|
|
|
|
|
2014-06-06 18:39:30 +00:00
|
|
|
= link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
|
2014-05-08 12:40:02 +00:00
|
|
|
.form-group
|
|
|
|
.issue-milestone
|
|
|
|
= f.label :milestone_id, class: 'control-label' do
|
|
|
|
%i.icon-time
|
|
|
|
Milestone
|
|
|
|
.col-sm-10= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2'})
|
|
|
|
|
2014-01-01 20:27:10 +00:00
|
|
|
|
2014-07-29 18:23:54 +00:00
|
|
|
.form-group
|
|
|
|
= f.label :label_ids, class: 'control-label' do
|
|
|
|
%i.icon-tag
|
|
|
|
Labels
|
|
|
|
.col-sm-10
|
|
|
|
= f.collection_select :label_ids, @merge_request.target_project.labels.all, :id, :name, { selected: @merge_request.label_ids }, multiple: true, class: 'select2'
|
2014-04-15 01:12:07 +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-07-16 21:14:03 +00:00
|
|
|
= f.submit 'Submit merge request', class: "btn btn-create"
|
2013-01-05 22:08:02 +00:00
|
|
|
-else
|
2013-07-16 21:14:03 +00:00
|
|
|
= f.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");
|
2014-05-08 12:52:59 +00:00
|
|
|
$('.assign-to-me-link').on('click', function(e){
|
|
|
|
$('#merge_request_assignee_id').val("#{current_user.id}").trigger("change");
|
|
|
|
e.preventDefault();
|
|
|
|
});
|
2014-04-15 01:12:07 +00:00
|
|
|
|
2014-05-23 08:22:00 +00:00
|
|
|
window.project_image_path_upload = "#{upload_image_project_path @project}";
|