diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-09 16:09:42 +0530 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-12 15:29:26 +0530 |
commit | 5b28ee5f337a4b95273557553de9f500d7195fe6 (patch) | |
tree | 18254931c2aca45c409c93bef988958d2ed2847e /app/assets/javascripts/boards/components/board_sidebar.js | |
parent | 026c92d5fa82fac87386d5691c3d5b1e02f2eb5e (diff) | |
download | gitlab-ce-5b28ee5f337a4b95273557553de9f500d7195fe6.tar.gz |
Add time tracking information to Issue Boards sidebar
Add time tracking progress bar to Issue Boards sidebar.
Diffstat (limited to 'app/assets/javascripts/boards/components/board_sidebar.js')
-rw-r--r-- | app/assets/javascripts/boards/components/board_sidebar.js | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/app/assets/javascripts/boards/components/board_sidebar.js b/app/assets/javascripts/boards/components/board_sidebar.js index e637e1f1223..3c683e88cf3 100644 --- a/app/assets/javascripts/boards/components/board_sidebar.js +++ b/app/assets/javascripts/boards/components/board_sidebar.js @@ -2,18 +2,19 @@ import $ from 'jquery'; import Vue from 'vue'; -import Flash from '../../flash'; -import { sprintf, __ } from '../../locale'; -import Sidebar from '../../right_sidebar'; -import eventHub from '../../sidebar/event_hub'; -import AssigneeTitle from '../../sidebar/components/assignees/assignee_title.vue'; -import Assignees from '../../sidebar/components/assignees/assignees.vue'; -import DueDateSelectors from '../../due_date_select'; +import Flash from '~/flash'; +import { sprintf, __ } from '~/locale'; +import Sidebar from '~/right_sidebar'; +import eventHub from '~/sidebar/event_hub'; +import DueDateSelectors from '~/due_date_select'; +import IssuableContext from '~/issuable_context'; +import LabelsSelect from '~/labels_select'; +import AssigneeTitle from '~/sidebar/components/assignees/assignee_title.vue'; +import Assignees from '~/sidebar/components/assignees/assignees.vue'; +import Subscriptions from '~/sidebar/components/subscriptions/subscriptions.vue'; +import TimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue'; +import MilestoneSelect from '~/milestone_select'; import RemoveBtn from './sidebar/remove_issue.vue'; -import IssuableContext from '../../issuable_context'; -import LabelsSelect from '../../labels_select'; -import Subscriptions from '../../sidebar/components/subscriptions/subscriptions.vue'; -import MilestoneSelect from '../../milestone_select'; import boardsStore from '../stores/boards_store'; export default Vue.extend({ @@ -22,6 +23,7 @@ export default Vue.extend({ Assignees, RemoveBtn, Subscriptions, + TimeTracker, }, props: { currentUser: { |