diff options
Diffstat (limited to 'app/assets/javascripts/pages/users')
-rw-r--r-- | app/assets/javascripts/pages/users/activity_calendar.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pages/users/user_overview_block.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js index 94506d33b33..9e0af426f6e 100644 --- a/app/assets/javascripts/pages/users/activity_calendar.js +++ b/app/assets/javascripts/pages/users/activity_calendar.js @@ -1,8 +1,8 @@ import { select } from 'd3-selection'; -import dateFormat from 'dateformat'; import $ from 'jquery'; import { last } from 'lodash'; import createFlash from '~/flash'; +import dateFormat from '~/lib/dateformat'; import axios from '~/lib/utils/axios_utils'; import { getDayName, getDayDifference } from '~/lib/utils/datetime_utility'; import { formatDate } from '~/lib/utils/datetime/date_format_utility'; diff --git a/app/assets/javascripts/pages/users/user_overview_block.js b/app/assets/javascripts/pages/users/user_overview_block.js index a7c3c9d104d..8d2d66d812e 100644 --- a/app/assets/javascripts/pages/users/user_overview_block.js +++ b/app/assets/javascripts/pages/users/user_overview_block.js @@ -33,6 +33,7 @@ export default class UserOverviewBlock { const containerEl = document.querySelector(this.container); const contentList = containerEl.querySelector('.overview-content-list'); + // eslint-disable-next-line no-unsanitized/property contentList.innerHTML += html; const loadingEl = containerEl.querySelector('.loading'); |