diff --git a/Gemfile b/Gemfile index 053a04b5..acb5f005 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' ruby '~> 2.4.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.1.6.1' +gem 'rails', '5.1.6.2' gem 'rubyzip', '>=1.2.2' gem 'loofah', '~> 2.2.3' @@ -13,6 +13,7 @@ gem 'rails-html-sanitizer', '~> 1.0.4' gem 'rack', '>= 2.0.6' gem 'ffi', '>= 1.9.24' gem "nokogiri", ">= 1.8.5" +gem "actionview", ">= 5.1.6.2" gem 'rspec-collection_matchers' diff --git a/Gemfile.lock b/Gemfile.lock index 7c0c22b8..572eaec5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,25 +31,25 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.1.6.1) - actionpack (= 5.1.6.1) + actioncable (5.1.6.2) + actionpack (= 5.1.6.2) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6.1) - actionpack (= 5.1.6.1) - actionview (= 5.1.6.1) - activejob (= 5.1.6.1) + actionmailer (5.1.6.2) + actionpack (= 5.1.6.2) + actionview (= 5.1.6.2) + activejob (= 5.1.6.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6.1) - actionview (= 5.1.6.1) - activesupport (= 5.1.6.1) + actionpack (5.1.6.2) + actionview (= 5.1.6.2) + activesupport (= 5.1.6.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.1) - activesupport (= 5.1.6.1) + actionview (5.1.6.2) + activesupport (= 5.1.6.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -57,16 +57,16 @@ GEM active_scaffold_duplicate (1.1.0) active_scaffold (>= 3.3.0.rc) rails (>= 4.0) - activejob (5.1.6.1) - activesupport (= 5.1.6.1) + activejob (5.1.6.2) + activesupport (= 5.1.6.2) globalid (>= 0.3.6) - activemodel (5.1.6.1) - activesupport (= 5.1.6.1) - activerecord (5.1.6.1) - activemodel (= 5.1.6.1) - activesupport (= 5.1.6.1) + activemodel (5.1.6.2) + activesupport (= 5.1.6.2) + activerecord (5.1.6.2) + activemodel (= 5.1.6.2) + activesupport (= 5.1.6.2) arel (~> 8.0) - activesupport (5.1.6.1) + activesupport (5.1.6.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -102,7 +102,7 @@ GEM execjs coffee-script-source (1.9.1) columnize (0.9.0) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.5) crass (1.0.4) debug_inspector (0.0.2) devise (4.3.0) @@ -112,7 +112,7 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.3) - erubi (1.7.1) + erubi (1.8.0) erubis (2.7.0) exception_notification (2.6.1) actionmailer (>= 3.0.4) @@ -128,9 +128,9 @@ GEM railties (>= 3.2, < 5.2) ftools (0.0.0) gjman (0.1.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.1.1) + i18n (1.6.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jbuilder (2.7.0) @@ -165,16 +165,16 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) multi_json (1.11.0) mysql2 (0.4.10) mysql2 (0.4.10-x86-mingw32) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - nokogiri (1.8.5-x86-mingw32) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + nokogiri (1.10.1-x86-mingw32) + mini_portile2 (~> 2.4.0) odf-report (0.4.3) nokogiri (>= 1.5.0, >= 0) rubyzip (>= 0.9.4, >= 0) @@ -194,17 +194,17 @@ GEM rack (2.0.6) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6.1) - actioncable (= 5.1.6.1) - actionmailer (= 5.1.6.1) - actionpack (= 5.1.6.1) - actionview (= 5.1.6.1) - activejob (= 5.1.6.1) - activemodel (= 5.1.6.1) - activerecord (= 5.1.6.1) - activesupport (= 5.1.6.1) + rails (5.1.6.2) + actioncable (= 5.1.6.2) + actionmailer (= 5.1.6.2) + actionpack (= 5.1.6.2) + actionview (= 5.1.6.2) + activejob (= 5.1.6.2) + activemodel (= 5.1.6.2) + activerecord (= 5.1.6.2) + activesupport (= 5.1.6.2) bundler (>= 1.3.0) - railties (= 5.1.6.1) + railties (= 5.1.6.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -216,9 +216,9 @@ GEM ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.1.6.1) - actionpack (= 5.1.6.1) - activesupport (= 5.1.6.1) + railties (5.1.6.2) + actionpack (= 5.1.6.2) + activesupport (= 5.1.6.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -312,6 +312,7 @@ PLATFORMS x86-mingw32 DEPENDENCIES + actionview (>= 5.1.6.2) active_scaffold! active_scaffold_duplicate (>= 1.1.0) awesome_print @@ -343,7 +344,7 @@ DEPENDENCIES prawn-table prawn_rails rack (>= 2.0.6) - rails (= 5.1.6.1) + rails (= 5.1.6.2) rails-erd rails-html-sanitizer (~> 1.0.4) rdoc