Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
e10b2767b1
commit
68d19a238a
|
@ -83,7 +83,7 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
icon() {
|
||||
return this.visible ? 'angle-down' : 'angle-right';
|
||||
return this.visible ? 'chevron-lg-down' : 'chevron-lg-right';
|
||||
},
|
||||
externalUrl() {
|
||||
return this.environment.externalUrl;
|
||||
|
|
|
@ -30,7 +30,7 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
iconName() {
|
||||
return this.isClosed ? 'angle-right' : 'angle-down';
|
||||
return this.isClosed ? 'chevron-lg-right' : 'chevron-lg-down';
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
|
|
|
@ -100,7 +100,7 @@ export default {
|
|||
<template #cell(name)="{ item, toggleDetails, detailsShowing }">
|
||||
<gl-button
|
||||
v-if="hasDetails(item)"
|
||||
:icon="detailsShowing ? 'angle-up' : 'angle-down'"
|
||||
:icon="detailsShowing ? 'chevron-lg-up' : 'chevron-lg-down'"
|
||||
:aria-label="detailsShowing ? __('Collapse') : __('Expand')"
|
||||
category="tertiary"
|
||||
size="small"
|
||||
|
|
|
@ -14,7 +14,7 @@ export default {
|
|||
if (extensions.length === 0) return null;
|
||||
|
||||
return h(
|
||||
'div',
|
||||
'section',
|
||||
{
|
||||
attrs: {
|
||||
role: 'region',
|
||||
|
|
|
@ -33,7 +33,7 @@ export default {
|
|||
return this.children.length === 0;
|
||||
},
|
||||
toggleIcon() {
|
||||
return this.isOpen ? 'angle-up' : 'angle-down';
|
||||
return this.isOpen ? 'chevron-lg-up' : 'chevron-lg-down';
|
||||
},
|
||||
toggleLabel() {
|
||||
return this.isOpen
|
||||
|
|
|
@ -52,7 +52,6 @@
|
|||
width: $ci-action-dropdown-svg-size;
|
||||
height: $ci-action-dropdown-svg-size;
|
||||
position: relative;
|
||||
top: 1px;
|
||||
vertical-align: initial;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -467,6 +467,8 @@ The following table lists CI/CD variables related to the database.
|
|||
| `POSTGRES_VERSION` | Tag for the [`postgres` Docker image](https://hub.docker.com/_/postgres) to use. Defaults to `9.6.16` for tests and deployments as of GitLab 13.0 (previously `9.6.2`). If `AUTO_DEVOPS_POSTGRES_CHANNEL` is set to `1`, deployments uses the default version `9.6.2`. |
|
||||
| `POSTGRES_HELM_UPGRADE_VALUES_FILE` | In GitLab 13.8 and later, and when using [auto-deploy-image v2](upgrading_auto_deploy_dependencies.md), this variable allows the `helm upgrade` values file for PostgreSQL to be overridden. Defaults to `.gitlab/auto-deploy-postgres-values.yaml`. |
|
||||
| `POSTGRES_HELM_UPGRADE_EXTRA_ARGS` | In GitLab 13.8 and later, and when using [auto-deploy-image v2](upgrading_auto_deploy_dependencies.md), this variable allows extra PostgreSQL options in `helm upgrade` commands when deploying the application. Note that using quotes doesn't prevent word splitting. |
|
||||
| `POSTGRES_CHART_REPOSITORY` | Helm Chart repository used to search for PostgreSQL chart. Defaults to `https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami`. |
|
||||
| `POSTGRES_CHART_VERSION` | Helm Chart version used for PostgreSQL chart. Defaults to `8.2.1`. |
|
||||
|
||||
### Disable jobs
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
variables:
|
||||
DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
|
||||
DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.30.0'
|
||||
|
||||
.dast-auto-deploy:
|
||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${DAST_AUTO_DEPLOY_IMAGE_VERSION}"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
variables:
|
||||
AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
|
||||
AUTO_DEPLOY_IMAGE_VERSION: 'v2.30.0'
|
||||
|
||||
.auto-deploy:
|
||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
variables:
|
||||
AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
|
||||
AUTO_DEPLOY_IMAGE_VERSION: 'v2.30.0'
|
||||
|
||||
.auto-deploy:
|
||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
|
||||
|
|
|
@ -374,7 +374,7 @@ describe('~/environments/components/new_environment_item.vue', () => {
|
|||
|
||||
it('is collapsed by default', () => {
|
||||
expect(collapse.attributes('visible')).toBeUndefined();
|
||||
expect(icon.props('name')).toEqual('angle-right');
|
||||
expect(icon.props('name')).toEqual('chevron-lg-right');
|
||||
expect(environmentName.classes('gl-font-weight-bold')).toBe(false);
|
||||
});
|
||||
|
||||
|
@ -385,7 +385,7 @@ describe('~/environments/components/new_environment_item.vue', () => {
|
|||
|
||||
expect(button.attributes('aria-label')).toBe(__('Collapse'));
|
||||
expect(collapse.attributes('visible')).toBe('visible');
|
||||
expect(icon.props('name')).toEqual('angle-down');
|
||||
expect(icon.props('name')).toEqual('chevron-lg-down');
|
||||
expect(environmentName.classes('gl-font-weight-bold')).toBe(true);
|
||||
expect(findDeployment().isVisible()).toBe(true);
|
||||
});
|
||||
|
|
|
@ -45,7 +45,7 @@ describe('Job Log Collapsible Section', () => {
|
|||
});
|
||||
|
||||
it('renders an icon with the closed state', () => {
|
||||
expect(findCollapsibleLineSvg().attributes('data-testid')).toBe('angle-right-icon');
|
||||
expect(findCollapsibleLineSvg().attributes('data-testid')).toBe('chevron-lg-right-icon');
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -62,7 +62,7 @@ describe('Job Log Collapsible Section', () => {
|
|||
});
|
||||
|
||||
it('renders an icon with the open state', () => {
|
||||
expect(findCollapsibleLineSvg().attributes('data-testid')).toBe('angle-down-icon');
|
||||
expect(findCollapsibleLineSvg().attributes('data-testid')).toBe('chevron-lg-down-icon');
|
||||
});
|
||||
|
||||
it('renders collapsible lines content', () => {
|
||||
|
|
|
@ -56,8 +56,8 @@ describe('Job Log Header Line', () => {
|
|||
createComponent({ ...data, isClosed: true });
|
||||
});
|
||||
|
||||
it('sets icon name to be angle-right', () => {
|
||||
expect(wrapper.vm.iconName).toEqual('angle-right');
|
||||
it('sets icon name to be chevron-lg-right', () => {
|
||||
expect(wrapper.vm.iconName).toEqual('chevron-lg-right');
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -66,8 +66,8 @@ describe('Job Log Header Line', () => {
|
|||
createComponent({ ...data, isClosed: false });
|
||||
});
|
||||
|
||||
it('sets icon name to be angle-down', () => {
|
||||
expect(wrapper.vm.iconName).toEqual('angle-down');
|
||||
it('sets icon name to be chevron-lg-down', () => {
|
||||
expect(wrapper.vm.iconName).toEqual('chevron-lg-down');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
@ -68,7 +68,9 @@ describe('Job Log', () => {
|
|||
});
|
||||
|
||||
it('renders an icon with the open state', () => {
|
||||
expect(findCollapsibleLine().find('[data-testid="angle-down-icon"]').exists()).toBe(true);
|
||||
expect(findCollapsibleLine().find('[data-testid="chevron-lg-down-icon"]').exists()).toBe(
|
||||
true,
|
||||
);
|
||||
});
|
||||
|
||||
describe('on click header section', () => {
|
||||
|
@ -146,7 +148,9 @@ describe('Job Log, infinitelyCollapsibleSections feature flag enabled', () => {
|
|||
});
|
||||
|
||||
it('renders an icon with the open state', () => {
|
||||
expect(findCollapsibleLine().find('[data-testid="angle-down-icon"]').exists()).toBe(true);
|
||||
expect(findCollapsibleLine().find('[data-testid="chevron-lg-down-icon"]').exists()).toBe(
|
||||
true,
|
||||
);
|
||||
});
|
||||
|
||||
describe('on click header section', () => {
|
||||
|
|
|
@ -206,19 +206,19 @@ describe('Package Files', () => {
|
|||
it('toggles the details row', async () => {
|
||||
createComponent();
|
||||
|
||||
expect(findFirstToggleDetailsButton().props('icon')).toBe('angle-down');
|
||||
expect(findFirstToggleDetailsButton().props('icon')).toBe('chevron-lg-down');
|
||||
|
||||
findFirstToggleDetailsButton().vm.$emit('click');
|
||||
await nextTick();
|
||||
|
||||
expect(findFirstRowShaComponent('sha-256').exists()).toBe(true);
|
||||
expect(findFirstToggleDetailsButton().props('icon')).toBe('angle-up');
|
||||
expect(findFirstToggleDetailsButton().props('icon')).toBe('chevron-lg-up');
|
||||
|
||||
findFirstToggleDetailsButton().vm.$emit('click');
|
||||
await nextTick();
|
||||
|
||||
expect(findFirstRowShaComponent('sha-256').exists()).toBe(false);
|
||||
expect(findFirstToggleDetailsButton().props('icon')).toBe('angle-down');
|
||||
expect(findFirstToggleDetailsButton().props('icon')).toBe('chevron-lg-down');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ describe('WorkItemLinks', () => {
|
|||
});
|
||||
|
||||
it('is expanded by default', () => {
|
||||
expect(findToggleButton().props('icon')).toBe('angle-up');
|
||||
expect(findToggleButton().props('icon')).toBe('chevron-lg-up');
|
||||
expect(findLinksBody().exists()).toBe(true);
|
||||
});
|
||||
|
||||
|
@ -32,7 +32,7 @@ describe('WorkItemLinks', () => {
|
|||
findToggleButton().vm.$emit('click');
|
||||
await nextTick();
|
||||
|
||||
expect(findToggleButton().props('icon')).toBe('angle-down');
|
||||
expect(findToggleButton().props('icon')).toBe('chevron-lg-down');
|
||||
expect(findLinksBody().exists()).toBe(false);
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue