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
9b391b99
Commit
9b391b99
authored
Nov 05, 2020
by
Jackie Fraser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use help_page_path for PipelineTourSuccessModal
parent
3dece468
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
app/assets/javascripts/blob/pipeline_tour_success_modal.vue
app/assets/javascripts/blob/pipeline_tour_success_modal.vue
+10
-4
app/views/projects/blob/_pipeline_tour_success.html.haml
app/views/projects/blob/_pipeline_tour_success.html.haml
+2
-0
spec/frontend/blob/pipeline_tour_success_mock_data.js
spec/frontend/blob/pipeline_tour_success_mock_data.js
+2
-0
spec/frontend/blob/pipeline_tour_success_modal_spec.js
spec/frontend/blob/pipeline_tour_success_modal_spec.js
+1
-1
No files found.
app/assets/javascripts/blob/pipeline_tour_success_modal.vue
View file @
9b391b99
...
...
@@ -9,8 +9,6 @@ const trackingMixin = Tracking.mixin();
export
default
{
beginnerLink
:
'
https://about.gitlab.com/blog/2018/01/22/a-beginners-guide-to-continuous-integration/
'
,
exampleLink
:
'
https://docs.gitlab.com/ee/ci/examples/
'
,
codeQualityLink
:
'
https://docs.gitlab.com/ee/user/project/merge_requests/code_quality.html
'
,
goToTrackValuePipelines
:
10
,
goToTrackValueMergeRequest
:
20
,
trackEvent
:
'
click_button
'
,
...
...
@@ -39,6 +37,14 @@ export default {
type
:
String
,
required
:
true
,
},
exampleLink
:
{
type
:
String
,
required
:
true
,
},
codeQualityLink
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
return
{
...
...
@@ -93,7 +99,7 @@ export default {
<p>
<gl-sprintf
:message=
"$options.i18n.bodyMessage"
>
<
template
#codeQualityLink=
"{content}"
>
<gl-link
:href=
"
$options.
codeQualityLink"
target=
"_blank"
class=
"font-size-inherit"
>
{{
<gl-link
:href=
"codeQualityLink"
target=
"_blank"
class=
"font-size-inherit"
>
{{
content
}}
</gl-link>
</
template
>
...
...
@@ -106,7 +112,7 @@ export default {
</gl-link>
</
template
>
<
template
#exampleLink=
"{content}"
>
<gl-link
:href=
"
$options.
exampleLink"
target=
"_blank"
>
<gl-link
:href=
"exampleLink"
target=
"_blank"
>
{{
content
}}
</gl-link>
</
template
>
...
...
app/views/projects/blob/_pipeline_tour_success.html.haml
View file @
9b391b99
.js-success-pipeline-modal
{
data:
{
'commit-cookie'
:
suggest_pipeline_commit_cookie_name
,
'go-to-pipelines-path'
:
project_pipelines_path
(
@project
),
'project-merge-requests-path'
:
project_merge_requests_path
(
@project
),
'example-link'
:
help_page_path
(
'ci/examples/README.md'
,
anchor:
'gitlab-cicd-examples'
),
'code-quality-link'
:
help_page_path
(
'user/project/merge_requests/code_quality'
),
'human-access'
:
@project
.
team
.
human_max_access
(
current_user
&
.
id
)
}
}
spec/frontend/blob/pipeline_tour_success_mock_data.js
View file @
9b391b99
...
...
@@ -3,6 +3,8 @@ const modalProps = {
projectMergeRequestsPath
:
'
some_mr_path
'
,
commitCookie
:
'
some_cookie
'
,
humanAccess
:
'
maintainer
'
,
exampleLink
:
'
/example
'
,
codeQualityLink
:
'
/code-quality-link
'
,
};
export
default
modalProps
;
spec/frontend/blob/pipeline_tour_success_modal_spec.js
View file @
9b391b99
...
...
@@ -75,7 +75,7 @@ describe('PipelineTourSuccessModal', () => {
});
it
(
'
renders the link for codeQualityLink
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlLink
).
attributes
(
'
href
'
)).
toBe
(
wrapper
.
vm
.
$options
.
codeQualityLink
);
expect
(
wrapper
.
find
(
GlLink
).
attributes
(
'
href
'
)).
toBe
(
'
/code-quality-link
'
);
});
it
(
'
calls to remove cookie
'
,
()
=>
{
...
...
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