From b0d7aee680cb77962ba33bded7f9798480188917 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 1 May 2022 17:15:00 +0930 Subject: [PATCH 1/2] Pin higher, synk --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d8fa8f480..c1f684778 100644 --- a/Gemfile +++ b/Gemfile @@ -90,7 +90,7 @@ gem 'geocoder' gem 'bootstrap-datepicker-rails' # DRY-er easier bootstrap 4 forms -gem "bootstrap_form", ">= 4.2.0" +gem "bootstrap_form", ">= 4.5.0" # For connecting to other services (eg Twitter) gem 'omniauth', '~> 1.3' diff --git a/Gemfile.lock b/Gemfile.lock index 5eec2649e..9c71730af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -655,7 +655,7 @@ DEPENDENCIES bonsai-elasticsearch-rails bootstrap (>= 4.3.1) bootstrap-datepicker-rails - bootstrap_form (>= 4.2.0) + bootstrap_form (>= 4.5.0) bullet bundler (>= 1.1.5) byebug @@ -751,4 +751,4 @@ RUBY VERSION ruby 3.0.4p208 BUNDLED WITH - 2.3.10 + 2.3.11 From 45bd8ba9a30aa3056ba20de70255f590d2903ac8 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 1 May 2022 17:16:20 +0930 Subject: [PATCH 2/2] Pin explicitly --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c1f684778..1678c8138 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' # Match ruby version in .ruby-version ruby File.read('.ruby-version') -gem 'rails', '~> 6.1.0' +gem 'rails', '~> 6.1.5', '>= 6.1.5.1' # Keeping old sprockets # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050 diff --git a/Gemfile.lock b/Gemfile.lock index 9c71730af..055c9725e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -715,7 +715,7 @@ DEPENDENCIES query_diet rack-cors rack-protection (>= 2.0.1) - rails (~> 6.1.0) + rails (~> 6.1.5, >= 6.1.5.1) rails-assets-leaflet.markercluster! rails-controller-testing rails_12factor