diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-12 13:24:07 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-12 13:24:07 +0300 |
| commit | ef04186fe38b5c9a043dede03d460f083c5047ef (patch) | |
| tree | 02b5f15e2b04a126e79f076d5824bf0be66f7044 /app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue | |
| parent | 8e0e9d6dd5b8c283d16bd447ee052203590a391a (diff) | |
| parent | 93c55f5858a809414e884006f9bb3a7b4d1a55f4 (diff) | |
Merge branch 'move-help-state-vue-component' into 'master'
Move TimeTrackingHelpState vue component
See merge request gitlab-org/gitlab-ce!18319
Diffstat (limited to 'app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue index fb280f42a9e..71dca498b3d 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -1,5 +1,5 @@ <script> -import timeTrackingHelpState from './help_state'; +import TimeTrackingHelpState from './help_state.vue'; import TimeTrackingCollapsedState from './collapsed_state.vue'; import timeTrackingSpentOnlyPane from './spent_only_pane'; import timeTrackingNoTrackingPane from './no_tracking_pane'; @@ -16,7 +16,7 @@ export default { 'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane, 'time-tracking-no-tracking-pane': timeTrackingNoTrackingPane, TimeTrackingComparisonPane, - 'time-tracking-help-state': timeTrackingHelpState, + TimeTrackingHelpState, }, props: { time_estimate: { |