Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-11 21:08:42 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-11 21:08:42 +0300
commit48e26d30fd251f87a2e136d8997ef2ec35859e71 (patch)
treef9b06f597bbb41de351454544971c6a01a7a7116 /app/assets/javascripts/sidebar
parent3d6d338697a186496eecffc43a389106bfd60527 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r--app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue2
1 files changed, 1 insertions, 1 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 67a8f11b760..a2fb0ebcbc6 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
@@ -106,7 +106,7 @@ export default {
<div class="title hide-collapsed">
{{ __('Time tracking') }}
<div v-if="!showHelpState" class="help-button float-right" @click="toggleHelpState(true)">
- <i class="fa fa-question-circle" aria-hidden="true"> </i>
+ <gl-icon name="question-o" />
</div>
<div
v-if="showHelpState"