merge request form uses new GLForm
This commit is contained in:
parent
ff7fb09ea8
commit
c45ca936c7
|
@ -40,7 +40,7 @@ class Dispatcher
|
||||||
when 'projects:merge_requests:new', 'projects:merge_requests:edit'
|
when 'projects:merge_requests:new', 'projects:merge_requests:edit'
|
||||||
new Diff()
|
new Diff()
|
||||||
shortcut_handler = new ShortcutsNavigation()
|
shortcut_handler = new ShortcutsNavigation()
|
||||||
new DropzoneInput($('.merge-request-form'))
|
new GLForm($('.merge-request-form'))
|
||||||
new IssuableForm($('.merge-request-form'))
|
new IssuableForm($('.merge-request-form'))
|
||||||
when 'projects:tags:new'
|
when 'projects:tags:new'
|
||||||
new ZenMode()
|
new ZenMode()
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input js-quick-submit' } do |f|
|
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal common-note-form js-requires-input js-quick-submit' } do |f|
|
||||||
= render 'shared/issuable/form', f: f, issuable: @merge_request
|
= render 'shared/issuable/form', f: f, issuable: @merge_request
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
%span.pull-right
|
%span.pull-right
|
||||||
= link_to 'Change branches', mr_change_branches_path(@merge_request)
|
= link_to 'Change branches', mr_change_branches_path(@merge_request)
|
||||||
%hr
|
%hr
|
||||||
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input' } do |f|
|
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal common-note-form js-requires-input' } do |f|
|
||||||
= render 'shared/issuable/form', f: f, issuable: @merge_request
|
= render 'shared/issuable/form', f: f, issuable: @merge_request
|
||||||
= f.hidden_field :source_project_id
|
= f.hidden_field :source_project_id
|
||||||
= f.hidden_field :source_branch
|
= f.hidden_field :source_branch
|
||||||
|
|
Loading…
Reference in New Issue