diff --git a/Gemfile b/Gemfile index e70eef95..e505074c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,19 +1,19 @@ source 'https://rubygems.org' -gem 'rails', '~> 5.0.4' +gem 'rails', '~> 5.2.4', '>= 5.2.4.3' gem 'puma', '~> 3.0' -gem 'sass-rails', '~> 5.0' +gem 'sass-rails', '~> 5.0', '>= 5.0.7' gem 'uglifier', '>= 1.3.0' -gem 'coffee-rails', '~> 4.2' -gem 'jquery-rails' +gem 'coffee-rails', '~> 4.2', '>= 4.2.2' +gem 'jquery-rails', '>= 4.3.3' gem 'turbolinks', '~> 5' -gem 'jbuilder', '~> 2.5' +gem 'jbuilder', '~> 2.7', '>= 2.7.0' gem 'buttercms-rails' -gem 'react-rails' +gem 'react-rails', '>= 2.4.7' gem 'underscore-rails' gem 'rest-client' gem 'fastimage' -gem 'npm-rails' +gem 'npm-rails', '>= 0.2.1' gem 'aws-sdk' gem 'sitemap_generator' @@ -23,10 +23,10 @@ end group :development do gem 'sqlite3' - gem 'web-console', '>= 3.3.0' + gem 'web-console', '>= 3.7.0' gem 'listen', '~> 3.0.5' - gem 'spring' - gem 'spring-watcher-listen', '~> 2.0.0' + gem 'spring', '>= 2.0.2' + gem 'spring-watcher-listen', '~> 2.0.1' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index 5e7382b8..ce3e911d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,48 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.7) - actionpack (= 5.0.7) - 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) + actioncable (5.2.4.3) + actionpack (= 5.2.4.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) - rack (~> 2.0) - rack-test (~> 0.6.3) + actionpack (5.2.4.3) + actionview (= 5.2.4.3) + activesupport (= 5.2.4.3) + rack (~> 2.0, >= 2.0.8) + 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.2.4.3) + activesupport (= 5.2.4.3) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7) - activesupport (= 5.0.7) + activejob (5.2.4.3) + activesupport (= 5.2.4.3) globalid (>= 0.3.6) - activemodel (5.0.7) - activesupport (= 5.0.7) - activerecord (5.0.7) - activemodel (= 5.0.7) - activesupport (= 5.0.7) - arel (~> 7.0) - activesupport (5.0.7) + activemodel (5.2.4.3) + activesupport (= 5.2.4.3) + activerecord (5.2.4.3) + activemodel (= 5.2.4.3) + activesupport (= 5.2.4.3) + arel (>= 9.0) + activestorage (5.2.4.3) + actionpack (= 5.2.4.3) + activerecord (= 5.2.4.3) + marcel (~> 0.3.1) + activesupport (5.2.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - arel (7.1.4) + arel (9.0.0) aws-eventstream (1.0.1) aws-partitions (1.104.0) aws-sdk (3.0.1) @@ -636,8 +640,8 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bindex (0.5.0) - builder (3.2.3) + bindex (0.8.1) + builder (3.2.4) buttercms-rails (1.2.1) buttercms-ruby (~> 1.3.1) buttercms-ruby (1.3.1) @@ -649,84 +653,86 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) - crass (1.0.4) + crass (1.0.6) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - erubis (2.7.0) + erubi (1.9.0) execjs (2.7.0) fastimage (2.1.3) - ffi (1.9.25) - globalid (0.4.1) + ffi (1.12.2) + globalid (0.4.2) activesupport (>= 4.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.1.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) - jbuilder (2.7.0) - activesupport (>= 4.2.0) - multi_json (>= 1.2) + jbuilder (2.10.0) + activesupport (>= 5.0.0) jmespath (1.4.0) - jquery-rails (4.3.3) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.2.3) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.9.0) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mini_mime (1.0.1) + mimemagic (0.3.5) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.13.1) + minitest (5.14.1) netrc (0.11.0) - nio4r (2.3.1) - nokogiri (1.10.4) + nio4r (2.5.2) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) npm-rails (0.2.1) rails (>= 3.2) pg (1.1.2) puma (3.12.0) - rack (2.0.7) - 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) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.4.3) + actioncable (= 5.2.4.3) + actionmailer (= 5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) + activemodel (= 5.2.4.3) + activerecord (= 5.2.4.3) + activestorage (= 5.2.4.3) + activesupport (= 5.2.4.3) bundler (>= 1.3.0) - railties (= 5.0.7) + railties (= 5.2.4.3) 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.3.0) + loofah (~> 2.3) + railties (5.2.4.3) + actionpack (= 5.2.4.3) + activesupport (= 5.2.4.3) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (12.3.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - react-rails (2.4.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + react-rails (2.6.1) babel-transpiler (>= 0.7.0) connection_pool execjs @@ -736,21 +742,20 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - sass (3.5.7) + sass (3.7.4) 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) - railties (>= 4.0.0, < 6) + sass-rails (5.1.0) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) sitemap_generator (6.0.1) builder (~> 3.0) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) @@ -762,13 +767,13 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.20.0) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.10) turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.1.18) execjs (>= 0.3.0, < 3) @@ -781,9 +786,9 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.6.5) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) PLATFORMS ruby @@ -792,29 +797,29 @@ DEPENDENCIES aws-sdk buttercms-rails byebug - coffee-rails (~> 4.2) + coffee-rails (~> 4.2, >= 4.2.2) fastimage - jbuilder (~> 2.5) - jquery-rails + jbuilder (~> 2.7, >= 2.7.0) + jquery-rails (>= 4.3.3) listen (~> 3.0.5) - npm-rails + npm-rails (>= 0.2.1) pg puma (~> 3.0) - rails (~> 5.0.4) - react-rails + rails (~> 5.2.4, >= 5.2.4.3) + react-rails (>= 2.4.7) rest-client - sass-rails (~> 5.0) + sass-rails (~> 5.0, >= 5.0.7) sitemap_generator - spring - spring-watcher-listen (~> 2.0.0) + spring (>= 2.0.2) + spring-watcher-listen (~> 2.0.1) sqlite3 turbolinks (~> 5) uglifier (>= 1.3.0) underscore-rails - web-console (>= 3.3.0) + web-console (>= 3.7.0) RUBY VERSION ruby 2.5.1p57 BUNDLED WITH - 1.16.4 + 1.17.3