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
9d7087d4
Commit
9d7087d4
authored
May 19, 2020
by
Ammar Alakkad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix time_tracking help link
parent
a22347cc
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
14 deletions
+9
-14
app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
...vascripts/sidebar/components/time_tracking/help_state.vue
+2
-7
app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
...scripts/sidebar/components/time_tracking/time_tracker.vue
+1
-5
app/assets/javascripts/sidebar/mount_milestone_sidebar.js
app/assets/javascripts/sidebar/mount_milestone_sidebar.js
+0
-1
changelogs/unreleased/aalakkad-fix-time-tracking-help-link.yml
...elogs/unreleased/aalakkad-fix-time-tracking-help-link.yml
+5
-0
spec/support/shared_examples/quick_actions/issuable/time_tracking_quick_action_shared_examples.rb
...ns/issuable/time_tracking_quick_action_shared_examples.rb
+1
-1
No files found.
app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
View file @
9d7087d4
<
script
>
<
script
>
import
{
sprintf
,
s__
}
from
'
../../../locale
'
;
import
{
sprintf
,
s__
}
from
'
../../../locale
'
;
import
{
joinPaths
}
from
'
~/lib/utils/url_utility
'
;
export
default
{
export
default
{
name
:
'
TimeTrackingHelpState
'
,
name
:
'
TimeTrackingHelpState
'
,
props
:
{
rootPath
:
{
type
:
String
,
required
:
true
,
},
},
computed
:
{
computed
:
{
href
()
{
href
()
{
return
`
${
this
.
rootPath
}
help/workflow/time_tracking.md`
;
return
joinPaths
(
gon
.
relative_url_root
||
''
,
'
/help/user/project/time_tracking.md
'
)
;
},
},
estimateText
()
{
estimateText
()
{
return
sprintf
(
return
sprintf
(
...
...
app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
View file @
9d7087d4
...
@@ -42,10 +42,6 @@ export default {
...
@@ -42,10 +42,6 @@ export default {
default
:
false
,
default
:
false
,
required
:
false
,
required
:
false
,
},
},
rootPath
:
{
type
:
String
,
required
:
true
,
},
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -137,7 +133,7 @@ export default {
...
@@ -137,7 +133,7 @@ export default {
:limit-to-hours=
"limitToHours"
:limit-to-hours=
"limitToHours"
/>
/>
<transition
name=
"help-state-toggle"
>
<transition
name=
"help-state-toggle"
>
<time-tracking-help-state
v-if=
"showHelpState"
:root-path=
"rootPath"
/>
<time-tracking-help-state
v-if=
"showHelpState"
/>
</transition>
</transition>
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/sidebar/mount_milestone_sidebar.js
View file @
9d7087d4
...
@@ -24,7 +24,6 @@ export default class SidebarMilestone {
...
@@ -24,7 +24,6 @@ export default class SidebarMilestone {
humanTimeEstimate
,
humanTimeEstimate
,
humanTimeSpent
,
humanTimeSpent
,
limitToHours
:
parseBoolean
(
limitToHours
),
limitToHours
:
parseBoolean
(
limitToHours
),
rootPath
:
'
/
'
,
},
},
}),
}),
});
});
...
...
changelogs/unreleased/aalakkad-fix-time-tracking-help-link.yml
0 → 100644
View file @
9d7087d4
---
title
:
Fix time_tracking help link
merge_request
:
32552
author
:
type
:
fixed
spec/support/shared_examples/quick_actions/issuable/time_tracking_quick_action_shared_examples.rb
View file @
9d7087d4
...
@@ -86,7 +86,7 @@ RSpec.shared_examples 'issuable time tracker' do |issuable_type|
...
@@ -86,7 +86,7 @@ RSpec.shared_examples 'issuable time tracker' do |issuable_type|
page
.
within
'.time-tracking-component-wrap'
do
page
.
within
'.time-tracking-component-wrap'
do
find
(
'.help-button'
).
click
find
(
'.help-button'
).
click
expect
(
find_link
(
'Learn more'
)[
:href
]).
to
have_content
(
'/help/
workflow
/time_tracking.md'
)
expect
(
find_link
(
'Learn more'
)[
:href
]).
to
have_content
(
'/help/
user/project
/time_tracking.md'
)
end
end
end
end
end
end
...
...
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