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:
Pirate Praveen 2021-05-12 15:33:01 +05:30
commit 95554b29b2
6 changed files with 21 additions and 8 deletions

View file

@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
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)
### Security (5 changes)

View file

@ -1 +1 @@
13.11.2
13.11.3

View file

@ -1 +1 @@
13.11.2
13.11.3

View file

@ -1,6 +1,8 @@
import initIntegrationsList from '~/integrations/index';
import PersistentUserCallout from '~/persistent_user_callout';
document.addEventListener('DOMContentLoaded', () => {
const callout = document.querySelector('.js-admin-integrations-moved');
PersistentUserCallout.factory(callout);
});
const callout = document.querySelector('.js-admin-integrations-moved');
PersistentUserCallout.factory(callout);
initIntegrationsList();

View file

@ -1,10 +1,10 @@
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:
DOCKER_TLS_CERTDIR: ""
services:
- docker:20.10.6-dind
- docker:19.03.12-dind
script:
- |
if [[ -z "$CI_COMMIT_TAG" ]]; then

View file

@ -305,6 +305,10 @@ RSpec.describe 'Admin updates settings' do
expect(page).not_to have_content('Some settings have moved')
end
it 'shows integrations table' do
expect(page).to have_selector '[data-testid="inactive-integrations-table"]'
end
end
context 'CI/CD page' do