Add latest changes from gitlab-org/gitlab@master

2 files changed, 27 insertions, 1 deletions

diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb
index 8fbdb534b3d..f20c0aa3540 100644
--- a/spec/frontend/fixtures/merge_requests.rb
+++ b/spec/frontend/fixtures/merge_requests.rb
@@ -8,7 +8,23 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
   let(:admin) { create(:admin) }
   let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
   let(:project) { create(:project, :repository, namespace: namespace, path: 'merge-requests-project') }
-  let(:merge_request) { create(:merge_request, :with_diffs, source_project: project, target_project: project, description: '- [ ] Task List Item') }
+
+  # rubocop: disable Layout/TrailingWhitespace
+  let(:merge_request) do
+    create(
+      :merge_request,
+      :with_diffs,
+      source_project: project,
+      target_project: project,
+      description: <<~MARKDOWN.strip_heredoc
+      - [ ] Task List Item
+      - [ ]   
+      - [ ] Task List Item 2
+      MARKDOWN
+    )
+  end
+  # rubocop: enable Layout/TrailingWhitespace
+
   let(:merged_merge_request) { create(:merge_request, :merged, source_project: project, target_project: project) }
   let(:pipeline) do
     create(
diff --git a/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js b/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js
index be544435671..ca05461c8cf 100644
--- a/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js
+++ b/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js
@@ -51,6 +51,16 @@ describe('DateTimePicker', () => {
     });
   });
 
+  it('renders dropdown without a selectedTimeWindow set', done => {
+    createComponent({
+      selectedTimeWindow: {},
+    });
+    dateTimePicker.vm.$nextTick(() => {
+      expect(dateTimePicker.findAll('input').length).toBe(2);
+      done();
+    });
+  });
+
   it('renders inputs with h/m/s truncated if its all 0s', done => {
     createComponent({
       selectedTimeWindow: {