diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-28 00:06:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-28 00:06:33 +0300 |
| commit | d4633b0e70ec39583ce0b13f277f990b216ac0d9 (patch) | |
| tree | cd2625006dc8ad708cc870bfbb7d0c3f4df76987 /app | |
| parent | 2abb1b54c0305b359b178d6660810e865f619c22 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js | 8 | ||||
| -rw-r--r-- | app/views/admin/runners/index.html.haml | 2 |
2 files changed, 7 insertions, 3 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', |