From 074fa2a958b77a22b4af13aeaa72fc4b70981e4b Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 25 Jul 2019 19:39:02 +0200 Subject: [PATCH] suite --- Gemfile | 8 +++---- Gemfile.lock | 62 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index 4caa76d..0d2f713 100644 --- a/Gemfile +++ b/Gemfile @@ -4,9 +4,7 @@ source 'https://rubygems.org' gem 'rails', '4.0.0' -#gem 'bcrypt', '~> 3.1.7' gem 'bcrypt-ruby', '~> 3.0.0' - # Use sqlite3 as the database for Active Record #gem 'sqlite3' gem 'mysql2' @@ -29,7 +27,7 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.0.1' -gem "therubyracer", group: :production +gem "therubyracer", :group => :production gem "less-rails" gem "twitter-bootstrap-rails" @@ -46,7 +44,7 @@ gem 'kaminari-bootstrap' gem "htmlentities" gem 'carrierwave' -gem 'rmagick', "2.16.0" +gem 'rmagick' group :doc do # bundle exec rake doc:rails generates the API under doc/api. @@ -60,7 +58,7 @@ gem "rvm-capistrano", group: :development, :require => false # gem 'bcrypt-ruby', '~> 3.0.0' # Use unicorn as the app server -gem 'unicorn', "5.5.1" +gem 'unicorn' gem "nokogiri" diff --git a/Gemfile.lock b/Gemfile.lock index 523de5f..00e2c85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ GEM activerecord-deprecated_finders (~> 1.0.2) activesupport (= 4.0.0) arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.4) + activerecord-deprecated_finders (1.0.3) activesupport (4.0.0) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) @@ -34,7 +34,8 @@ GEM tzinfo (~> 0.3.37) acts_as_tree (1.4.0) activerecord (>= 3.0.0) - arel (4.0.2) + arel (4.0.0) + atomic (1.1.10) bcrypt-ruby (3.0.1) builder (3.1.4) capistrano (2.15.5) @@ -54,8 +55,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) - commonjs (0.2.7) - concurrent-ruby (1.1.5) + commonjs (0.2.6) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -69,8 +69,7 @@ GEM highline (1.6.19) hike (1.2.3) htmlentities (4.3.1) - i18n (0.9.5) - concurrent-ruby (~> 1.0) + i18n (0.6.4) jbuilder (1.0.2) activesupport (>= 3.0.0) jquery-rails (3.0.4) @@ -84,20 +83,19 @@ GEM kaminari (>= 0.13.0) rails kgio (2.11.2) - less (2.6.0) - commonjs (~> 0.2.7) - less-rails (4.0.0) - actionpack (>= 4) - less (~> 2.6.0) - sprockets (>= 2) + less (2.3.2) + commonjs (~> 0.2.6) + less-rails (2.3.3) + actionpack (>= 3.1) + less (~> 2.3.1) libv8 (3.16.14.19) - mail (2.5.5) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.25.1) + mime-types (1.23) mini_portile (0.5.1) minitest (4.7.5) - multi_json (1.13.1) + multi_json (1.7.7) mysql2 (0.3.18) net-scp (1.1.2) net-ssh (>= 2.6.5) @@ -108,9 +106,9 @@ GEM net-ssh (>= 2.6.5) nokogiri (1.6.0) mini_portile (~> 0.5.0) - polyglot (0.3.5) - rack (1.5.5) - rack-test (0.6.3) + polyglot (0.3.3) + rack (1.5.2) + rack-test (0.6.2) rack (>= 1.0) rails (4.0.0) actionmailer (= 4.0.0) @@ -125,33 +123,34 @@ GEM activesupport (= 4.0.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.19.0) - rake (12.3.3) + raindrops (0.11.0) + rake (10.1.0) rdoc (3.12.2) json (~> 1.4) - ref (2.0.0) + ref (1.0.5) rmagick (2.16.0) rvm-capistrano (1.4.1) capistrano (>= 2.0.0) sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) - sprockets (2.12.5) + sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.0.0) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) therubyracer (0.12.3) - libv8 (~> 3.16.14.15) + libv8 (~> 3.11.8.12) ref - thor (0.20.3) - thread_safe (0.3.6) + thor (0.18.1) + thread_safe (0.1.0) + atomic tilt (1.4.1) - treetop (1.4.15) + treetop (1.4.14) polyglot polyglot (>= 0.3.1) turbolinks (1.3.0) @@ -161,12 +160,13 @@ GEM execjs rails (>= 3.1) railties (>= 3.1) - tzinfo (0.3.55) + tzinfo (0.3.37) uglifier (2.1.2) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - unicorn (5.5.1) + unicorn (4.6.3) kgio (~> 2.6) + rack raindrops (~> 0.7) PLATFORMS @@ -188,14 +188,14 @@ DEPENDENCIES mysql2 nokogiri rails (= 4.0.0) - rmagick (= 2.16.0) + rmagick rvm-capistrano sdoc therubyracer turbolinks twitter-bootstrap-rails uglifier (>= 1.3.0) - unicorn (= 5.5.1) + unicorn BUNDLED WITH 1.16.4