From e5875e03ffe61b1ffe69173ae562bb1532bd2cee Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 14 Jan 2019 13:59:32 -0500 Subject: Update pokeviewer & security updates --- Gemfile | 4 +- Gemfile.lock | 204 ++++++++++++++++++++++++++++++----------------------------- 2 files changed, 105 insertions(+), 103 deletions(-) diff --git a/Gemfile b/Gemfile index 4561c51..0bf9828 100644 --- a/Gemfile +++ b/Gemfile @@ -7,13 +7,13 @@ end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.1.4' +gem 'rails', '~> 5.2.0' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server gem 'puma', '~> 3.7' # Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0' +gem 'sassc-rails' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # See https://github.com/rails/execjs#readme for more supported runtimes diff --git a/Gemfile.lock b/Gemfile.lock index ae55c62..4ccb35c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/hatkirby/pokeviewer.git - revision: f1d4da70ccb3d298cc7cf1cdcde2748048238dab + revision: 8faa7aa636a8fc6f0c227d9258b502e4aa3a6541 specs: pokeviewer (0.1.0) activerecord-diff @@ -9,48 +9,52 @@ GIT haml jquery-rails normalize-rails - rails (~> 5.1.4) - sass-rails (~> 5.0) + rails (~> 5.2.0) + sassc-rails sequenced victor GEM remote: https://rubygems.org/ specs: - actioncable (5.1.6) - actionpack (= 5.1.6) + actioncable (5.2.2) + actionpack (= 5.2.2) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) + websocket-driver (>= 0.6.1) + actionmailer (5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6) - actionview (= 5.1.6) - activesupport (= 5.1.6) + actionpack (5.2.2) + actionview (= 5.2.2) + activesupport (= 5.2.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6) - activesupport (= 5.1.6) + actionview (5.2.2) + activesupport (= 5.2.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.6) - activesupport (= 5.1.6) + activejob (5.2.2) + activesupport (= 5.2.2) globalid (>= 0.3.6) - activemodel (5.1.6) - activesupport (= 5.1.6) - activerecord (5.1.6) - activemodel (= 5.1.6) - activesupport (= 5.1.6) - arel (~> 8.0) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) activerecord-diff (2.0.0) - activesupport (5.1.6) + activestorage (5.2.2) + actionpack (= 5.2.2) + activerecord (= 5.2.2) + marcel (~> 0.3.1) + activesupport (5.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -59,9 +63,9 @@ GEM activerecord (~> 5.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - airbrussh (1.3.0) + airbrussh (1.3.1) sshkit (>= 1.6.1, != 1.7.0) - arel (8.0.0) + arel (9.0.0) bcrypt (3.1.12) bindex (0.5.0) builder (3.2.3) @@ -71,9 +75,8 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.3.0) + capistrano-bundler (1.5.0) capistrano (~> 3.1) - sshkit (~> 1.2) capistrano-passenger (0.2.0) capistrano (~> 3.0) capistrano-rails (1.4.0) @@ -91,12 +94,10 @@ GEM xpath (>= 2.0, < 4.0) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) - ckeditor (4.2.4) - cocaine + ckeditor (4.3.0) orm_adapter (~> 0.5.0) + terrapin climate_control (0.2.0) - cocaine (0.6.0) - terrapin (= 0.6.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -104,9 +105,9 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) crass (1.0.4) - devise (4.4.3) + devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -114,18 +115,18 @@ GEM warden (~> 1.2.3) enumerize (2.2.2) activesupport (>= 3.2) - erubi (1.7.1) + erubi (1.8.0) execjs (2.7.0) ffi (1.9.25) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) haml (5.0.4) temple (>= 0.8.0) tilt highline (2.0.0) - i18n (1.0.1) + i18n (1.5.2) concurrent-ruby (~> 1.0) - jbuilder (2.7.0) + jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) jquery-rails (4.3.3) @@ -142,87 +143,88 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.2) + loofah (2.2.3) 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) - mime-types (3.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) - mini_mime (1.0.0) - mini_portile2 (2.3.0) + mime-types-data (3.2018.0812) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) minitest (5.11.3) multi_json (1.13.1) - mysql2 (0.5.1) + mysql2 (0.5.2) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (5.0.2) + net-ssh (5.1.0) nio4r (2.3.1) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) normalize-rails (4.1.1) orm_adapter (0.5.0) - paperclip (6.0.0) + paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) - public_suffix (3.0.2) - puma (3.11.4) - rack (2.0.5) - rack-test (1.0.0) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.6) + rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6) - actioncable (= 5.1.6) - actionmailer (= 5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) - activemodel (= 5.1.6) - activerecord (= 5.1.6) - activesupport (= 5.1.6) + rails (5.2.2) + actioncable (= 5.2.2) + actionmailer (= 5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + activemodel (= 5.2.2) + activerecord (= 5.2.2) + activestorage (= 5.2.2) + activesupport (= 5.2.2) bundler (>= 1.3.0) - railties (= 5.1.6) + railties (= 5.2.2) 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.1.6) - actionpack (= 5.1.6) - activesupport (= 5.1.6) + railties (5.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (12.3.1) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) ref (2.0.0) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) ruby_dep (1.5.0) - rubyzip (1.2.1) - sass (3.5.6) - 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 (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - selenium-webdriver (3.13.0) + rubyzip (1.2.2) + sassc (2.0.0) + ffi (~> 1.9.6) + rake + sassc-rails (2.1.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + selenium-webdriver (3.141.0) childprocess (~> 0.5) - rubyzip (~> 1.2) + rubyzip (~> 1.2, >= 1.2.2) sequenced (3.1.1) activerecord (>= 3.0) activesupport (>= 3.0) @@ -239,7 +241,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkit (1.16.1) + sshkit (1.18.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) temple (0.8.0) @@ -248,28 +250,28 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) - turbolinks (5.1.1) - turbolinks-source (~> 5.1) - turbolinks-source (5.1.0) + tilt (2.0.9) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.14) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) - victor (0.2.1) - warden (1.2.7) - rack (>= 1.0) - web-console (3.6.2) + victor (0.2.4) + warden (1.2.8) + rack (>= 2.0.6) + web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (3.1.0) + xpath (3.2.0) nokogiri (~> 1.8) PLATFORMS @@ -299,8 +301,8 @@ DEPENDENCIES paperclip pokeviewer! puma (~> 3.7) - rails (~> 5.1.4) - sass-rails (~> 5.0) + rails (~> 5.2.0) + sassc-rails selenium-webdriver spring spring-watcher-listen (~> 2.0.0) -- cgit 1.4.1