From ebec6482b831ec167d0586ee48ace463d2c94fbd Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nbally@olwen-capital.com>
Date: Sat, 15 May 2021 09:36:01 +0200
Subject: [PATCH] suite

---
 Gemfile               |  15 +-
 Gemfile.lock          | 329 +++++++++++++++++++++++-------------------
 config/application.rb |   2 +-
 config/env_init       |   2 +-
 4 files changed, 183 insertions(+), 165 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7246cfd..3bd717c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.13'
+gem 'rails', '4.2.10'
   
 gem 'bcrypt-ruby', '3.1.2'
 # Use sqlite3 as the database for Active Record
 
-gem 'mysql2', '~> 0.3.18'
+gem 'mysql2', "0.4.10"
 gem 'sass-rails'
 
 # Use Uglifier as compressor for JavaScript assets
@@ -47,14 +47,7 @@ group :doc do
   gem 'sdoc', require: false
 end
 
-gem "capistrano", group: :development
-gem "rvm-capistrano", group: :development, :require => false
-gem 'net-ssh', '~>2.7.0'
-# Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# Use unicorn as the app server
-gem 'unicorn', "4.6.3"
+gem 'unicorn' #, "4.6.3"
 
 
 gem 'kaminari-bootstrap'
@@ -72,7 +65,7 @@ gem 'carrierwave', "0.9.0"
 gem "geocoder"
 
 #markdown
-gem 'pygments.rb'
+#gem 'pygments.rb'
 gem 'redcarpet'
 gem "non-stupid-digest-assets"
 gem "twitter-bootstrap-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index c827984..247f847 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,44 +1,48 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
+      globalid (>= 0.3.0)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
+      arel (~> 6.0)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     acts_as_commentable (4.0.2)
-    acts_as_tree (2.1.0)
+    acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
-    arel (4.0.2)
-    bcrypt (3.1.9)
+    arel (6.0.4)
+    bcrypt (3.1.16)
     bcrypt-ruby (3.1.2)
-    builder (3.1.4)
+    builder (3.2.4)
     cancan (1.6.10)
-    capistrano (2.15.5)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
     carrierwave (0.9.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
@@ -46,162 +50,184 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
-    concurrent-ruby (1.0.5)
-    devise (3.4.1)
+    coffee-script-source (1.12.2)
+    commonjs (0.2.7)
+    concurrent-ruby (1.1.8)
+    crass (1.0.6)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.2.2)
+    execjs (2.8.1)
+    ffi (1.15.0)
     formtastic (2.3.0)
       actionpack (>= 3.0)
     formtastic-bootstrap (3.0.0)
       formtastic (>= 2.2)
-    geocoder (1.2.6)
-    haml (4.1.0.beta.1)
+    geocoder (1.6.7)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    haml (5.2.1)
+      temple (>= 0.8.0)
       tilt
-    haml-rails (0.6.0)
+    haml-rails (1.0.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.6.21)
-    hike (1.2.3)
-    hpricot (0.8.6)
-    html2haml (1.0.1)
+    html2haml (2.2.0)
       erubis (~> 2.7.0)
-      haml (>= 4.0.0.rc.1)
-      hpricot (~> 0.8.6)
-      ruby_parser (~> 3.1.1)
-    htmlentities (4.3.2)
+      haml (>= 4.0, < 6)
+      nokogiri (>= 1.6.0)
+      ruby_parser (~> 3.5)
+    htmlentities (4.3.4)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jbuilder (1.0.2)
       activesupport (>= 3.0.0)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.4.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.3)
