update

Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '4.2.10'
 
-gem "mysql2"
+gem "mysql2", "0.4.10"
 
 gem 'sass-rails', '5.0.3'
 
@@ -33,13 +33,6 @@ gem "country_select"
 
 group :development, :test do
   gem 'byebug'
-  #gem 'capistrano-rails'
-  #gem "rvm-capistrano"
-  
-  gem "capistrano", '2.15.9', group: :development,  require: false
-  gem "rvm-capistrano",'1.4.1', group: :development
-  gem 'net-ssh', '~> 5.1.0'
-  
   
   gem 'web-console', '~> 2.0'
 

Gemfile.lock

@@ -36,156 +36,165 @@ GEM
       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)
-    addressable (2.4.0)
     arel (6.0.4)
-    bcrypt (3.1.10)
+    bcrypt (3.1.16)
-    binding_of_caller (0.7.2)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    builder (3.2.3)
+    builder (3.2.4)
-    byebug (3.5.1)
+    byebug (11.1.3)
-      columnize (~> 0.8)
+    carrierwave (1.3.2)
-      debugger-linecache (~> 1.2)
+      activemodel (>= 4.0.0)
-      slop (~> 3.6)
+      activesupport (>= 4.0.0)
-    capistrano (2.15.9)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    carrierwave (0.10.0)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
       mime-types (>= 1.16)
-    coffee-rails (4.1.0)
+      ssrf_filter (~> 1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.12.2)
-    columnize (0.9.0)
+    commonjs (0.2.7)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.8)
-    countries (1.2.2)
+    countries (3.1.0)
-      currencies (~> 0.4.2)
+      i18n_data (~> 0.11.0)
-      i18n_data (~> 0.7.0)
+      sixarm_ruby_unaccent (~> 1.1)
-    country_select (2.5.1)
+      unicode_utils (~> 1.4)
-      countries (~> 1.2.0)
+    country_select (5.0.1)
-      sort_alphabetical (~> 1.0)
+      countries (~> 3.0)
-    crass (1.0.4)
+      sort_alphabetical (~> 1.1)
-    currencies (0.4.2)
+    crass (1.0.6)
-    debug_inspector (0.0.2)
+    debug_inspector (1.1.0)
-    debugger-linecache (1.2.0)
+    elasticsearch (7.12.0)
-    elasticsearch (6.0.1)
+      elasticsearch-api (= 7.12.0)
-      elasticsearch-api (= 6.0.1)
+      elasticsearch-transport (= 7.12.0)
-      elasticsearch-transport (= 6.0.1)
+    elasticsearch-api (7.12.0)
-    elasticsearch-api (6.0.1)
       multi_json
-    elasticsearch-transport (6.0.1)
+    elasticsearch-transport (7.12.0)
-      faraday
+      faraday (~> 1)
       multi_json
     erubis (2.7.0)
-    execjs (2.3.0)
+    execjs (2.8.1)
-    faraday (0.12.2)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-    fastimage (1.8.1)
+      ruby2_keywords (>= 0.0.4)
-      addressable (~> 2.3, >= 2.3.5)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    fastimage (2.2.3)
+    ffi (1.15.0)
     formtastic (2.3.0)
       actionpack (>= 3.0)
     formtastic-bootstrap (3.0.0)
       formtastic (>= 2.2)
-    geocoder (1.2.9)
+    geocoder (1.6.7)
-    gibbon (3.1.1)
+    gibbon (3.4.0)
-      faraday (>= 0.9.1)
+      faraday (>= 0.16.0)
       multi_json (>= 1.11.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     gravatar_image_tag (1.2.0)
-    haml (4.0.6)
+    haml (5.2.1)
+      temple (>= 0.8.0)
       tilt
-    haml-rails (0.8.2)
+    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)
-    hashie (3.5.7)
+    hashie (4.1.0)
-    highline (2.0.3)
+    html2haml (2.2.0)
-    html2haml (2.0.0)
       erubis (~> 2.7.0)
-      haml (~> 4.0.0)
+      haml (>= 4.0, < 6)
-      nokogiri (~> 1.6.0)
+      nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.7.0)
+    i18n_data (0.11.0)
     iban-tools (1.1.0)
-    jbuilder (2.2.8)
+    idn-ruby (0.1.0)
-      activesupport (>= 3.0.0, < 5)
+    jbuilder (2.9.1)
-      multi_json (~> 1.2)
+      activesupport (>= 4.2.0)
-    jquery-rails (4.0.3)
+    jquery-rails (4.4.0)
-      rails-dom-testing (~> 1.0)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.6)
-    jwt (1.5.6)
+    jwt (2.2.3)
-    kaminari (0.16.3)
+    kaminari (1.2.1)
-      actionpack (>= 3.0.0)
+      activesupport (>= 4.1.0)
-      activesupport (>= 3.0.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.3)
+    kaminari-core (1.2.1)
-    libv8 (3.16.14.7)
+    kgio (2.11.3)
-    loofah (2.2.2)
+    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.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2021.0225)
-    mini_mime (1.0.1)
+    mini_mime (1.1.0)
-    mini_portile (0.5.3)
+    mini_portile2 (2.5.1)
-    minitest (5.11.3)
+    minitest (5.14.4)
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     mysql2 (0.4.10)
-    net-scp (3.0.0)
+    nokogiri (1.11.4)
-      net-ssh (>= 2.6.5, < 7.0.0)
+      mini_portile2 (~> 2.5.0)
-    net-sftp (3.0.0)
+      racc (~> 1.4)
-      net-ssh (>= 5.0.0, < 7.0.0)
+    oauth2 (1.4.7)
-    net-ssh (5.1.0)
+      faraday (>= 0.8, < 2.0)
-    net-ssh-gateway (2.0.0)
+      jwt (>= 1.0, < 3.0)
-      net-ssh (>= 4.0.0)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     ogone-rails (0.1.10)
       activesupport
-    omniauth (1.6.1)
+    omniauth (2.0.4)
-      hashie (>= 3.4.6, < 3.6.0)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-facebook (4.0.0)
+      rack-protection
+    omniauth-facebook (8.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-oauth2 (1.4.0)
+    omniauth-oauth2 (1.7.1)
-      oauth2 (~> 1.0)
+      oauth2 (~> 1.4)
-      omniauth (~> 1.2)
+      omniauth (>= 1.9, < 3)
     paypal-sdk-core (0.3.4)
       multi_json (~> 1.0)
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    posix-spawn (0.3.11)
+    posix-spawn (0.3.15)
-    rack (1.6.10)
+    racc (1.5.2)
+    rack (1.6.13)
+    rack-protection (2.1.0)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.10)
@@ -199,14 +208,14 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.10)
       sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
+    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.0.4)
+    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.2, >= 2.2.2)
+      loofah (~> 2.3)
     rails_autolink (1.1.6)
       rails (> 3.1)
     railties (4.2.10)
@@ -214,91 +223,98 @@ GEM
       activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.13.0)
