diff options
author | Phil Hughes <me@iamphill.com> | 2018-05-02 17:08:33 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-05-02 17:08:33 +0300 |
commit | 850a6c65b1a4a76b7b31d88e499ce61af7ceb27f (patch) | |
tree | 69ffbcf82bd5313fb8eea7fab0f361f517161fcd | |
parent | 75f6e91fcde12029068f48b6b7fb3fd13a612c61 (diff) | |
parent | 24e290e127aee23b6ad7f52b6944b4364521431f (diff) |
Merge branch 'refactor/move-no-tracking-pane-vue-component' into 'master'
Move TimeTrackingNoTrackingPane vue component
See merge request gitlab-org/gitlab-ce!18676
4 files changed, 20 insertions, 12 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.js b/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.js deleted file mode 100644 index 38da76c6771..00000000000 --- a/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.js +++ /dev/null @@ -1,10 +0,0 @@ -export default { - name: 'time-tracking-no-tracking-pane', - template: ` - <div class="time-tracking-no-tracking-pane"> - <span class="no-value"> - {{ __('No estimate or time spent') }} - </span> - </div> - `, -}; diff --git a/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue new file mode 100644 index 00000000000..9228184df5b --- /dev/null +++ b/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue @@ -0,0 +1,13 @@ +<script> +export default { + name: 'TimeTrackingNoTrackingPane', +}; +</script> + +<template> + <div class="time-tracking-no-tracking-pane"> + <span class="no-value"> + {{ __('No estimate or time spent') }} + </span> + </div> +</template> 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 71dca498b3d..9c003aa9f8a 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -2,7 +2,7 @@ import TimeTrackingHelpState from './help_state.vue'; import TimeTrackingCollapsedState from './collapsed_state.vue'; import timeTrackingSpentOnlyPane from './spent_only_pane'; -import timeTrackingNoTrackingPane from './no_tracking_pane'; +import TimeTrackingNoTrackingPane from './no_tracking_pane.vue'; import TimeTrackingEstimateOnlyPane from './estimate_only_pane.vue'; import TimeTrackingComparisonPane from './comparison_pane.vue'; @@ -14,7 +14,7 @@ export default { TimeTrackingCollapsedState, TimeTrackingEstimateOnlyPane, 'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane, - 'time-tracking-no-tracking-pane': timeTrackingNoTrackingPane, + TimeTrackingNoTrackingPane, TimeTrackingComparisonPane, TimeTrackingHelpState, }, diff --git a/changelogs/unreleased/refactor-move-no-tracking-pane-vue-component.yml b/changelogs/unreleased/refactor-move-no-tracking-pane-vue-component.yml new file mode 100644 index 00000000000..4bb088a1e58 --- /dev/null +++ b/changelogs/unreleased/refactor-move-no-tracking-pane-vue-component.yml @@ -0,0 +1,5 @@ +--- +title: Move TimeTrackingNoTrackingPane vue component +merge_request: 18676 +author: George Tsiolis +type: performance |