diff --git a/Gemfile b/Gemfile index 967bacc..fea860e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' gem 'sinatra' -gem 'activerecord', '~> 4.2', '>= 4.2.6', :require => 'active_record' +gem 'activerecord', '~> 5.2', :require => 'active_record' gem 'sinatra-activerecord', :require => 'sinatra/activerecord' gem "rack", ">= 2.0.8" gem 'rake' diff --git a/Gemfile.lock b/Gemfile.lock index 4a2e8f3..4958d20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,24 +9,22 @@ GIT GEM remote: http://rubygems.org/ specs: - activemodel (4.2.11.3) - activesupport (= 4.2.11.3) - builder (~> 3.1) - activerecord (4.2.11.3) - activemodel (= 4.2.11.3) - activesupport (= 4.2.11.3) - arel (~> 6.0) - activesupport (4.2.11.3) - i18n (~> 0.7) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) + arel (>= 9.0) + activesupport (5.2.8.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - arel (6.0.4) + arel (9.0.0) bcrypt (3.1.13) bond (0.5.1) - builder (3.2.4) capybara (3.32.2) addressable mini_mime (>= 0.1.3) @@ -36,7 +34,7 @@ GEM regexp_parser (~> 1.5) xpath (~> 3.2) coderay (1.1.3) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.10) daemons (1.3.1) database_cleaner-active_record (2.0.0.beta2) activerecord @@ -44,12 +42,12 @@ GEM diff-lcs (1.3) dotenv (2.7.5) eventmachine (1.2.7) - i18n (0.9.5) + i18n (1.11.0) concurrent-ruby (~> 1.0) method_source (1.0.0) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.16.2) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) nokogiri (1.10.9) @@ -110,7 +108,7 @@ GEM ripl-multi_line (>= 0.2.4) ripl-rack (>= 0.2.0) sinatra (>= 1.2.1) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) xpath (3.2.0) nokogiri (~> 1.8) @@ -119,7 +117,7 @@ PLATFORMS ruby DEPENDENCIES - activerecord (~> 4.2, >= 4.2.6) + activerecord (~> 5.2) bcrypt capybara database_cleaner!