+    jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (1.8.1)
-    kaminari (0.16.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    json (2.5.1)
+    kaminari (1.2.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
+      actionview
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
+      activerecord
+      kaminari-core (= 1.2.1)
     kaminari-bootstrap (3.0.1)
       kaminari (>= 0.13.0)
       rails
-    kgio (2.9.2)
-    libv8 (3.16.14.7)
-    mail (2.7.0)
+    kaminari-core (1.2.1)
+    kgio (2.11.3)
+    less (2.6.0)
+      commonjs (~> 0.2.7)
+    less-rails (4.0.0)
+      actionpack (>= 4)
+      less (~> 2.6.0)
+      sprockets (>= 2)
+    libv8 (3.16.14.19)
+    loofah (2.9.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.0.0)
-    mini_portile (0.6.1)
-    minitest (4.7.5)
-    multi_json (1.13.1)
-    mysql2 (0.3.21)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    non-stupid-digest-assets (1.0.4)
+    mini_mime (1.1.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    mysql2 (0.4.10)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    non-stupid-digest-assets (1.0.9)
+      sprockets (>= 2.0)
     orm_adapter (0.5.0)
-    paypal-sdk-core (0.3.1)
+    paypal-sdk-core (0.3.4)
       multi_json (~> 1.0)
       xml-simple
-    paypal-sdk-merchant (1.116.0)
+    paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    posix-spawn (0.3.9)
-    pygments.rb (0.6.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rack (1.5.5)
+    posix-spawn (0.3.15)
+    rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
-      sprockets-rails (~> 2.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
+      railties (= 4.2.10)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.4)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.13.0)
-    rake (12.3.0)
-    rdoc (4.2.0)
-      json (~> 1.4)
-    redcarpet (3.2.1)
-    ref (1.0.5)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
-    rmagick (2.13.4)
-    ruby_parser (3.1.3)
-      sexp_processor (~> 4.1)
-    rvm-capistrano (1.5.5)
-      capistrano (~> 2.15.4)
-    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)
-    sdoc (0.4.1)
-      json (~> 1.7, >= 1.7.7)
-      rdoc (~> 4.0)
-    sexp_processor (4.4.4)
-    sprockets (2.12.4)
-      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)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
+    raindrops (0.19.1)
+    rake (13.0.3)
+    rdoc (6.3.1)
+    redcarpet (3.5.1)
+    ref (2.0.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rmagick (4.2.2)
+    ruby_parser (3.15.1)
+      sexp_processor (~> 4.9)
+    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.1.0)
+      rdoc (>= 5.0)
+    sexp_processor (4.15.2)
+    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)
+    temple (0.8.2)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
-    thor (0.20.0)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tilt (1.4.1)
-    turbolinks (2.5.3)
-      coffee-rails
-    twitter-bootstrap-rails (2.2.8)
+    tilt (2.0.10)
+    turbolinks (5.2.1)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
+    twitter-bootstrap-rails (3.2.2)
       actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
+      execjs (>= 2.2.2, >= 2.2)
+      less-rails (>= 2.5.0)
       railties (>= 3.1)
-    tzinfo (0.3.53)
-    uglifier (2.5.3)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    unicorn (4.6.3)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    uglifier (4.2.0)
+      execjs (>= 0.3.0, < 3)
+    unicorn (6.0.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    warden (1.2.3)
+    warden (1.2.7)
       rack (>= 1.0)
-    wicked_pdf (0.11.0)
-      rails
-    xml-simple (1.1.4)
-    yajl-ruby (1.1.0)
+    wicked_pdf (2.1.0)
+      activesupport
+    xml-simple (1.1.8)
 
 PLATFORMS
   ruby
@@ -211,7 +237,6 @@ DEPENDENCIES
   acts_as_tree
   bcrypt-ruby (= 3.1.2)
   cancan
-  capistrano
   carrierwave (= 0.9.0)
   coffee-rails (~> 4.0.0)
   devise
@@ -225,22 +250,22 @@ DEPENDENCIES
   jquery-ui-rails
   kaminari
   kaminari-bootstrap
-  mysql2 (~> 0.3.18)
-  net-ssh (~> 2.7.0)
+  mysql2 (= 0.4.10)
   nokogiri
   non-stupid-digest-assets
   paypal-sdk-merchant
   posix-spawn
-  pygments.rb
-  rails (= 4.0.13)
+  rails (= 4.2.10)
   redcarpet
   rmagick
-  rvm-capistrano
   sass-rails
   sdoc
   therubyracer
   turbolinks
   twitter-bootstrap-rails
   uglifier (>= 1.3.0)
-  unicorn (= 4.6.3)
+  unicorn
   wicked_pdf
+
+BUNDLED WITH
+   1.17.3
diff --git a/config/application.rb b/config/application.rb
index 96faff3..1b9cc10 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -52,7 +52,7 @@ module Survey
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    #config.active_record.whitelist_attributes = true
 
     config.assets.precompile += %w( plume_print.css public.js public.css admin.js admin.css forum.css forum.js plaquettes.css plaquettes.js connexion.js connexion.css )
   end
diff --git a/config/env_init b/config/env_init
index c4593fe..cb80d73 100644
--- a/config/env_init
+++ b/config/env_init
@@ -1,5 +1,5 @@
 
-APP_RUBY=2.1.2
+APP_RUBY=2.6.0
 ENV=production
 APP_ROOT=/srv/www/web/pic_vert_app/current/
 GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY