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
1d8ae6c4
Commit
1d8ae6c4
authored
Sep 21, 2018
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update popover URL to point to help page of same domain
parent
3d1daf1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
4 deletions
+17
-4
ee/app/assets/javascripts/epics/sidebar/components/sidebar_date_picker.vue
...ascripts/epics/sidebar/components/sidebar_date_picker.vue
+10
-2
ee/spec/javascripts/epics/sidebar/components/sidebar_date_picker_spec.js
...ipts/epics/sidebar/components/sidebar_date_picker_spec.js
+7
-2
No files found.
ee/app/assets/javascripts/epics/sidebar/components/sidebar_date_picker.vue
View file @
1d8ae6c4
...
...
@@ -121,7 +121,11 @@ export default {
return
this
.
getPopoverConfig
({
title
:
s__
(
'
Epics|These dates affect how your epics appear in the roadmap. Dates from milestones come from the milestones assigned to issues in the epic. You can also set fixed dates or remove them entirely.
'
),
content
:
`
<a href="https://docs.gitlab.com/ee/user/group/epics/#Dates">
${
s__
(
'
Epics|More information
'
)}
</a>
<a
href="
${
gon
.
gitlab_url
}
/help/user/group/epics/index.md#planned-start-date-and-planned-finish-date"
target="_blank"
rel="noopener noreferrer"
>
${
s__
(
'
Epics|More information
'
)}
</a>
`
,
});
},
...
...
@@ -129,7 +133,11 @@ export default {
return
this
.
getPopoverConfig
({
title
:
this
.
dateInvalidTooltip
,
content
:
`
<a href="https://docs.gitlab.com/ee/user/group/epics/#Dates">
${
s__
(
'
Epics|How can I solve this?
'
)}
</a>
<a
href="
${
gon
.
gitlab_url
}
/help/user/group/epics/index.md#planned-start-date-and-planned-finish-date"
target="_blank"
rel="noopener noreferrer"
>
${
s__
(
'
Epics|How can I solve this?
'
)}
</a>
`
,
});
},
...
...
ee/spec/javascripts/epics/sidebar/components/sidebar_date_picker_spec.js
View file @
1d8ae6c4
...
...
@@ -11,6 +11,7 @@ const createComponent = (datePickerProps = mockDatePickerProps) => {
};
describe
(
'
SidebarParticipants
'
,
()
=>
{
window
.
gon
=
{
gitlab_url
:
gl
.
TEST_HOST
};
let
vm
;
beforeEach
(()
=>
{
...
...
@@ -102,7 +103,9 @@ describe('SidebarParticipants', () => {
});
it
(
'
returns popover config object containing `content` with href pointing to correct documentation
'
,
()
=>
{
expect
(
vm
.
popoverOptions
.
content
.
trim
()).
toBe
(
'
<a href="https://docs.gitlab.com/ee/user/group/epics/#Dates">More information</a>
'
);
const
hrefContent
=
vm
.
popoverOptions
.
content
.
trim
();
expect
(
hrefContent
).
toContain
(
`
${
gon
.
gitlab_url
}
/help/user/group/epics/index.md#planned-start-date-and-planned-finish-date`
);
expect
(
hrefContent
).
toContain
(
'
More information
'
);
});
});
...
...
@@ -112,7 +115,9 @@ describe('SidebarParticipants', () => {
});
it
(
'
returns popover config object containing `content` with href pointing to correct documentation
'
,
()
=>
{
expect
(
vm
.
dateInvalidPopoverOptions
.
content
.
trim
()).
toBe
(
'
<a href="https://docs.gitlab.com/ee/user/group/epics/#Dates">How can I solve this?</a>
'
);
const
hrefContent
=
vm
.
dateInvalidPopoverOptions
.
content
.
trim
();
expect
(
hrefContent
).
toContain
(
`
${
gon
.
gitlab_url
}
/help/user/group/epics/index.md#planned-start-date-and-planned-finish-date`
);
expect
(
hrefContent
).
toContain
(
'
How can I solve this?
'
);
});
});
});
...
...
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