From 44f3b6d6348d97a4eded389c7fa22f333cc0ab3f Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Tue, 5 Sep 2017 20:56:37 -0400 Subject: [PATCH] Update dependencies --- Gemfile.lock | 177 +++++++++--------- db/migrate/20150721142956_add_links.rb | 2 +- .../20150721201947_change_link_to_url.rb | 2 +- 3 files changed, 90 insertions(+), 91 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index daf30c1..e5ead35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,129 +1,128 @@ GEM remote: https://rubygems.org/ specs: - activemodel (4.2.3) - activesupport (= 4.2.3) - builder (~> 3.1) - activerecord (4.2.3) - activemodel (= 4.2.3) - activesupport (= 4.2.3) - arel (~> 6.0) - activesupport (4.2.3) + activemodel (5.1.3) + activesupport (= 5.1.3) + activerecord (5.1.3) + activemodel (= 5.1.3) + activesupport (= 5.1.3) + arel (~> 8.0) + activesupport (5.1.3) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) - arel (6.0.2) - aws-sdk (2.2.3) - aws-sdk-resources (= 2.2.3) - aws-sdk-core (2.2.3) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + arel (8.0.0) + aws-sdk (2.10.39) + aws-sdk-resources (= 2.10.39) + aws-sdk-core (2.10.39) + aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.2.3) - aws-sdk-core (= 2.2.3) - backports (3.6.6) - bigdecimal (1.2.7) - builder (3.2.2) - capybara (2.5.0) + aws-sdk-resources (2.10.39) + aws-sdk-core (= 2.10.39) + aws-sigv4 (1.0.2) + backports (3.8.0) + bigdecimal (1.3.2) + capybara (2.13.0) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-webkit (1.7.1) - capybara (>= 2.3.0, < 2.6.0) + capybara-webkit (1.14.0) + capybara (>= 2.3.0, < 2.14.0) json - celluloid (0.16.0) - timers (~> 4.0.0) - coderay (1.1.0) - database_cleaner (1.4.1) - diff-lcs (1.2.5) - dotenv (2.1.0) - factory_girl (4.5.0) + coderay (1.1.2) + concurrent-ruby (1.0.5) + database_cleaner (1.6.1) + diff-lcs (1.3) + dotenv (2.2.1) + factory_girl (4.8.0) activesupport (>= 3.0.0) - ffi (1.9.10) - hitimes (1.2.2) - i18n (0.7.0) - jmespath (1.1.3) - json (1.8.3) + ffi (1.9.18) + i18n (0.8.6) + jmespath (1.3.1) + json (2.1.0) launchy (2.4.3) addressable (~> 2.3) - listen (2.10.1) - celluloid (~> 0.16.0) + listen (3.1.1) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + rb-inotify (>= 0.9.7) method_source (0.8.2) - mime-types (3.0) + mime-types (3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2015.1120) - mini_portile2 (2.0.0) - minitest (5.7.0) - multi_json (1.11.2) - nokogiri (1.6.7) - mini_portile2 (~> 2.0.0.rc2) - pry (0.10.1) + mime-types-data (3.2016.0521) + mini_portile2 (2.2.0) + minitest (5.10.3) + multi_json (1.12.2) + mustermann (1.0.1) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.6.4) - rack-protection (1.5.3) + public_suffix (3.0.0) + rack (2.0.3) + rack-protection (2.0.0) rack - rack-test (0.6.3) - rack (>= 1.0) - rake (10.4.2) - rb-fsevent (0.9.5) - rb-inotify (0.9.5) - ffi (>= 0.5.0) - rerun (0.10.0) - listen (~> 2.7, >= 2.7.3) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.1) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rake (12.0.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rerun (0.11.0) + listen (~> 3.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + 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.4.0) - rspec-mocks (3.4.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - sinatra (1.4.6) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - sinatra-activerecord (2.0.6) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) + sinatra (2.0.0) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.0) + tilt (~> 2.0) + sinatra-activerecord (2.0.13) activerecord (>= 3.2) - sinatra (~> 1.0) - sinatra-contrib (1.4.6) + sinatra (>= 1.0) + sinatra-contrib (2.0.0) backports (>= 2.0) multi_json - rack-protection - rack-test - sinatra (~> 1.4.0) + mustermann (~> 1.0) + rack-protection (= 2.0.0) + sinatra (= 2.0.0) tilt (>= 1.3, < 3) sinatra-flash (0.3.0) sinatra (>= 1.0.0) - slim (3.0.6) - temple (~> 0.7.3) + slim (3.0.8) + temple (>= 0.7.6, < 0.9) tilt (>= 1.3.3, < 2.1) slop (3.6.0) - sqlite3 (1.3.10) - temple (0.7.6) - thread_safe (0.3.5) - tilt (2.0.1) - timers (4.0.1) - hitimes - tzinfo (1.2.2) + sqlite3 (1.3.13) + temple (0.8.0) + thread_safe (0.3.6) + tilt (2.0.8) + tzinfo (1.2.3) thread_safe (~> 0.1) - tzinfo-data (1.2015.7) + tzinfo-data (1.2017.2) tzinfo (>= 1.0.0) validate_url (1.0.2) activemodel (>= 3.0.0) addressable - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) PLATFORMS @@ -152,4 +151,4 @@ DEPENDENCIES validate_url BUNDLED WITH - 1.10.6 + 1.15.3 diff --git a/db/migrate/20150721142956_add_links.rb b/db/migrate/20150721142956_add_links.rb index 38c7b00..0339938 100644 --- a/db/migrate/20150721142956_add_links.rb +++ b/db/migrate/20150721142956_add_links.rb @@ -1,4 +1,4 @@ -class AddLinks < ActiveRecord::Migration +class AddLinks < ActiveRecord::Migration[4.2] def change create_table :links do |t| t.string :title diff --git a/db/migrate/20150721201947_change_link_to_url.rb b/db/migrate/20150721201947_change_link_to_url.rb index 0d09320..e1bb2c7 100644 --- a/db/migrate/20150721201947_change_link_to_url.rb +++ b/db/migrate/20150721201947_change_link_to_url.rb @@ -1,4 +1,4 @@ -class ChangeLinkToUrl < ActiveRecord::Migration +class ChangeLinkToUrl < ActiveRecord::Migration[4.2] def change rename_column :links, :link, :url end