Merge pull request #149 from hellcp/update-rails

More dependency updates

Dockerfile

@@ -8,6 +8,7 @@ WORKDIR /app
 
 RUN gem.ruby2.7 install bundler -v 1.17.3
 RUN gem.ruby2.7 install mini_racer -v 0.6.3
+RUN gem.ruby2.7 install ffi -v '1.15.5'
 
 # Configure our bundle
 # ENV BUNDLE_FORCE_RUBY_PLATFORM=true

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rails', '4.2.11.3'
-gem 'responders', '~> 2.0'
+gem 'responders'
 
 # Choose your weapon
 gem 'sqlite3', '~> 1.3.13'
@@ -11,13 +11,14 @@ gem 'sqlite3', '~> 1.3.13'
 gem 'bigdecimal', '1.3.5'
 gem 'bundler', '< 2.0'
 gem 'psych', '< 4.0'
+gem 'sprockets', '< 4.0'
 
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.0'
+gem 'sass-rails'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier'
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
@@ -44,7 +45,7 @@ gem 'therubyracer', platforms: :ruby
 gem 'twitter-bootstrap-rails'
 
 gem 'active_hash'
-gem 'cancancan', '~> 1.7'
+gem 'cancancan', '~> 1.17'
 gem 'carrierwave'
 gem 'caxlsx_rails'
 gem 'clockwork'
@@ -57,6 +58,8 @@ gem 'espinita'
 gem 'inherited_resources'
 gem 'kaminari'
 gem 'localized_country_select'
+# Newer prawn lost the template support in Document
+# Would be good to replace with something else
 gem 'prawn', '~> 0.13.0'
 gem 'prawn_rails'
 gem 'puma'

Gemfile.lock

@@ -80,9 +80,9 @@ GEM
       activesupport
       tzinfo
     cocoon (1.2.15)
-    coffee-rails (4.0.1)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -119,6 +119,7 @@ GEM
       actionmailer (>= 4.0, < 7)
       activesupport (>= 4.0, < 7)
     execjs (2.8.1)
+    ffi (1.15.5)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.2.2)
@@ -134,7 +135,6 @@ GEM
       actionpack (>= 4.1)
       activesupport (>= 4.1)
     hashery (2.1.2)
-    hike (1.2.3)
     html2haml (2.3.0)
       erubis (~> 2.7.0)
       haml (>= 4.0)
@@ -199,7 +199,6 @@ GEM
     mini_racer (0.6.3)
       libv8-node (~> 16.10.0.0)
     minitest (5.16.3)
-    multi_json (1.15.0)
     nio4r (2.5.8)
     nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
@@ -303,12 +302,16 @@ GEM
     ruby_parser (3.19.1)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
-    sass (3.2.19)
-    sass-rails (4.0.5)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     sdoc (2.4.0)
       rdoc (>= 5.0)
     selenium-webdriver (3.142.7)
@@ -330,15 +333,13 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    sprockets (2.12.5)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     ssrf_filter (1.1.1)
     state_machines (0.5.0)
@@ -360,7 +361,7 @@ GEM
       ref
     thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (1.4.1)
+    tilt (2.0.11)
     ttfunk (1.0.3)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
@@ -398,14 +399,14 @@ DEPENDENCIES
   bigdecimal (= 1.3.5)
   bundler (< 2.0)
   byebug
-  cancancan (~> 1.7)
+  cancancan (~> 1.17)
   capybara
   capybara-email
   carrierwave
   caxlsx_rails
   clockwork
   cocoon
-  coffee-rails (~> 4.0.0)
+  coffee-rails
   daemons
   database_cleaner
   date_validator
@@ -431,25 +432,26 @@ DEPENDENCIES
   rails (= 4.2.11.3)
   ransack
   redcarpet
-  responders (~> 2.0)
+  responders
   rspec-rails
   rubocop (~> 0.49.1)
   ruby-graphviz
-  sass-rails (~> 4.0.0)
+  sass-rails
   sdoc
   selenium-webdriver (< 4.0)
   shoulda-matchers
   show_for
   simple_form
   simplecov
   simplecov-lcov
+  sprockets (< 4.0)
   sqlite3 (~> 1.3.13)
   state_machines-activerecord
   state_machines-yard
   therubyracer
   turbolinks
   twitter-bootstrap-rails
-  uglifier (>= 1.3.0)
+  uglifier
   web-console (~> 2.0)
   yard (~> 0.9.0)
   yard-activerecord

config/application.rb

@@ -55,5 +55,8 @@ class Application < Rails::Application
 
     # The configuration file for the application
     config.site = config_for(:site)
+
+    # Assets precompilation for the themes
+    config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
   end
 end

config/environments/production.rb

@@ -56,7 +56,7 @@
 
   # After migration to Rails 4, this seems to be needed. Otherwise, images
   # inside "themes" directory with no equivalent in "/app/assets" are ignored
-  config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
+  # config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false