diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-14 12:08:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-14 12:08:33 +0300 |
commit | c1e7698dff17b737299127ecf484443e676cdd4f (patch) | |
tree | d74d96b36db943f4ad072b8604d7c2e34c3ca43d /app/assets/javascripts/vue_merge_request_widget/stores | |
parent | b52c116c9929b21ab71703e50d140fe2c52f99be (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index 4cc2f423d73..8e3160ce2f2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -1,10 +1,11 @@ -import { format } from 'timeago.js'; import getStateKey from 'ee_else_ce/vue_merge_request_widget/stores/get_state_key'; import { statusBoxState } from '~/issuable/components/status_box.vue'; -import { formatDate } from '../../lib/utils/datetime_utility'; +import { formatDate, getTimeago } from '~/lib/utils/datetime_utility'; import { MTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY, MWPS_MERGE_STRATEGY } from '../constants'; import { stateKey } from './state_maps'; +const { format } = getTimeago(); + export default class MergeRequestStore { constructor(data) { this.sha = data.diff_head_sha; |