From 5d3323c3761714ef2f698ceed0e7ef10b5f31e28 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 25 Jul 2019 17:56:56 +0200 Subject: [PATCH] suite --- Gemfile | 9 +++--- Gemfile.lock | 86 +++++++++++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/Gemfile b/Gemfile index efba6d5..aa9846d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.6' +gem 'rails', '4.0.1' gem 'bcrypt-ruby', '~> 3.0.0' @@ -10,7 +10,7 @@ gem 'bcrypt-ruby', '~> 3.0.0' gem 'mysql2' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '~> 2.7' +gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' @@ -27,9 +27,8 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.0.1' -gem "therubyracer", "0.12.3" #, group: :production -#gem 'less-rails', github: 'metaskills/less-rails', branch: 'depends_only_on_less_files' -gem 'less-rails' +gem "therubyracer", group: :production +gem "less-rails" gem "twitter-bootstrap-rails" gem 'haml-rails' diff --git a/Gemfile.lock b/Gemfile.lock index aaf8fba..b3b98d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,26 +8,26 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.6) - actionpack (= 4.0.6) + actionmailer (4.0.1) + actionpack (= 4.0.1) mail (~> 2.5.4) - actionpack (4.0.6) - activesupport (= 4.0.6) + actionpack (4.0.1) + activesupport (= 4.0.1) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.6) - activesupport (= 4.0.6) + activemodel (4.0.1) + activesupport (= 4.0.1) builder (~> 3.1.0) - activerecord (4.0.6) - activemodel (= 4.0.6) + activerecord (4.0.1) + activemodel (= 4.0.1) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.6) + activesupport (= 4.0.1) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.4) - activesupport (4.0.6) - i18n (~> 0.6, >= 0.6.9) + activesupport (4.0.1) + i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) @@ -54,7 +54,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) - commonjs (0.2.7) + commonjs (0.2.6) concurrent-ruby (1.1.5) erubis (2.7.0) execjs (1.4.0) @@ -67,6 +67,7 @@ GEM haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) highline (1.6.19) + hike (1.2.3) htmlentities (4.3.1) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -83,12 +84,11 @@ 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) mime-types (~> 1.16) @@ -97,7 +97,7 @@ GEM mini_portile (0.5.1) minitest (4.7.5) multi_json (1.13.1) - mysql2 (0.3.21) + mysql2 (0.3.18) net-scp (1.1.2) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -111,20 +111,20 @@ GEM rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails (4.0.6) - actionmailer (= 4.0.6) - actionpack (= 4.0.6) - activerecord (= 4.0.6) - activesupport (= 4.0.6) + rails (4.0.1) + actionmailer (= 4.0.1) + actionpack (= 4.0.1) + activerecord (= 4.0.1) + activesupport (= 4.0.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.6) - sprockets-rails (~> 2.0) - railties (4.0.6) - actionpack (= 4.0.6) - activesupport (= 4.0.6) + railties (= 4.0.1) + sprockets-rails (~> 2.0.0) + railties (4.0.1) + actionpack (= 4.0.1) + activesupport (= 4.0.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.19.0) + raindrops (0.11.0) rake (12.3.3) rdoc (3.12.2) json (~> 1.4) @@ -135,19 +135,21 @@ GEM sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (2.3.3) + sprockets (2.12.5) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.0.1) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets (~> 2.8) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.9) + tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -159,10 +161,10 @@ GEM rails (>= 3.1) railties (>= 3.1) tzinfo (0.3.55) - uglifier (2.7.2) + uglifier (2.1.2) execjs (>= 0.3.0) - json (>= 1.8.0) - unicorn (5.5.1) + multi_json (~> 1.0, >= 1.0.2) + unicorn (4.6.3) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -185,14 +187,14 @@ DEPENDENCIES less-rails mysql2 nokogiri - rails (= 4.0.6) + rails (= 4.0.1) rmagick rvm-capistrano sdoc - therubyracer (= 0.12.3) + therubyracer turbolinks twitter-bootstrap-rails - uglifier (~> 2.7) + uglifier (>= 1.3.0) unicorn BUNDLED WITH