Merge branch 'staging'

LBHackney-IT · Mar 30, 2021 · 73a3c8c · 73a3c8c
2 parents a45b257 + 2588c38
commit 73a3c8c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 39 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.4.1
+2.6.6
diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
-ruby '2.4.1'
+ruby '2.6.6'
 gem 'rails', '5.1.6.2'
 
 # UI
 gem 'devise'
 gem 'draper'
 gem 'font-awesome-rails'
-gem 'haml-rails'
+gem "haml-rails", "~> 2.0"
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'sass-rails'
@@ -55,6 +55,8 @@ gem 'sendgrid_actionmailer_adapter'
 
 gem 'active_record-acts_as'
 
+gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f'
+
 group :development, :staging, :test do
   gem 'fabrication'
   gem 'ffaker'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/mimemagicrb/mimemagic.git
+  revision: 01f92d86d15d85cfd0f20dabd025dcbd36a8a60f
+  ref: 01f92d86d15d85cfd0f20dabd025dcbd36a8a60f
+  specs:
+    mimemagic (0.3.5)
+
 GIT
   remote: https://github.com/wearefuturegov/filterrific
   revision: 9809407c89fbb9c8b3719f21d21f5caef2e5863c
@@ -62,8 +69,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     appsignal (2.6.1)
       rack
     arel (8.0.0)
@@ -83,7 +90,7 @@ GEM
       rack (>= 0.9.0)
     bindex (0.5.0)
     brakeman (4.3.1)
-    builder (3.2.3)
+    builder (3.2.4)
     bullet (5.7.5)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
@@ -105,16 +112,16 @@ GEM
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.8)
     coveralls (0.8.22)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    crass (1.0.5)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -157,7 +164,7 @@ GEM
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
       mail (~> 2.6)
-    erubi (1.9.0)
+    erubi (1.10.0)
     erubis (2.7.0)
     execjs (2.7.0)
     fabrication (2.20.1)
@@ -171,16 +178,16 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     going_postal (0.1.6)
-    haml (5.0.1)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
-    haml-rails (1.0.0)
-      actionpack (>= 4.0.1)
-      activesupport (>= 4.0.1)
+    haml-rails (2.0.1)
+      actionpack (>= 5.1)
+      activesupport (>= 5.1)
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
-      railties (>= 4.0.1)
-    hashdiff (0.3.7)
+      railties (>= 5.1)
+    hashdiff (1.0.1)
     hashids (1.0.4)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
@@ -192,7 +199,7 @@ GEM
       multi_xml (>= 0.5.2)
     humanize_boolean (0.0.2)
       i18n
-    i18n (1.7.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     i18n-debug (1.1.1)
       i18n (< 2)
@@ -220,7 +227,7 @@ GEM
     kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.3.1)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -229,17 +236,17 @@ GEM
     mime-types (3.3)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    mimemagic (0.3.2)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multi_xml (0.6.0)
     mustermann (1.0.2)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     notifications-ruby-client (2.7.0)
       jwt (>= 1.5, < 3)
     orm_adapter (0.5.0)
@@ -267,9 +274,10 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.2)
+    public_suffix (4.0.6)
     puma (3.12.0)
-    rack (2.0.7)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-mini-profiler (2.2.0)
@@ -312,14 +320,15 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    rake (13.0.0)
+    rake (13.0.3)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     request_store (1.3.2)
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
+    rexml (3.2.4)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -353,10 +362,9 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     ruby_http_client (3.3.0)
-    ruby_parser (3.9.0)
-      sexp_processor (~> 4.1)
+    ruby_parser (3.15.1)
+      sexp_processor (~> 4.9)
     rubyzip (2.0.0)
-    safe_yaml (1.0.4)
     sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -376,7 +384,7 @@ GEM
       sinatra (>= 1.4.7, < 3)
     sendgrid_actionmailer_adapter (0.2.2)
       sendgrid-ruby (~> 5.0)
-    sexp_processor (4.9.0)
+    sexp_processor (4.15.2)
     simple_form (5.0.1)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
@@ -398,16 +406,16 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    temple (0.8.0)
+    temple (0.8.2)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.10)
     tins (1.16.3)
     tinymce-rails (5.0.3)
       railties (>= 3.1.1)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (4.1.17)
       execjs (>= 0.3.0, < 3)
@@ -425,10 +433,10 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.4.2)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
@@ -462,7 +470,7 @@ DEPENDENCIES
   filterrific!
   font-awesome-rails
   going_postal
-  haml-rails
+  haml-rails (~> 2.0)
   hashids
   httparty
   humanize_boolean
@@ -471,6 +479,7 @@ DEPENDENCIES
   jquery-ui-rails
   kaminari
   launchy
+  mimemagic!
   notifications-ruby-client
   paperclip
   paranoia
@@ -500,7 +509,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.6.6p146
 
 BUNDLED WITH
-   1.16.6
+   1.17.3