diff options
4 files changed, 17 insertions, 6 deletions
diff --git a/app/assets/javascripts/pages/admin/application_settings/integrations/index.js b/app/assets/javascripts/pages/admin/application_settings/integrations/index.js index 2e61eedd185..f318b6f62d5 100644 --- a/app/assets/javascripts/pages/admin/application_settings/integrations/index.js +++ b/app/assets/javascripts/pages/admin/application_settings/integrations/index.js @@ -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(); diff --git a/changelogs/unreleased/fix-admin-integrations-foss.yml b/changelogs/unreleased/fix-admin-integrations-foss.yml new file mode 100644 index 00000000000..b2e3907a8e7 --- /dev/null +++ b/changelogs/unreleased/fix-admin-integrations-foss.yml @@ -0,0 +1,5 @@ +--- +title: Fix Instance-level Project Integration Management page for GitLab FOSS +merge_request: 60354 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml index 196d42f3e3a..1c25d9d583b 100644 --- a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml @@ -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 diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 9a2e2eb2f6f..90ce865cc00 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -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 |