From 3651e61851796960c8c5a582906e2b99df46541c Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 1 Apr 2020 13:06:27 +0530 Subject: [PATCH 1/8] Tighten dependencies for dependencies in buster-backports --- debian/control | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/control b/debian/control index aec1de6169..0d2971d452 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, #ruby-mysql2 | ruby-pg, ruby-pg (>= 1.1~), ruby-rugged (>= 0.28~), - ruby-grape-path-helpers (>= 1.1~), + ruby-grape-path-helpers (>= 1.2~), ruby-faraday (>= 0.12~), ruby-marginalia (>= 1.8~), # Authentication libraries @@ -57,7 +57,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-omniauth-azure-oauth2 (>= 0.0.10~), ruby-omniauth-cas3 (>= 1.1.4~), ruby-omniauth-facebook (>= 4.0~), - ruby-omniauth-github (>= 1.3~), + ruby-omniauth-github (>= 1.4~), ruby-omniauth-gitlab (>= 1.0.2~), ruby-omniauth-google-oauth2 (>= 0.6~), ruby-omniauth-kerberos (>= 0.3.0-3~), @@ -85,7 +85,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-validates-hostname (>= 1.0.6~), ruby-zip (>= 2.0~), # GitLab Pages letsencrypt support - ruby-acme-client (>= 2.0.2~), + ruby-acme-client (>= 2.0.5~), # Browser detection ruby-browser (>= 2.5~), # GPG @@ -137,7 +137,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # ruby-faraday-middleware-aws-signers-v4, embedded # Markdown and HTML processing ruby-html-pipeline (>= 2.12~), - ruby-task-list (>= 2.2.1~), + ruby-task-list (>= 2.3.1~), ruby-github-markup (>= 1.7~), ruby-commonmarker (>= 0.20~), ruby-redcloth (>= 4.3.2-3~), @@ -148,7 +148,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, asciidoctor (>= 2.0.10~), ruby-asciidoctor-include-ext (>= 0.3.1~), ruby-asciidoctor-plantuml (>= 0.0.10~), - ruby-rouge (>= 3.11~), + ruby-rouge (>= 3.15~), ruby-truncato (>= 0.7.11~), ruby-bootstrap-form (>= 4.2~), ruby-nokogiri (>= 1.10.5~), @@ -219,7 +219,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # FogBugz integration ruby-fogbugz (>= 0.2.1-3~), # Kubernetes integration - ruby-kubeclient (>= 4.4~), + ruby-kubeclient (>= 4.6~), # Sanitize user input ruby-sanitize (>= 4.6.5~), ruby-babosa (>= 1.0.2~), @@ -252,8 +252,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-uglifier (>= 2.7.2~), libjs-uglify (<< 3.0~), # - ruby-addressable (>= 2.5.2~), - ruby-font-awesome-rails (>= 4.7.0.4~), + ruby-addressable (>= 2.7~), + ruby-font-awesome-rails (>= 4.7.0.5~), ruby-gemojione (>= 3.3~), ruby-gon (>= 6.2~), ruby-jquery-atwho-rails (>= 1.3.2~), @@ -290,7 +290,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-prometheus-client-mmap (>= 0.10~), ruby-raindrops (>= 0.18~), # - ruby-octokit (>= 4.13.0+gh~), + ruby-octokit (>= 4.15~), # ruby-mail-room (>= 0.10~), # From dc7fd7be84bd224c2888e77f019ea1eb228ddec1 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 1 Apr 2020 20:24:18 +0530 Subject: [PATCH 2/8] Tighten dependency on ruby-grape-path-helpers --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 0d2971d452..6f45f51bad 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, #ruby-mysql2 | ruby-pg, ruby-pg (>= 1.1~), ruby-rugged (>= 0.28~), - ruby-grape-path-helpers (>= 1.2~), + ruby-grape-path-helpers (>= 1.3~), ruby-faraday (>= 0.12~), ruby-marginalia (>= 1.8~), # Authentication libraries From 95b522dc72af77a0d5f9542d80c28d78a31d45bf Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 1 Apr 2020 20:25:19 +0530 Subject: [PATCH 3/8] Upload to experimental --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 672ed9c0f0..814a5f27c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (12.8.8-3) experimental; urgency=medium + + * Tighten dependencies for dependencies in buster-backports + * Tighten dependency on ruby-grape-path-helpers (fixes issue creation) + + -- Pirate Praveen Wed, 01 Apr 2020 20:24:55 +0530 + gitlab (12.8.8-2) experimental; urgency=medium * Exclude core-js from transpiling (Closes: #954993) From 04bda8531ce669422b351937b25888b6d6da9849 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 2 Apr 2020 20:21:42 +0530 Subject: [PATCH 4/8] Refresh patch (remove fuzz) --- debian/patches/0790-protobuf-compat.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/0790-protobuf-compat.patch b/debian/patches/0790-protobuf-compat.patch index 46ccfc5511..7d57edb62a 100644 --- a/debian/patches/0790-protobuf-compat.patch +++ b/debian/patches/0790-protobuf-compat.patch @@ -9,7 +9,7 @@ Subject: [PATCH 2/2] Fix protobuf compatibility (Thanks to Stan Hu) --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb -@@ -142,7 +142,7 @@ +@@ -110,7 +110,7 @@ return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action) { From 4d727aeff8dcdb25f66cb8e43162862eefbaa565 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 2 Apr 2020 20:22:06 +0530 Subject: [PATCH 5/8] Use jquery.waitforimages from npmjs.com (packaged version is broken) --- debian/control | 3 ++- debian/patches/0740-use-packaged-modules.patch | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 6f45f51bad..a9dfd272f0 100644 --- a/debian/control +++ b/debian/control @@ -370,7 +370,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, node-jed, node-jquery (>= 3.4~), node-jquery-ujs, - node-jquery.waitforimages, +# Broken +# node-jquery.waitforimages, node-js-cookie, node-jszip, node-jszip-utils, diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 69f50cdbe6..8fc6fbb485 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -62,7 +62,7 @@ }; --- a/package.json +++ b/package.json -@@ -50,65 +50,36 @@ +@@ -50,65 +50,37 @@ "apollo-link": "^1.2.11", "apollo-link-batch-http": "^1.2.11", "apollo-upload-client": "^10.0.0", @@ -108,7 +108,7 @@ - "jquery": "^3.4.1", - "jquery-ujs": "1.2.2", "jquery.caret": "^0.3.1", -- "jquery.waitforimages": "^2.2.0", + "jquery.waitforimages": "^2.2.0", - "js-cookie": "^2.1.3", - "jszip": "^3.1.3", - "jszip-utils": "^0.0.2", @@ -128,7 +128,7 @@ "raphael": "^2.2.7", "raw-loader": "^3.1.0", "sanitize-html": "^1.20.0", -@@ -121,13 +92,9 @@ +@@ -121,13 +93,9 @@ "svg4everybody": "2.1.9", "swagger-ui-dist": "^3.24.3", "three": "^0.84.0", @@ -142,7 +142,7 @@ "url-loader": "^2.1.0", "visibilityjs": "^1.2.4", "vue": "^2.6.10", -@@ -137,13 +104,7 @@ +@@ -137,13 +105,7 @@ "vue-template-compiler": "^2.6.10", "vue-virtual-scroll-list": "^1.4.4", "vuedraggable": "^2.23.0", From d1fadde1533a1a0c57063703165810cf6a425d84 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 2 Apr 2020 20:23:09 +0530 Subject: [PATCH 6/8] Upload to experimental --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 814a5f27c9..3bbd20461d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (12.8.8-4) experimental; urgency=medium + + * Refresh protobuf compat patch (remove fuzz) + * Use jquery.waitforimages from npmjs.com (packaged version is broken) + + -- Pirate Praveen Thu, 02 Apr 2020 20:22:43 +0530 + gitlab (12.8.8-3) experimental; urgency=medium * Tighten dependencies for dependencies in buster-backports From b0746d46d1f6084009f38971088ba2f0e9a0dde0 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Fri, 3 Apr 2020 17:43:56 +0530 Subject: [PATCH 7/8] Add a work around for missing assets/select2.png error on web console --- debian/rake-tasks.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh index d65a3f8928..b425d10114 100755 --- a/debian/rake-tasks.sh +++ b/debian/rake-tasks.sh @@ -41,5 +41,11 @@ runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake gettext:po_to_json echo "Precompiling assets..." runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake tmp:cache:clear assets:precompile' +# Workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/213245 +echo "Adding symbolic link for assets/select2.png..." +runuser -u ${gitlab_user} -- sh -c 'cd /usr/share/gitlab/public/assets && \ + if ! [ -f select2.png ]; then \ + ln -s select2-d6b5d8d83dbc18fb8d77c8761d331cd9e5123c9684950bab0406e98a24ac5ae8.png select2.png; fi' + echo "Webpacking..." runuser -u ${gitlab_user} -- sh -c 'webpack --config config/webpack.config.js' From f20934b0355419afe5c079de950e4608165106e1 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Fri, 3 Apr 2020 17:45:32 +0530 Subject: [PATCH 8/8] Upload to experimental --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3bbd20461d..70c43d6f31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (12.8.8-5) experimental; urgency=medium + + * Add a work around for missing assets/select2.png error on web console + (See upstream issue #213245) + + -- Pirate Praveen Fri, 03 Apr 2020 17:44:31 +0530 + gitlab (12.8.8-4) experimental; urgency=medium * Refresh protobuf compat patch (remove fuzz)