From d4633b0e70ec39583ce0b13f277f990b216ac0d9 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 27 Sep 2019 21:06:33 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../javascripts/lib/utils/datetime_utility.js       |  8 ++++++--
 app/views/admin/runners/index.html.haml             |  2 +-
 spec/frontend/lib/utils/datetime_utility_spec.js    | 13 +++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index f0d39fa7149..cb70837f9e9 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -555,5 +555,9 @@ export const calculateRemainingMilliseconds = endDate => {
  * @param {number} daysInPast number of days that are subtracted from a given date
  * @returns {String} Date string in ISO format
  */
-export const getDateInPast = (date, daysInPast) =>
-  new Date(date.setTime(date.getTime() - daysInPast * 24 * 60 * 60 * 1000)).toISOString();
+export const getDateInPast = (date, daysInPast) => {
+  const dateClone = newDate(date);
+  return new Date(
+    dateClone.setTime(dateClone.getTime() - daysInPast * 24 * 60 * 60 * 1000),
+  ).toISOString();
+};
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 76af4189b5b..545e53e6b09 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -43,7 +43,7 @@
 .row
   .col-sm-9
     = form_tag admin_runners_path, id: 'runners-search', method: :get, class: 'filter-form js-filter-form' do
-      .filtered-search-wrapper
+      .filtered-search-wrapper.d-flex
         .filtered-search-box
           = dropdown_tag(custom_icon('icon_history'),
             options: { wrapper_class: 'filtered-search-history-dropdown-wrapper',
diff --git a/spec/frontend/lib/utils/datetime_utility_spec.js b/spec/frontend/lib/utils/datetime_utility_spec.js
index 80d1dff676b..e2e71229320 100644
--- a/spec/frontend/lib/utils/datetime_utility_spec.js
+++ b/spec/frontend/lib/utils/datetime_utility_spec.js
@@ -428,11 +428,16 @@ describe('newDate', () => {
 });
 
 describe('getDateInPast', () => {
-  it('returns the correct date in the past', () => {
-    const date = new Date(1563235200000); // 2019-07-16T00:00:00.00Z
-    const daysInPast = 90;
-    const dateInPast = datetimeUtility.getDateInPast(date, daysInPast);
+  const date = new Date(1563235200000); // 2019-07-16T00:00:00.000Z;
+  const daysInPast = 90;
 
+  it('returns the correct date in the past', () => {
+    const dateInPast = datetimeUtility.getDateInPast(date, daysInPast);
     expect(dateInPast).toBe('2019-04-17T00:00:00.000Z');
   });
+
+  it('does not modifiy the original date', () => {
+    datetimeUtility.getDateInPast(date, daysInPast);
+    expect(date).toStrictEqual(new Date(1563235200000));
+  });
 });