realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge tag 'debian/13.11.3+ds1-1' into bullseye-fasttrack

Browse source 
gitlab Debian release 13.11.3+ds1-1
This commit is contained in:
Pirate Praveen 2021-05-12 23:12:05 +05:30
commit 0ccc13eda7
8 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -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)

2
GITALY_SERVER_VERSION
View file

@ -1 +1 @@
13.11.2 13.11.3

2
VERSION
View file

@ -1 +1 @@
13.11.2 13.11.3

10
app/assets/javascripts/pages/admin/application_settings/integrations/index.js
View file

@ -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();

9
debian/changelog vendored
View file

@ -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 <praveen@debian.org> Wed, 12 May 2021 15:55:16 +0530
gitlab (13.11.2+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium gitlab (13.11.2+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
* Rebuild for bullseye-fasttrack. * Rebuild for bullseye-fasttrack.

1
debian/control vendored
View file

@ -316,7 +316,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-gemojione (>= 3.3~), ruby-gemojione (>= 3.3~),
ruby-gon (>= 6.4~), ruby-gon (>= 6.4~),
ruby-request-store (>= 1.5~), ruby-request-store (>= 1.5~),
ruby-jquery-atwho-rails (>= 1.3.2~),
ruby-virtus (>= 1.0.5-3~), ruby-virtus (>= 1.0.5-3~),
ruby-base32 (>= 0.3.0~), ruby-base32 (>= 0.3.0~),
# Sentry integration # Sentry integration

4
lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
View file

@ -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

4
spec/features/admin/admin_settings_spec.rb
View file

@ -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