From 9576a82d2b5e9db8948abc0e6f1cc6e74c991e0c Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 31 Jan 2018 16:30:38 +0100 Subject: [PATCH] Revert "Bump default gems" This reverts commit c67f692ad25bbbe3f7f145dccf8f36c36d2968b4. --- Gemfile.lock | 124 +++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 63 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a3fc0c225..9ae9cbf9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,27 +42,27 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (2.3.6) - actioncable (5.1.4) - actionpack (= 5.1.4) - nio4r (~> 2.0) + actioncable (5.0.6) + actionpack (= 5.0.6) + nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) + actionmailer (5.0.6) + actionpack (= 5.0.6) + actionview (= 5.0.6) + activejob (= 5.0.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.4) - actionview (= 5.1.4) - activesupport (= 5.1.4) + actionpack (5.0.6) + actionview (= 5.0.6) + activesupport (= 5.0.6) rack (~> 2.0) - rack-test (>= 0.6.3) + rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.4) - activesupport (= 5.1.4) + actionview (5.0.6) + activesupport (= 5.0.6) builder (~> 3.1) - erubi (~> 1.4) + erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) active_model_serializers (0.10.7) @@ -70,43 +70,44 @@ GEM activemodel (>= 4.1, < 6) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.1.4) - activesupport (= 5.1.4) + activejob (5.0.6) + activesupport (= 5.0.6) globalid (>= 0.3.6) - activemodel (5.1.4) - activesupport (= 5.1.4) + activemodel (5.0.6) + activesupport (= 5.0.6) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.1.4) - activemodel (= 5.1.4) - activesupport (= 5.1.4) - arel (~> 8.0) - activesupport (5.1.4) + activerecord (5.0.6) + activemodel (= 5.0.6) + activesupport (= 5.0.6) + arel (~> 7.0) + activesupport (5.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - administrate (0.8.1) - actionpack (>= 4.2, < 5.2) - actionview (>= 4.2, < 5.2) - activerecord (>= 4.2, < 5.2) - autoprefixer-rails (>= 6.0) + administrate (0.4.0) + autoprefixer-rails (~> 6.0) + bourbon (~> 4.2) datetime_picker_rails (~> 0.0.7) - jquery-rails (>= 4.0) - kaminari (>= 1.0) + jquery-rails (~> 4.0) + kaminari (~> 0.16) momentjs-rails (~> 2.8) + neat (~> 1.1) + normalize-rails (~> 3.0) + rails (>= 4.2, < 5.1) sass-rails (~> 5.0) selectize-rails (~> 0.6) apipie-rails (0.5.6) rails (>= 4.1) - arel (8.0.0) + arel (7.1.4) ast (2.3.0) attr_required (1.0.1) - autoprefixer-rails (7.2.5) + autoprefixer-rails (6.7.7.2) execjs axlsx (2.0.1) htmlentities (~> 4.3.1) @@ -120,6 +121,9 @@ GEM sass (>= 3.3.4) bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) + bourbon (4.3.4) + sass (~> 3.4) + thor (~> 0.19) brakeman (4.1.1) browser (2.5.2) builder (3.2.3) @@ -146,7 +150,7 @@ GEM chartkick (2.2.5) childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.3.10) + chunky_png (1.3.8) clamav-client (3.1.0) coderay (1.1.2) coffee-rails (4.2.2) @@ -195,7 +199,6 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - erubi (1.7.0) erubis (2.7.0) eventmachine (1.2.1) excon (0.60.0) @@ -405,7 +408,7 @@ GEM domain_name (~> 0.5) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (0.9.3) + i18n (0.9.1) concurrent-ruby (~> 1.0) inflecto (0.0.2) ipaddress (0.8.3) @@ -421,18 +424,9 @@ GEM url_safe_base64 jsonapi-renderer (0.2.0) jwt (1.5.6) - kaminari (1.1.1) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.1.1) - kaminari-activerecord (= 1.1.1) - kaminari-core (= 1.1.1) - kaminari-actionview (1.1.1) - actionview - kaminari-core (= 1.1.1) - kaminari-activerecord (1.1.1) - activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) + kaminari (0.17.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) kgio (2.11.1) launchy (2.4.3) addressable (~> 2.3) @@ -475,11 +469,15 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) mustermann (1.0.1) + neat (1.9.0) + sass (>= 3.3) + thor (~> 0.19) nenv (0.3.0) netrc (0.11.0) nio4r (2.2.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) + normalize-rails (3.0.3) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -545,19 +543,19 @@ GEM rack (>= 1.1) rack-protection (2.0.0) rack - rack-test (0.8.2) - rack (>= 1.0, < 3) - rails (5.1.4) - actioncable (= 5.1.4) - actionmailer (= 5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) - activemodel (= 5.1.4) - activerecord (= 5.1.4) - activesupport (= 5.1.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.6) + actioncable (= 5.0.6) + actionmailer (= 5.0.6) + actionpack (= 5.0.6) + actionview (= 5.0.6) + activejob (= 5.0.6) + activemodel (= 5.0.6) + activerecord (= 5.0.6) + activesupport (= 5.0.6) bundler (>= 1.3.0) - railties (= 5.1.4) + railties (= 5.0.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -568,9 +566,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.1.4) - actionpack (= 5.1.4) - activesupport (= 5.1.4) + railties (5.0.6) + actionpack (= 5.0.6) + activesupport (= 5.0.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -719,7 +717,7 @@ GEM turbolinks-source (5.1.0) tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (4.1.4) + uglifier (4.1.3) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext