From 98081097b4e63da9de7625d72029fdf5314a1cd0 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Fri, 9 Nov 2018 07:42:26 -0800 Subject: [PATCH] Revert "update rails dependencies" Original commit broke the build, since some dependencies have breaking changes. This reverts commit f753392d495af7b03422a508974ff9efa42356da. --- Gemfile.lock | 291 +++++++++++++++++++++++++-------------------------- package.json | 2 +- 2 files changed, 146 insertions(+), 147 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 54c0f25b..117863c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,259 +1,259 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.7) - actionpack (= 5.0.7) + actioncable (5.0.5) + actionpack (= 5.0.5) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) + actionmailer (5.0.5) + actionpack (= 5.0.5) + actionview (= 5.0.5) + activejob (= 5.0.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) + actionpack (5.0.5) + actionview (= 5.0.5) + activesupport (= 5.0.5) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7) - activesupport (= 5.0.7) + actionview (5.0.5) + activesupport (= 5.0.5) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.10.7) + active_model_serializers (0.10.6) actionpack (>= 4.1, < 6) activemodel (>= 4.1, < 6) case_transform (>= 0.2) - jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.0.7) - activesupport (= 5.0.7) + jsonapi-renderer (>= 0.1.1.beta1, < 0.2) + activejob (5.0.5) + activesupport (= 5.0.5) globalid (>= 0.3.6) - activemodel (5.0.7) - activesupport (= 5.0.7) - activerecord (5.0.7) - activemodel (= 5.0.7) - activesupport (= 5.0.7) + activemodel (5.0.5) + activesupport (= 5.0.5) + activerecord (5.0.5) + activemodel (= 5.0.5) + activesupport (= 5.0.5) arel (~> 7.0) - activesupport (5.0.7) + activesupport (5.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) + i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (7.1.4) - ast (2.4.0) - aws-sdk (2.7.16) - aws-sdk-resources (= 2.7.16) - aws-sdk-core (2.7.16) + ast (2.3.0) + aws-sdk (2.7.0) + aws-sdk-resources (= 2.7.0) + aws-sdk-core (2.7.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.16) - aws-sdk-core (= 2.7.16) - aws-sigv4 (1.0.3) - bcrypt (3.1.12) + aws-sdk-resources (2.7.0) + aws-sdk-core (= 2.7.0) + aws-sigv4 (1.0.2) + bcrypt (3.1.11) best_in_place (3.1.1) actionpack (>= 3.2) railties (>= 3.2) - better_errors (2.5.0) + better_errors (2.3.0) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.8.0) + binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - brakeman (4.3.1) + brakeman (3.7.2) builder (3.2.3) - byebug (10.0.2) - carrierwave (1.2.3) + byebug (9.1.0) + carrierwave (1.1.0) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) case_transform (0.2) activesupport climate_control (0.2.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) coderay (1.1.2) concurrent-ruby (1.0.5) - crass (1.0.4) debug_inspector (0.0.3) - delayed_job (4.1.5) - activesupport (>= 3.0, < 5.3) - delayed_job_active_record (4.1.3) - activerecord (>= 3.0, < 5.3) + delayed_job (4.1.3) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) - devise (4.5.0) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) diff-lcs (1.3) - docile (1.3.1) - doorkeeper (5.0.1) + docile (1.1.5) + doorkeeper (4.2.6) railties (>= 4.2) - dotenv (2.5.0) - dotenv-rails (2.5.0) - dotenv (= 2.5.0) - railties (>= 3.2, < 6.0) - erubi (1.7.1) + dotenv (2.2.1) + dotenv-rails (2.2.1) + dotenv (= 2.2.1) + railties (>= 3.2, < 5.2) + erubi (1.6.1) erubis (2.7.0) exception_notification (4.2.2) actionmailer (>= 4.0, < 6) activesupport (>= 4.0, < 6) execjs (2.7.0) - factory_bot (4.11.1) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_bot_rails (4.11.1) - factory_bot (~> 4.11.1) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) - faker (1.9.1) - i18n (>= 0.7) - ffi (1.9.25) - globalid (0.4.1) + faker (1.8.4) + i18n (~> 0.5) + ffi (1.9.18) + globalid (0.4.0) activesupport (>= 4.2.0) - httparty (0.16.2) + httparty (0.15.6) multi_xml (>= 0.5.2) - i18n (1.1.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) - jmespath (1.4.0) - jquery-rails (4.3.3) + jmespath (1.3.1) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.1.0) - json-schema (2.8.1) + json-schema (2.8.0) addressable (>= 2.4) - jsonapi-renderer (0.2.0) - kaminari (1.1.1) + jsonapi-renderer (0.1.3) + kaminari (1.0.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) + kaminari-actionview (= 1.0.1) + kaminari-activerecord (= 1.0.1) + kaminari-core (= 1.0.1) + kaminari-actionview (1.0.1) actionview - kaminari-core (= 1.1.1) - kaminari-activerecord (1.1.1) + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) - loofah (2.2.2) - crass (~> 1.0.2) + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) + loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) + mail (2.6.6) + mime-types (>= 1.16, < 4) mailboxer (0.15.1) carrierwave (>= 0.5.8) rails (>= 5.0.0) - method_source (0.9.0) - mime-types (3.2.2) + method_source (0.8.2) + mime-types (3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_mime (1.0.1) mini_portile2 (2.3.0) - minitest (5.11.3) + minitest (5.11.1) multi_xml (0.6.0) - nio4r (2.3.1) - nokogiri (1.8.5) + nio4r (2.1.0) + nokogiri (1.8.1) mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) - paperclip (6.1.0) + paperclip (5.2.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) + cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) - parser (2.5.1.2) - ast (~> 2.4.0) - pg (1.1.3) - powerpack (0.1.2) - pry (0.11.3) + parser (2.4.0.2) + ast (~> 2.3) + pg (0.21.0) + powerpack (0.1.1) + pry (0.10.4) coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-byebug (3.5.0) + byebug (~> 9.1) pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.0.3) - puma (3.12.0) - pundit (2.0.0) + public_suffix (3.0.0) + puma (3.10.0) + pundit (1.1.0) activesupport (>= 3.0.0) pundit_extra (0.3.0) - rack (2.0.5) - rack-attack (5.4.1) - rack (>= 1.0, < 3) - rack-cors (1.0.2) + rack (2.0.3) + rack-attack (5.0.1) + rack + rack-cors (1.0.1) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.7) - actioncable (= 5.0.7) - actionmailer (= 5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) - activemodel (= 5.0.7) - activerecord (= 5.0.7) - activesupport (= 5.0.7) + rails (5.0.5) + actioncable (= 5.0.5) + actionmailer (= 5.0.5) + actionpack (= 5.0.5) + actionview (= 5.0.5) + activejob (= 5.0.5) + activemodel (= 5.0.5) + activerecord (= 5.0.5) + activesupport (= 5.0.5) bundler (>= 1.3.0) - railties (= 5.0.7) + railties (= 5.0.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.0.7) - actionpack (= 5.0.7) - activesupport (= 5.0.7) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.5) + actionpack (= 5.0.5) + activesupport (= 5.0.5) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.3.1) - rb-fsevent (0.10.3) + rake (12.3.0) + rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - redis (3.3.5) + redis (3.3.3) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.0) + rspec-support (~> 3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) rubocop (0.48.1) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.10.0) - sass (3.6.0) + ruby-progressbar (1.9.0) + sass (3.5.1) 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.7) + sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -261,40 +261,39 @@ GEM tilt (>= 1.1, < 3) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - simplecov (0.16.1) - docile (~> 1.1) + simplecov (0.15.0) + docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - slack-notifier (2.3.2) - snorlax (0.1.8) + slack-notifier (2.3.1) + slop (3.6.0) + snorlax (0.1.6) rails (> 4.1) - sprockets (3.7.2) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sucker_punch (2.1.1) - concurrent-ruby (~> 1.0) - terrapin (0.6.0) - climate_control (>= 0.0.3, < 1.0) + sucker_punch (2.0.3) + concurrent-ruby (~> 1.0.0) thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) timecop (0.9.1) - tunemygc (1.0.71) - tzinfo (1.2.5) + tunemygc (1.0.69) + tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (4.1.19) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.4.0) + unicode-display_width (1.3.0) warden (1.2.7) rack (>= 1.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.2) PLATFORMS ruby diff --git a/package.json b/package.json index 19d07af2..5cece282 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "howler": "2.0.4", "jquery": "3.2.1", "json-loader": "0.5.7", - "lodash": "4.17.5", + "lodash": "4.17.4", "node-uuid": "1.4.8", "outdent": "0.3.0", "prop-types": "15.5.10",