diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-05 10:39:16 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-14 10:28:05 +0100 |
| commit | c45ca936c77eceff367e27e1bf8fd5f11c6a7c39 (patch) | |
| tree | 9fcf795f970ae039b2734c13a30bf587195991ff | |
| parent | ff7fb09ea80036045e6fd17624b894f389de38b9 (diff) | |
| download | gitlab-ce-c45ca936c77eceff367e27e1bf8fd5f11c6a7c39.tar.gz | |
merge request form uses new GLForm
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 6efbe214aad..d02e1130704 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -40,7 +40,7 @@ class Dispatcher when 'projects:merge_requests:new', 'projects:merge_requests:edit' new Diff() shortcut_handler = new ShortcutsNavigation() - new DropzoneInput($('.merge-request-form')) + new GLForm($('.merge-request-form')) new IssuableForm($('.merge-request-form')) when 'projects:tags:new' new ZenMode() diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 1e6724fc92b..88525f4036a 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -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 :javascript diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index 9e59f7df71b..2f14a91e64f 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -10,7 +10,7 @@ %span.pull-right = link_to 'Change branches', mr_change_branches_path(@merge_request) %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 = f.hidden_field :source_project_id = f.hidden_field :source_branch |