Commit 2f9ed98c authored by Stan Hu's avatar Stan Hu

Merge branch 'fix_ility_typos' into 'master'

Fix *ility typos

See merge request gitlab-org/gitlab!47098
parents 4c23a95d 66108d3a
...@@ -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 visibility 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
......
...@@ -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 vulnerability 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 revertDismissVulnerability 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();
......
...@@ -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 compamtibilty with pre-GitLab 11.4 syntax # $INCREMENTAL_ROLLOUT_ENABLED is for compatibility 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
......
...@@ -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 compamtibilty with pre-GitLab 11.4 syntax # $INCREMENTAL_ROLLOUT_ENABLED is for compatibility 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment