From 586b319c7911cd553743eda82ba130345fecbabc Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Jul 2022 20:50:01 +0200 Subject: [PATCH] Downgrade Gemfile.lock to bundler 2.1.4 This is the default bundler version that comes with ruby 2.7, and it looks like ruby ruby 2.7 and bundler 2.3.18 have a problem with the new splitted version where each gem source has it's own block and it crashes. To have less problems for podmins when updating, lets just downgrade bundler and use the old lockfile format in next-minor. It's not a problem anymore in develop as we don't have rails-assets anymore there, as we switched to yarn. --- Gemfile.lock | 101 +++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7809cf82a..fe7e5403d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,56 +1,6 @@ -GEM - remote: https://gems.diasporafoundation.org/ - specs: - rails-assets-autosize (4.0.2) - rails-assets-backbone (1.3.3) - rails-assets-underscore (>= 1.8.3) - rails-assets-blueimp-gallery (2.33.0) - rails-assets-bootstrap (3.4.1) - rails-assets-jquery (>= 1.9.1, < 4) - rails-assets-bootstrap-markdown (2.10.0) - rails-assets-bootstrap (~> 3) - rails-assets-corejs-typeahead (1.2.1) - rails-assets-jquery (>= 1.11) - rails-assets-diaspora_jsxc (0.1.5.develop.7) - rails-assets-emojione (~> 2.0.1) - rails-assets-favico.js (>= 0.3.10, < 0.4) - rails-assets-jquery-colorbox (~> 1.6.3) - rails-assets-jquery-fullscreen-plugin (~> 0.5.0) - rails-assets-jquery.slimscroll (~> 1.3.6) - rails-assets-jquery.ui (~> 1.11.4) - rails-assets-emojione (2.0.1) - rails-assets-favico.js (0.3.10) - rails-assets-fine-uploader (5.13.0) - rails-assets-highlightjs (9.12.0) - rails-assets-jasmine (3.4.0) - rails-assets-jasmine-ajax (4.0.0) - rails-assets-jasmine (~> 3) - rails-assets-jquery (3.6.0) - rails-assets-jquery-colorbox (1.6.4) - rails-assets-jquery (>= 1.3.2) - rails-assets-jquery-fullscreen-plugin (0.5.0) - rails-assets-jquery-placeholder (2.3.1) - rails-assets-jquery (>= 1.6) - rails-assets-jquery-textchange (0.2.3) - rails-assets-jquery - rails-assets-jquery.are-you-sure (1.9.0) - rails-assets-jquery (>= 1.4.2) - rails-assets-jquery.slimscroll (1.3.8) - rails-assets-jquery.ui (1.11.4) - rails-assets-jquery (>= 1.6) - rails-assets-markdown-it--markdown-it-for-inline (0.1.1) - rails-assets-markdown-it (8.4.2) - rails-assets-markdown-it-diaspora-mention (1.2.0) - rails-assets-markdown-it-footnote (3.0.3) - rails-assets-markdown-it-hashtag (0.4.0) - rails-assets-markdown-it-sanitizer (0.4.3) - rails-assets-markdown-it-sub (1.0.0) - rails-assets-markdown-it-sup (1.0.0) - rails-assets-underscore (1.9.1) - rails-assets-utatti-perfect-scrollbar (1.4.0) - GEM remote: https://rubygems.org/ + remote: https://gems.diasporafoundation.org/ specs: actioncable (6.1.6.1) actionpack (= 6.1.6.1) @@ -584,6 +534,53 @@ GEM bundler (>= 1.15.0) railties (= 6.1.6.1) sprockets-rails (>= 2.0.0) + rails-assets-autosize (4.0.2) + rails-assets-backbone (1.3.3) + rails-assets-underscore (>= 1.8.3) + rails-assets-blueimp-gallery (2.33.0) + rails-assets-bootstrap (3.4.1) + rails-assets-jquery (>= 1.9.1, < 4) + rails-assets-bootstrap-markdown (2.10.0) + rails-assets-bootstrap (~> 3) + rails-assets-corejs-typeahead (1.2.1) + rails-assets-jquery (>= 1.11) + rails-assets-diaspora_jsxc (0.1.5.develop.7) + rails-assets-emojione (~> 2.0.1) + rails-assets-favico.js (>= 0.3.10, < 0.4) + rails-assets-jquery-colorbox (~> 1.6.3) + rails-assets-jquery-fullscreen-plugin (~> 0.5.0) + rails-assets-jquery.slimscroll (~> 1.3.6) + rails-assets-jquery.ui (~> 1.11.4) + rails-assets-emojione (2.0.1) + rails-assets-favico.js (0.3.10) + rails-assets-fine-uploader (5.13.0) + rails-assets-highlightjs (9.12.0) + rails-assets-jasmine (3.4.0) + rails-assets-jasmine-ajax (4.0.0) + rails-assets-jasmine (~> 3) + rails-assets-jquery (3.6.0) + rails-assets-jquery-colorbox (1.6.4) + rails-assets-jquery (>= 1.3.2) + rails-assets-jquery-fullscreen-plugin (0.5.0) + rails-assets-jquery-placeholder (2.3.1) + rails-assets-jquery (>= 1.6) + rails-assets-jquery-textchange (0.2.3) + rails-assets-jquery + rails-assets-jquery.are-you-sure (1.9.0) + rails-assets-jquery (>= 1.4.2) + rails-assets-jquery.slimscroll (1.3.8) + rails-assets-jquery.ui (1.11.4) + rails-assets-jquery (>= 1.6) + rails-assets-markdown-it--markdown-it-for-inline (0.1.1) + rails-assets-markdown-it (8.4.2) + rails-assets-markdown-it-diaspora-mention (1.2.0) + rails-assets-markdown-it-footnote (3.0.3) + rails-assets-markdown-it-hashtag (0.4.0) + rails-assets-markdown-it-sanitizer (0.4.3) + rails-assets-markdown-it-sub (1.0.0) + rails-assets-markdown-it-sup (1.0.0) + rails-assets-underscore (1.9.1) + rails-assets-utatti-perfect-scrollbar (1.4.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -935,4 +932,4 @@ DEPENDENCIES will_paginate (= 3.3.1) BUNDLED WITH - 2.3.18 + 2.1.4