diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-02-12 13:09:53 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-02-12 13:09:53 +0100 |
| commit | 14a9c951cc5baf14d5bbef7fa09782dd79d811c1 (patch) | |
| tree | 00944da0c6e912a59af51bfdb2046fe92d25ef72 /app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js | |
| parent | 6c7422fbcc5f9e5ddc0ebf7be52b952cd15d1d51 (diff) | |
| parent | 7611ec4eef7d543b9e32894a015c5b0a4c5caeec (diff) | |
| download | gitlab-ce-14a9c951cc5baf14d5bbef7fa09782dd79d811c1.tar.gz | |
Merge branch 'master' into backstage/gb/build-stages-catch-up-migration
* master: (26 commits)
Diffstat (limited to 'app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js index d32fe4abc7d..782e4ba4fad 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js +++ b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js @@ -2,7 +2,7 @@ import _ from 'underscore'; import '~/smart_interval'; -import timeTracker from './time_tracker'; +import IssuableTimeTracker from './time_tracker.vue'; import Store from '../../stores/sidebar_store'; import Mediator from '../../sidebar_mediator'; @@ -16,7 +16,7 @@ export default { }; }, components: { - 'issuable-time-tracker': timeTracker, + IssuableTimeTracker, }, methods: { listenForQuickActions() { |