Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
00c0a03d
Commit
00c0a03d
authored
Feb 18, 2021
by
Yogi
Committed by
Kushal Pandya
Feb 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new GitLab UI for learn more button in time tracking in MR sidebar
parent
59568fe2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
...vascripts/sidebar/components/time_tracking/help_state.vue
+5
-1
changelogs/unreleased/gl-button-time-tracking.yml
changelogs/unreleased/gl-button-time-tracking.yml
+5
-0
No files found.
app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
View file @
00c0a03d
<
script
>
<
script
>
/* eslint-disable vue/no-v-html */
/* eslint-disable vue/no-v-html */
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
joinPaths
}
from
'
~/lib/utils/url_utility
'
;
import
{
joinPaths
}
from
'
~/lib/utils/url_utility
'
;
import
{
sprintf
,
s__
}
from
'
../../../locale
'
;
import
{
sprintf
,
s__
}
from
'
../../../locale
'
;
export
default
{
export
default
{
name
:
'
TimeTrackingHelpState
'
,
name
:
'
TimeTrackingHelpState
'
,
components
:
{
GlButton
,
},
computed
:
{
computed
:
{
href
()
{
href
()
{
return
joinPaths
(
gon
.
relative_url_root
||
''
,
'
/help/user/project/time_tracking.md
'
);
return
joinPaths
(
gon
.
relative_url_root
||
''
,
'
/help/user/project/time_tracking.md
'
);
...
@@ -40,7 +44,7 @@ export default {
...
@@ -40,7 +44,7 @@ export default {
<p>
{{
__
(
'
Quick actions can be used in the issues description and comment boxes.
'
)
}}
</p>
<p>
{{
__
(
'
Quick actions can be used in the issues description and comment boxes.
'
)
}}
</p>
<p
v-html=
"estimateText"
></p>
<p
v-html=
"estimateText"
></p>
<p
v-html=
"spendText"
></p>
<p
v-html=
"spendText"
></p>
<
a
:href=
"href"
class=
"btn btn-default learn-more-button"
>
{{
__
(
'
Learn more
'
)
}}
</a
>
<
gl-button
:href=
"href"
>
{{
__
(
'
Learn more
'
)
}}
</gl-button
>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
changelogs/unreleased/gl-button-time-tracking.yml
0 → 100644
View file @
00c0a03d
---
title
:
Apply new GitLab UI for learn more button in time tracking
merge_request
:
54142
author
:
Yogi (@yo)
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment