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
e14c4962
Commit
e14c4962
authored
Mar 04, 2020
by
Dave Pisek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused pipeline-help-path from sec config
This commit removes redundant logic around a help link from the FE.
parent
c3935123
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
23 deletions
+7
-23
ee/app/assets/javascripts/security_configuration/components/app.vue
...ets/javascripts/security_configuration/components/app.vue
+1
-13
ee/app/assets/javascripts/security_configuration/index.js
ee/app/assets/javascripts/security_configuration/index.js
+0
-2
ee/spec/frontend/security_configuration/components/app_spec.js
...ec/frontend/security_configuration/components/app_spec.js
+6
-8
No files found.
ee/app/assets/javascripts/security_configuration/components/app.vue
View file @
e14c4962
...
...
@@ -18,10 +18,6 @@ export default {
type
:
String
,
required
:
true
,
},
pipelinesHelpPagePath
:
{
type
:
String
,
required
:
true
,
},
autoDevopsHelpPagePath
:
{
type
:
String
,
required
:
true
,
...
...
@@ -44,15 +40,7 @@ export default {
return
sprintf
(
body
,
{
wordBreakOpportunity
},
false
);
},
callOutLink
()
{
if
(
this
.
autoDevopsEnabled
)
{
return
this
.
autoDevopsHelpPagePath
;
}
if
(
this
.
latestPipelinePath
)
{
return
this
.
latestPipelinePath
;
}
return
this
.
pipelinesHelpPagePath
;
return
this
.
autoDevopsEnabled
?
this
.
autoDevopsHelpPagePath
:
this
.
latestPipelinePath
;
},
calloutContent
()
{
const
bodyDefault
=
__
(
`The configuration status of the table below only applies to the default branch and
...
...
ee/app/assets/javascripts/security_configuration/index.js
View file @
e14c4962
...
...
@@ -9,7 +9,6 @@ export default function init() {
features
,
helpPagePath
,
latestPipelinePath
,
pipelinesHelpPagePath
,
}
=
el
.
dataset
;
return
new
Vue
({
...
...
@@ -25,7 +24,6 @@ export default function init() {
features
:
JSON
.
parse
(
features
),
helpPagePath
,
latestPipelinePath
,
pipelinesHelpPagePath
,
},
});
},
...
...
ee/spec/frontend/security_configuration/components/app_spec.js
View file @
e14c4962
...
...
@@ -13,7 +13,6 @@ describe('Security Configuration App', () => {
latestPipelinePath
:
'
http://latestPipelinePath
'
,
autoDevopsHelpPagePath
:
'
http://autoDevopsHelpPagePath
'
,
helpPagePath
:
'
http://helpPagePath
'
,
pipelinesHelpPagePath
:
'
http://pipelineHelpPagePath
'
,
...
props
,
},
});
...
...
@@ -46,14 +45,13 @@ describe('Security Configuration App', () => {
});
it
.
each
`
autoDevopsEnabled | latestPipelinePath | expectedUrl
${
true
}
|
${
'
http://latestPipeline
'
}
|
${
'
http://autoDevopsHelpPagePath
'
}
${
false
}
|
${
'
http://latestPipeline
'
}
|
${
'
http://latestPipeline
'
}
${
false
}
|
${
undefined
}
|
${
'
http://pipelineHelpPagePath
'
}
autoDevopsEnabled | expectedUrl
${
true
}
|
${
'
http://autoDevopsHelpPagePath
'
}
${
false
}
|
${
'
http://latestPipelinePath
'
}
`
(
'
displays a link to "$expectedUrl" when autoDevops is "$autoDevopsEnabled"
and pipelinesPath is $latestPipelinePath
'
,
({
autoDevopsEnabled
,
latestPipelinePath
,
expectedUrl
})
=>
{
createComponent
({
autoDevopsEnabled
,
latestPipelinePath
});
'
displays a link to "$expectedUrl" when autoDevops is "$autoDevopsEnabled"
'
,
({
autoDevopsEnabled
,
expectedUrl
})
=>
{
createComponent
({
autoDevopsEnabled
});
expect
(
getPipelinesLink
().
attributes
(
'
href
'
)).
toBe
(
expectedUrl
);
expect
(
getPipelinesLink
().
attributes
(
'
rel
'
)).
toBe
(
'
noopener
'
);
...
...
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