Merge pull request #3029 from Growstuff/upgrade-cms

Swap CMS

Gemfile

@@ -59,7 +59,7 @@ gem 'pg'
 gem 'ruby-units'                   # for unit conversion
 gem 'unicorn'                      # http server
 
-gem "comfortable_mexican_sofa", "~> 2.0.19"
+gem "comfortable_mexican_sofa", git: "https://github.com/restarone/comfortable-mexican-sofa.git"
 
 gem 'active_utils'
 gem 'sidekiq'

Gemfile.lock

@@ -1,3 +1,20 @@
+GIT
+  remote: https://github.com/restarone/comfortable-mexican-sofa.git
+  revision: 2b80ce723ce9b80bb20752c32e81870ad37a25d5
+  specs:
+    comfortable_mexican_sofa (2.0.19)
+      active_link_to (>= 1.0.0)
+      comfy_bootstrap_form (>= 4.0.0)
+      haml-rails (>= 1.0.0)
+      image_processing (>= 1.2)
+      jquery-rails (>= 4.3.1)
+      kramdown (>= 1.0.0)
+      mimemagic (>= 0.3.2)
+      mini_magick (>= 4.8.0)
+      rails (>= 5.2.0)
+      rails-i18n (>= 5.0.0)
+      sassc-rails (>= 2.0.0)
+
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
@@ -151,17 +168,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    comfortable_mexican_sofa (2.0.19)
-      active_link_to (>= 1.0.0)
-      comfy_bootstrap_form (>= 4.0.0)
-      haml-rails (>= 1.0.0)
-      jquery-rails (>= 4.3.1)
-      kramdown (>= 1.0.0)
-      mimemagic (>= 0.3.2)
-      mini_magick (>= 4.8.0)
-      rails (>= 5.2.0)
-      rails-i18n (>= 5.0.0)
-      sassc-rails (>= 2.0.0)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
     concord (0.1.6)
@@ -330,7 +336,7 @@ GEM
     jsonapi-swagger (0.8.1)
     jwt (2.3.0)
     kgio (2.11.4)
-    kramdown (2.3.1)
+    kramdown (2.3.2)
       rexml
     launchy (2.5.0)
       addressable (~> 2.7)
@@ -657,7 +663,7 @@ DEPENDENCIES
   chartkick
   codeclimate-test-reporter
   coffee-rails
-  comfortable_mexican_sofa (~> 2.0.19)
+  comfortable_mexican_sofa!
   csv_shaper
   dalli
   database_cleaner
@@ -739,7 +745,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-  ruby 2.7.5p203
+   ruby 2.7.5p203
 
 BUNDLED WITH
    1.17.3