diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/sidebar | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/sidebar')
3 files changed, 3 insertions, 13 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue index 51cd5810ac0..67abde0c22a 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue @@ -1,17 +1,12 @@ <script> import { sprintf, s__ } from '../../../locale'; +import { joinPaths } from '~/lib/utils/url_utility'; export default { name: 'TimeTrackingHelpState', - props: { - rootPath: { - type: String, - required: true, - }, - }, computed: { href() { - return `${this.rootPath}help/workflow/time_tracking.md`; + return joinPaths(gon.relative_url_root || '', '/help/user/project/time_tracking.md'); }, estimateText() { return sprintf( 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 1e8a31fff81..5cf574e1387 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -42,10 +42,6 @@ export default { default: false, required: false, }, - rootPath: { - type: String, - required: true, - }, }, data() { return { @@ -137,7 +133,7 @@ export default { :limit-to-hours="limitToHours" /> <transition name="help-state-toggle"> - <time-tracking-help-state v-if="showHelpState" :root-path="rootPath" /> + <time-tracking-help-state v-if="showHelpState" /> </transition> </div> </div> diff --git a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js index d934463382f..0f5f8f2b53b 100644 --- a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js +++ b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js @@ -24,7 +24,6 @@ export default class SidebarMilestone { humanTimeEstimate, humanTimeSpent, limitToHours: parseBoolean(limitToHours), - rootPath: '/', }, }), }); |