diff options
author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-09-20 18:06:35 +0400 |
---|---|---|
committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-09-22 23:24:25 +0400 |
commit | 705fe01dca32f1666731712fab3a890f15c71152 (patch) | |
tree | 105aad757d9f9055728d53940e306a4325a73e5a /app/views/projects/merge_requests | |
parent | 248990b5e8e169d7c48adb539980a9db6cea4eca (diff) |
Factor issue and edit MR form label field and submit.
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 8ad47724fe7..dafd7385f6e 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -8,27 +8,8 @@ Please review the %strong #{link_to "guidelines for contribution", contribution_guide_url} to this repository. - .merge-request-form-info = render 'projects/issuable_form', f: f, issuable: @merge_request - .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' - - .form-actions - - if @merge_request.new_record? - = f.submit 'Submit merge request', class: "btn btn-create" - -else - = f.submit 'Save changes', class: "btn btn-save" - - if @merge_request.new_record? - = link_to project_merge_requests_path(@source_project), class: "btn btn-cancel" do - Cancel - - else - = link_to project_merge_request_path(@target_project, @merge_request), class: "btn btn-cancel" do - Cancel :javascript disableButtonIfEmptyField("#merge_request_title", ".btn-save"); |