diff --git a/CHANGELOG.md b/CHANGELOG.md index a48f0afd15..aeb9d376f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 07ae670e11..fd9f285315 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.11.2 \ No newline at end of file +13.11.3 \ No newline at end of file diff --git a/VERSION b/VERSION index 07ae670e11..fd9f285315 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.11.2 \ No newline at end of file +13.11.3 \ No newline at end of file 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 2e61eedd18..f318b6f62d 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/debian/changelog b/debian/changelog index 3b7e1d90e1..edff838857 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gitlab (13.11.3+ds1-1) experimental; urgency=medium + + * Relax dependency of gon in Gemfile and update minimum version in d/control + * Use node-rails-actioncable from system + * Drop dependency on ruby-jquery-atwho-rails (no longer used) + * New upstream patch release 13.11.3+ds1 + + -- Pirate Praveen Wed, 12 May 2021 15:55:16 +0530 + gitlab (13.11.2+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium * Rebuild for bullseye-fasttrack. diff --git a/debian/control b/debian/control index 0cefa3970e..dd6cf8028f 100644 --- a/debian/control +++ b/debian/control @@ -316,7 +316,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-gemojione (>= 3.3~), ruby-gon (>= 6.4~), ruby-request-store (>= 1.5~), - ruby-jquery-atwho-rails (>= 1.3.2~), ruby-virtus (>= 1.0.5-3~), ruby-base32 (>= 0.3.0~), # Sentry integration diff --git a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml index 196d42f3e3..1c25d9d583 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 9a2e2eb2f6..90ce865cc0 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