Commit ef04186f authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'move-help-state-vue-component' into 'master'

Move TimeTrackingHelpState vue component

See merge request gitlab-org/gitlab-ce!18319
parents 8e0e9d6d 93c55f58
<script>
import { sprintf, s__ } from '../../../locale';
export default {
name: 'time-tracking-help-state',
name: 'TimeTrackingHelpState',
props: {
rootPath: {
type: String,
......@@ -27,7 +28,10 @@ export default {
);
},
},
template: `
};
</script>
<template>
<div class="time-tracking-help-state">
<div class="time-tracking-info">
<h4>
......@@ -48,5 +52,4 @@ export default {
</a>
</div>
</div>
`,
};
</template>
<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: {
......
---
title: Move TimeTrackingHelpState vue component
merge_request: 18319
author: George Tsiolis
type: performance
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment