From 2fcd3f289abb689a7425e921c937d4923dc38ee1 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sat, 15 May 2021 17:44:39 +0200 Subject: [PATCH] =?UTF-8?q?gemfile=20mis=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 12 +- Gemfile.lock | 306 ++++++++++++++++++++++++------------------------ config/env_init | 2 +- 3 files changed, 155 insertions(+), 165 deletions(-) diff --git a/Gemfile b/Gemfile index b267e9a..3b9a30b 100755 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -gem 'rails', '4.2.6' - +gem 'rails', '4.2.10' +gem 'mysql2', "0.4.10" gem 'sass-rails', '~> 5.0' @@ -28,15 +28,14 @@ gem 'haml-rails' gem "therubyracer", group: :production +gem "recaptcha", "4.12.0" + group :development, :test do gem 'byebug' #gem 'capistrano-rails' #gem "rvm-capistrano" - gem "capistrano", '2.15.9', group: :development - gem "rvm-capistrano",'1.4.1', group: :development, require: false - gem 'net-ssh', '~>2.7.0' gem 'web-console', '~> 2.0' @@ -83,6 +82,3 @@ gem 'zip-zip' # will load compatibility for old rubyzip API. gem 'ogone-rails' - - -gem "mysql2" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index bf455f9..93c9853 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,192 +1,188 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + 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.2) - activejob (4.2.6) - activesupport (= 4.2.6) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.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 (6.0.4) - bcrypt (3.1.10) - binding_of_caller (0.7.2) + bcrypt (3.1.16) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - builder (3.2.3) - byebug (3.5.1) - columnize (~> 0.8) - debugger-linecache (~> 1.2) - slop (~> 3.6) - 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) + builder (3.2.4) + byebug (11.1.3) + carrierwave (1.3.2) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) 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) - coffee-script (2.3.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) - columnize (0.9.0) - concurrent-ruby (1.0.5) - connection_pool (2.2.0) - crass (1.0.4) - debug_inspector (0.0.2) - debugger-linecache (1.2.0) + coffee-script-source (1.12.2) + commonjs (0.2.7) + concurrent-ruby (1.1.8) + connection_pool (2.2.5) + crass (1.0.6) + debug_inspector (1.1.0) erubis (2.7.0) - execjs (2.3.0) - ffi (1.9.25) + 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.9) - globalid (0.4.1) + geocoder (1.6.7) + 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) - highline (2.0.0) - html2haml (2.0.0) + html2haml (2.2.0) erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) ruby_parser (~> 3.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - jbuilder (2.2.8) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) - jquery-rails (4.0.3) - rails-dom-testing (~> 1.0) + jbuilder (2.9.1) + activesupport (>= 4.2.0) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + 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.3) + 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.2.2) + 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.1) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_mime (1.0.0) - mini_portile2 (2.1.0) - minitest (5.11.3) - multi_json (1.13.1) - mysql2 (0.4.8) - 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.3.0) - net-ssh (>= 2.6.5) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) + mime-types-data (3.2021.0225) + mini_mime (1.1.0) + mini_portile2 (2.4.0) + minitest (5.14.4) + mysql2 (0.4.10) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) ogone-rails (0.1.10) activesupport - paranoia (2.1.4) - activerecord (~> 4.0) - posix-spawn (0.3.11) - rack (1.6.10) + paranoia (2.4.3) + activerecord (>= 4.0, < 6.2) + posix-spawn (0.3.15) + rack (1.6.13) + rack-protection (2.1.0) + rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + 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.2.6) + 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) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails_autolink (1.1.6) rails (> 3.1) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + 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.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rdoc (4.2.0) - json (~> 1.4) - redis (3.2.2) + raindrops (0.19.1) + rake (13.0.3) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) + ffi (~> 1.0) + rdoc (4.3.0) + recaptcha (4.12.0) + json + redis (4.2.5) ref (2.0.0) - rmagick (2.13.4) - ruby_parser (3.6.4) - sexp_processor (~> 4.1) - rubyzip (1.2.0) - rvm-capistrano (1.4.1) - capistrano (>= 2.0.0) - sass (3.5.7) + rmagick (4.2.2) + ruby_parser (3.15.1) + sexp_processor (~> 4.9) + rubyzip (2.3.0) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -197,54 +193,54 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sexp_processor (4.4.5) - sidekiq (4.0.1) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - json (~> 1.0) - redis (~> 3.2, >= 3.2.1) - slop (3.6.0) - spring (1.3.2) + sexp_processor (4.15.2) + sidekiq (5.2.8) + connection_pool (~> 2.2, >= 2.2.2) + rack (< 2.1.0) + rack-protection (>= 1.5.0) + redis (>= 3.3.5, < 5) + 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) + ssrf_filter (1.0.7) + 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 (2.0.8) - turbolinks (2.5.3) - coffee-rails - twitter-bootstrap-rails (3.2.0) - actionpack (~> 4.1) - execjs (~> 2.2) - rails (~> 4.1) - railties (~> 4.1) - tzinfo (1.2.5) + 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 (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) + railties (>= 3.1) + tzinfo (1.2.9) thread_safe (~> 0.1) - uglifier (2.7.0) - execjs (>= 0.3.0) - json (>= 1.8.0) - unicorn (4.8.3) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + unicorn (6.0.0) kgio (~> 2.6) - rack raindrops (~> 0.7) - web-console (2.0.0) - activemodel (~> 4.0) + web-console (2.3.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) - rails - wkhtmltopdf-binary (0.9.9.3) + wicked_pdf (2.1.0) + activesupport + wkhtmltopdf-binary (0.12.6.5) workflow (1.2.0) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -257,7 +253,6 @@ DEPENDENCIES acts_as_tree bcrypt (~> 3.1.7) byebug - capistrano (= 2.15.9) carrierwave coffee-rails (~> 4.1.0) formtastic (= 2.3.0) @@ -268,16 +263,15 @@ DEPENDENCIES jbuilder (~> 2.0) jquery-rails kaminari-bootstrap - mysql2 - net-ssh (~> 2.7.0) + mysql2 (= 0.4.10) ogone-rails paranoia (~> 2.0) posix-spawn - rails (= 4.2.6) + rails (= 4.2.10) rails_autolink + recaptcha (= 4.12.0) rmagick rubyzip (>= 1.0.0) - rvm-capistrano (= 1.4.1) sass-rails (~> 5.0) sdoc (~> 0.4.0) sidekiq @@ -294,4 +288,4 @@ DEPENDENCIES zip-zip BUNDLED WITH - 1.16.2 + 1.17.3 diff --git a/config/env_init b/config/env_init index 55eefec..85d7189 100644 --- a/config/env_init +++ b/config/env_init @@ -1,4 +1,4 @@ -APP_RUBY=2.1.2 +APP_RUBY=2.6.0 ENV=production APP_ROOT=/srv/www/web/negos_app/current/ GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY