From 5bccfba122220eb081888b8e2b2c1579e71a9d5b Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Wed, 4 Mar 2020 16:35:02 +0100
Subject: [PATCH] Update administrate gem

---
 Gemfile      |  1 +
 Gemfile.lock | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index 247cac509..f30eda63b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,6 +69,7 @@ gem 'sentry-raven'
 gem 'skylight'
 gem 'smart_listing'
 gem 'spreadsheet_architect'
+gem 'sprockets', '< 4'
 gem 'turbolinks' # Turbolinks makes following links in your web application faster
 gem 'typhoeus'
 gem 'warden'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9aa9ede1d..3a6299fa4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,16 +78,16 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    administrate (0.11.0)
-      actionpack (>= 4.2, < 6.0)
-      actionview (>= 4.2, < 6.0)
-      activerecord (>= 4.2, < 6.0)
+    administrate (0.12.0)
+      actionpack (>= 4.2)
+      actionview (>= 4.2)
+      activerecord (>= 4.2)
       autoprefixer-rails (>= 6.0)
       datetime_picker_rails (~> 0.0.7)
       jquery-rails (>= 4.0)
       kaminari (>= 1.0)
       momentjs-rails (~> 2.8)
-      sass-rails (~> 5.0)
+      sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
     aes_key_wrap (1.0.1)
     after_party (1.10.0)
@@ -95,7 +95,7 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     attr_required (1.0.1)
-    autoprefixer-rails (9.4.4)
+    autoprefixer-rails (9.7.4)
       execjs
     axlsx_styler (1.0.0)
       activesupport (>= 3.1)
@@ -315,7 +315,7 @@ GEM
       concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
     jaro_winkler (1.5.2)
-    jquery-rails (4.3.3)
+    jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -511,7 +511,7 @@ GEM
     rake (12.3.3)
     rake-progressbar (0.0.5)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     react-rails (2.4.7)
       babel-transpiler (>= 0.7.0)
@@ -579,17 +579,11 @@ GEM
     rubyzip (1.3.0)
     safe_yaml (1.0.4)
     sanitize-url (0.1.4)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
     sassc (2.0.0)
       ffi (~> 1.9.6)
       rake
@@ -655,7 +649,7 @@ GEM
     temple (0.8.0)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     timecop (0.9.1)
     ttfunk (1.5.1)
     turbolinks (5.2.0)
@@ -813,6 +807,7 @@ DEPENDENCIES
   spreadsheet_architect
   spring
   spring-commands-rspec
+  sprockets (< 4)
   timecop
   turbolinks
   typhoeus