Update upstream source from tag 'upstream/13.11.3+ds1'
Update to upstream version '13.11.3+ds1'
with Debian dir 839ba4976a
This commit is contained in:
commit
95554b29b2
6 changed files with 21 additions and 8 deletions
|
@ -2,6 +2,13 @@
|
||||||
documentation](doc/development/changelog.md) for instructions on adding your own
|
documentation](doc/development/changelog.md) for instructions on adding your own
|
||||||
entry.
|
entry.
|
||||||
|
|
||||||
|
## 13.11.3 (2021-04-30)
|
||||||
|
|
||||||
|
### Fixed (1 change)
|
||||||
|
|
||||||
|
- Fix Instance-level Project Integration Management page for GitLab FOSS. !60354
|
||||||
|
|
||||||
|
|
||||||
## 13.11.2 (2021-04-27)
|
## 13.11.2 (2021-04-27)
|
||||||
|
|
||||||
### Security (5 changes)
|
### Security (5 changes)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
13.11.2
|
13.11.3
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
13.11.2
|
13.11.3
|
|
@ -1,6 +1,8 @@
|
||||||
|
import initIntegrationsList from '~/integrations/index';
|
||||||
import PersistentUserCallout from '~/persistent_user_callout';
|
import PersistentUserCallout from '~/persistent_user_callout';
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
const callout = document.querySelector('.js-admin-integrations-moved');
|
||||||
const callout = document.querySelector('.js-admin-integrations-moved');
|
|
||||||
PersistentUserCallout.factory(callout);
|
PersistentUserCallout.factory(callout);
|
||||||
});
|
|
||||||
|
initIntegrationsList();
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
build:
|
build:
|
||||||
stage: build
|
stage: build
|
||||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:v0.6.0"
|
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:v0.4.0"
|
||||||
variables:
|
variables:
|
||||||
DOCKER_TLS_CERTDIR: ""
|
DOCKER_TLS_CERTDIR: ""
|
||||||
services:
|
services:
|
||||||
- docker:20.10.6-dind
|
- docker:19.03.12-dind
|
||||||
script:
|
script:
|
||||||
- |
|
- |
|
||||||
if [[ -z "$CI_COMMIT_TAG" ]]; then
|
if [[ -z "$CI_COMMIT_TAG" ]]; then
|
||||||
|
|
|
@ -305,6 +305,10 @@ RSpec.describe 'Admin updates settings' do
|
||||||
|
|
||||||
expect(page).not_to have_content('Some settings have moved')
|
expect(page).not_to have_content('Some settings have moved')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'shows integrations table' do
|
||||||
|
expect(page).to have_selector '[data-testid="inactive-integrations-table"]'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'CI/CD page' do
|
context 'CI/CD page' do
|
||||||
|
|
Loading…
Reference in a new issue