Add latest changes from gitlab-org/gitlab@master

3 files changed, 48 insertions, 54 deletions

diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml
index 259e96901fd..a6302569187 100644
--- a/app/views/groups/milestones/_form.html.haml
+++ b/app/views/groups/milestones/_form.html.haml
@@ -1,25 +1,23 @@
 = form_for [@group, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f|
   = form_errors(@milestone)
-  .row
-    .col-md-6
-      .form-group.row
-        .col-form-label.col-sm-2
-          = f.label :title, _("Title")
-        .col-sm-10
-          = f.text_field :title, maxlength: 255, class: "form-control", data: { qa_selector: "milestone_title_field" }, required: true, autofocus: true
-      .form-group.row.milestone-description
-        .col-form-label.col-sm-2
-          = f.label :description, _("Description")
-        .col-sm-10
-          = render layout: 'shared/md_preview', locals: { url: group_preview_markdown_path } do
-            = render 'shared/zen', f: f, attr: :description,
-                                    classes: 'note-textarea',
-                                    qa_selector: 'milestone_description_field',
-                                    supports_autocomplete: true,
-                                    placeholder: _('Write milestone description...')
-          .clearfix
-          .error-alert
-    = render "shared/milestones/form_dates", f: f
+  .form-group.row
+    .col-form-label.col-sm-2
+      = f.label :title, _("Title")
+    .col-sm-10
+      = f.text_field :title, maxlength: 255, class: "form-control", data: { qa_selector: "milestone_title_field" }, required: true, autofocus: true
+  = render "shared/milestones/form_dates", f: f
+  .form-group.row.milestone-description
+    .col-form-label.col-sm-2
+      = f.label :description, _("Description")
+    .col-sm-10
+      = render layout: 'shared/md_preview', locals: { url: group_preview_markdown_path } do
+        = render 'shared/zen', f: f, attr: :description,
+                                classes: 'note-textarea',
+                                qa_selector: 'milestone_description_field',
+                                supports_autocomplete: true,
+                                placeholder: _('Write milestone description...')
+      .clearfix
+      .error-alert
 
   .form-actions
     - if @milestone.new_record?
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index dfb9defb91c..5f2057df4aa 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -1,27 +1,25 @@
 = form_for [@project, @milestone],
            html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f|
   = form_errors(@milestone)
-  .row
-    .col-md-6
-      .form-group.row
-        .col-form-label.col-sm-2
-          = f.label :title, _('Title')
-        .col-sm-10
-          = f.text_field :title, maxlength: 255, class: 'form-control gl-form-input', data: { qa_selector: 'milestone_title_field' }, required: true, autofocus: true
-      .form-group.row.milestone-description
-        .col-form-label.col-sm-2
-          = f.label :description, _('Description')
-        .col-sm-10
-          = render layout: 'shared/md_preview', locals: { url: preview_markdown_path(@project) } do
-            = render 'shared/zen', f: f, attr: :description,
-                                    classes: 'note-textarea',
-                                    qa_selector: 'milestone_description_field',
-                                    supports_autocomplete: true,
-                                    placeholder: _('Write milestone description...')
-            = render 'shared/notes/hints'
-          .clearfix
-          .error-alert
-    = render 'shared/milestones/form_dates', f: f
+  .form-group.row
+    .col-form-label.col-sm-2
+      = f.label :title, _('Title')
+    .col-sm-10
+      = f.text_field :title, maxlength: 255, class: 'form-control gl-form-input', data: { qa_selector: 'milestone_title_field' }, required: true, autofocus: true
+  = render 'shared/milestones/form_dates', f: f
+  .form-group.row.milestone-description
+    .col-form-label.col-sm-2
+      = f.label :description, _('Description')
+    .col-sm-10
+      = render layout: 'shared/md_preview', locals: { url: preview_markdown_path(@project) } do
+        = render 'shared/zen', f: f, attr: :description,
+                                classes: 'note-textarea',
+                                qa_selector: 'milestone_description_field',
+                                supports_autocomplete: true,
+                                placeholder: _('Write milestone description...')
+        = render 'shared/notes/hints'
+      .clearfix
+      .error-alert
 
   .form-actions
     - if @milestone.new_record?
diff --git a/app/views/shared/milestones/_form_dates.html.haml b/app/views/shared/milestones/_form_dates.html.haml
index e0664c1feba..7a41e381a96 100644
--- a/app/views/shared/milestones/_form_dates.html.haml
+++ b/app/views/shared/milestones/_form_dates.html.haml
@@ -1,13 +1,11 @@
-.col-md-6
-  .form-group.row
-    .col-form-label.col-sm-2
-      = f.label :start_date, _('Start Date')
-    .col-sm-10
-      = f.text_field :start_date, class: "datepicker form-control gl-form-input", data: { qa_selector: "start_date_field" }, placeholder: _('Select start date'), autocomplete: 'off'
-      %a.inline.float-right.gl-mt-2.js-clear-start-date{ href: "#" }= _('Clear start date')
-  .form-group.row
-    .col-form-label.col-sm-2
-      = f.label :due_date, _('Due Date')
-    .col-sm-10
-      = f.text_field :due_date, class: "datepicker form-control gl-form-input", data: { qa_selector: "due_date_field" }, placeholder: _('Select due date'), autocomplete: 'off'
-      %a.inline.float-right.gl-mt-2.js-clear-due-date{ href: "#" }= _('Clear due date')
+.form-group.row
+  .col-form-label.col-sm-2
+    = f.label :start_date, _('Start Date')
+  .col-sm-4
+    = f.text_field :start_date, class: "datepicker form-control gl-form-input", data: { qa_selector: "start_date_field" }, placeholder: _('Select start date'), autocomplete: 'off'
+    %a.inline.float-right.gl-mt-2.js-clear-start-date{ href: "#" }= _('Clear start date')
+  .col-form-label.col-sm-2
+    = f.label :due_date, _('Due Date')
+  .col-sm-4
+    = f.text_field :due_date, class: "datepicker form-control gl-form-input", data: { qa_selector: "due_date_field" }, placeholder: _('Select due date'), autocomplete: 'off'
+    %a.inline.float-right.gl-mt-2.js-clear-due-date{ href: "#" }= _('Clear due date')