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
2f9ed98c
Commit
2f9ed98c
authored
Nov 06, 2020
by
Stan Hu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_ility_typos' into 'master'
Fix *ility typos See merge request gitlab-org/gitlab!47098
parents
4c23a95d
66108d3a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/assets/javascripts/dependencies/components/dependencies_table.vue
...avascripts/dependencies/components/dependencies_table.vue
+1
-1
ee/spec/frontend/vue_shared/security_reports/components/dismiss_button_spec.js
...shared/security_reports/components/dismiss_button_spec.js
+2
-2
lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+1
-1
lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
+1
-1
No files found.
ee/app/assets/javascripts/dependencies/components/dependencies_table.vue
View file @
2f9ed98c
...
@@ -73,7 +73,7 @@ export default {
...
@@ -73,7 +73,7 @@ export default {
},
},
methods
:
{
methods
:
{
// The GlTable component mutates the `_showDetails` property on items
// The GlTable component mutates the `_showDetails` property on items
// passed to it in order to track the visibilty of each row's `row-details`
// passed to it in order to track the visibil
i
ty of each row's `row-details`
// slot. So, create a deep clone of them here to avoid mutating the
// slot. So, create a deep clone of them here to avoid mutating the
// `dependencies` prop.
// `dependencies` prop.
// We also make sure that `vulnerabilities` is always defined to prevent rendering
// We also make sure that `vulnerabilities` is always defined to prevent rendering
...
...
ee/spec/frontend/vue_shared/security_reports/components/dismiss_button_spec.js
View file @
2f9ed98c
...
@@ -21,7 +21,7 @@ describe('DismissalButton', () => {
...
@@ -21,7 +21,7 @@ describe('DismissalButton', () => {
expect
(
wrapper
.
text
()).
toBe
(
'
Dismiss vulnerability
'
);
expect
(
wrapper
.
text
()).
toBe
(
'
Dismiss vulnerability
'
);
});
});
it
(
'
should emit dismiss vulnerabilty when clicked
'
,
()
=>
{
it
(
'
should emit dismiss vulnerabil
i
ty when clicked
'
,
()
=>
{
wrapper
.
find
(
GlButton
).
trigger
(
'
click
'
);
wrapper
.
find
(
GlButton
).
trigger
(
'
click
'
);
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
expect
(
wrapper
.
emitted
().
dismissVulnerability
).
toBeTruthy
();
expect
(
wrapper
.
emitted
().
dismissVulnerability
).
toBeTruthy
();
...
@@ -52,7 +52,7 @@ describe('DismissalButton', () => {
...
@@ -52,7 +52,7 @@ describe('DismissalButton', () => {
expect
(
wrapper
.
text
()).
toBe
(
'
Undo dismiss
'
);
expect
(
wrapper
.
text
()).
toBe
(
'
Undo dismiss
'
);
});
});
it
(
'
should emit revertDismissVulnerabilty when clicked
'
,
()
=>
{
it
(
'
should emit revertDismissVulnerabil
i
ty when clicked
'
,
()
=>
{
wrapper
.
find
(
GlButton
).
trigger
(
'
click
'
);
wrapper
.
find
(
GlButton
).
trigger
(
'
click
'
);
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
expect
(
wrapper
.
emitted
().
revertDismissVulnerability
).
toBeTruthy
();
expect
(
wrapper
.
emitted
().
revertDismissVulnerability
).
toBeTruthy
();
...
...
lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
View file @
2f9ed98c
...
@@ -186,7 +186,7 @@ production_manual:
...
@@ -186,7 +186,7 @@ production_manual:
when
:
never
when
:
never
-
if
:
'
$CI_COMMIT_BRANCH
!=
"master"'
-
if
:
'
$CI_COMMIT_BRANCH
!=
"master"'
when
:
never
when
:
never
# $INCREMENTAL_ROLLOUT_ENABLED is for compa
mtibil
ty with pre-GitLab 11.4 syntax
# $INCREMENTAL_ROLLOUT_ENABLED is for compa
tibili
ty with pre-GitLab 11.4 syntax
-
if
:
'
$INCREMENTAL_ROLLOUT_MODE
==
"manual"
||
$INCREMENTAL_ROLLOUT_ENABLED'
-
if
:
'
$INCREMENTAL_ROLLOUT_MODE
==
"manual"
||
$INCREMENTAL_ROLLOUT_ENABLED'
when
:
manual
when
:
manual
...
...
lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
View file @
2f9ed98c
...
@@ -183,7 +183,7 @@ production_manual:
...
@@ -183,7 +183,7 @@ production_manual:
when
:
never
when
:
never
-
if
:
'
$CI_COMMIT_BRANCH
!=
"master"'
-
if
:
'
$CI_COMMIT_BRANCH
!=
"master"'
when
:
never
when
:
never
# $INCREMENTAL_ROLLOUT_ENABLED is for compa
mtibil
ty with pre-GitLab 11.4 syntax
# $INCREMENTAL_ROLLOUT_ENABLED is for compa
tibili
ty with pre-GitLab 11.4 syntax
-
if
:
'
$INCREMENTAL_ROLLOUT_MODE
==
"manual"
||
$INCREMENTAL_ROLLOUT_ENABLED'
-
if
:
'
$INCREMENTAL_ROLLOUT_MODE
==
"manual"
||
$INCREMENTAL_ROLLOUT_ENABLED'
when
:
manual
when
:
manual
...
...
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