+    raindrops (0.19.1)
-    rake (12.3.1)
+    rake (13.0.3)
-    rdoc (4.2.0)
+    rb-fsevent (0.11.0)
-      json (~> 1.4)
+    rb-inotify (0.10.1)
-    redcarpet (3.3.4)
+      ffi (~> 1.0)
-    ref (1.0.5)
+    rdoc (4.3.0)
-    rmagick (2.13.4)
+    redcarpet (3.5.1)
+    ref (2.0.0)
+    rmagick (4.2.2)
     roo (2.1.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
-    roo-xls (1.0.0)
+    roo-xls (1.2.0)
       nokogiri
-      roo (>= 2.0.0beta1, < 3)
+      roo (>= 2.0.0, < 3)
       spreadsheet (> 0.9.0)
-    ruby-ole (1.2.11.8)
+    ruby-ole (1.2.12.2)
-    ruby_parser (3.6.4)
+    ruby2_keywords (0.0.4)
-      sexp_processor (~> 4.1)
+    ruby_parser (3.16.0)
-    rubyzip (1.1.7)
+      sexp_processor (~> 4.15, >= 4.15.1)
-    rvm-capistrano (1.4.1)
+    rubyzip (1.3.0)
-      capistrano (>= 2.0.0)
+    sass (3.7.4)
-    sass (3.4.22)
+      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.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    sdoc (0.4.1)
+    sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    searchkick (2.4.0)
+    searchkick (3.1.3)
-      activemodel (>= 4.1)
+      activemodel (>= 4.2)
-      elasticsearch (>= 1)
+      elasticsearch (>= 5)
       hashie
-    sexp_processor (4.4.5)
+    sexp_processor (4.15.3)
-    slop (3.6.0)
+    sixarm_ruby_unaccent (1.2.0)
-    sort_alphabetical (1.0.2)
+    sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
-    spreadsheet (1.0.9)
+    spreadsheet (1.2.8)
-      ruby-ole (>= 1.0)
+      ruby-ole
-    spring (1.3.2)
+    spring (2.1.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    therubyracer (0.12.1)
+    ssrf_filter (1.0.7)
-      libv8 (~> 3.16.14.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)
     truncate_html (0.9.3)
-    turbolinks (2.5.3)
+    turbolinks (5.2.1)
-      coffee-rails
+      turbolinks-source (~> 5.2)
-    twitter-bootstrap-rails (3.2.0)
+    turbolinks-source (5.2.0)
-      actionpack (~> 4.1)
+    twitter-bootstrap-rails (3.2.2)
-      execjs (~> 2.2)
+      actionpack (>= 3.1)
-      rails (~> 4.1)
+      execjs (>= 2.2.2, >= 2.2)
-      railties (~> 4.1)
+      less-rails (>= 2.5.0)
-    twitter-text (1.13.4)
+      railties (>= 3.1)
+    twitter-text (3.1.0)
+      idn-ruby
       unf (~> 0.1.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    uglifier (2.7.0)
+    uglifier (4.2.0)
-      execjs (>= 0.3.0)
+      execjs (>= 0.3.0, < 3)
-      json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.7)
     unicode_utils (1.4.0)
-    unicorn (4.8.3)
+    unicorn (6.0.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    web-console (2.0.0)
+    web-console (2.3.0)
-      activemodel (~> 4.0)
+      activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
-      railties (~> 4.0)
+      railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    wicked_pdf (0.11.0)
+    wicked_pdf (2.1.0)
-      rails
+      activesupport
-    xml-simple (1.1.5)
+    xml-simple (1.1.8)
 
 PLATFORMS
   ruby
@@ -308,7 +324,6 @@ DEPENDENCIES
   acts_as_tree
   bcrypt (~> 3.1.7)
   byebug
-  capistrano (= 2.15.9)
   carrierwave
   coffee-rails (~> 4.1.0)
   country_select
@@ -323,8 +338,7 @@ DEPENDENCIES
   jbuilder (~> 2.0)
   jquery-rails
   kaminari-bootstrap
-  mysql2
+  mysql2 (= 0.4.10)
-  net-ssh (~> 5.1.0)
   nokogiri
   ogone-rails
   omniauth-facebook
@@ -336,7 +350,6 @@ DEPENDENCIES
   rmagick
   roo (~> 2.1.0)
   roo-xls
-  rvm-capistrano (= 1.4.1)
   sass-rails (= 5.0.3)
   sdoc (~> 0.4.0)
   searchkick

app/controllers/admin/i_hebergements_controller.rb

@@ -2,9 +2,9 @@
 
 class Admin::IHebergementsController < ApplicationController
   layout "admin"
-  before_filter :auth_admin, :except => :restart_support
+  before_filter :auth_admin, :except => :support_app
 
-  before_filter :admin_space, :except => :restart_support
+  before_filter :admin_space, :except => :support_app
   
   
   def support_app

config/env_init

@@ -1,5 +1,5 @@
 
-APP_RUBY=2.3.0
+APP_RUBY=2.6.0
 ENV=production
 APP_ROOT=/srv/www/web/intra_app/current/
 GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY