diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-12 17:15:52 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-12 17:15:52 +0000 |
| commit | e1838980c6efaafe4b590a20d54dfdc420b2c7e2 (patch) | |
| tree | ebdc6d31b20fbee24d6af98cf68ef0a173fed401 /app/views/projects | |
| parent | a5cb6b0b83477e2722432cd21974e9a7d42a62e5 (diff) | |
| parent | 400a1ae04d28388e7dfbd7c03db857d58a7d8776 (diff) | |
| download | gitlab-ce-e1838980c6efaafe4b590a20d54dfdc420b2c7e2.tar.gz | |
Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master'
Fix quick submit missing in edit merge request page
closes #14953
See merge request !3601
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 3e4ab09c6d4..1e6724fc92b 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' } do |f| += 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| = render 'shared/issuable/form', f: f, issuable: @merge_request :javascript |