diff --git a/Gemfile b/Gemfile index 1766241..97f2fd4 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'merb-auth-more', path: 'vendor/merb-auth/merb-auth-more' gem 'merb-auth-slice-password', path: 'vendor/merb-auth/merb-auth-slice-password' gem 'merb_activerecord', git: 'https://github.com/DanielVartanov/merb_activerecord.git', branch: 'modernize' -gem 'activerecord', '~> 4.2.5' +gem 'activerecord', '~> 6.1.7' gem 'acts_as_list' gem 'thin' gem 'unicode_utils' diff --git a/Gemfile.lock b/Gemfile.lock index 89d485a..c211c10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,27 +53,25 @@ PATH GEM remote: https://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) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activesupport (6.1.7.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) acts_as_list (1.0.1) activerecord (>= 4.2) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - arel (6.0.4) builder (3.2.4) byebug (11.1.3) coderay (1.1.3) - concurrent-ruby (1.1.6) + concurrent-ruby (1.2.2) cucumber (0.10.6) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -90,7 +88,7 @@ GEM gherkin (2.4.21) json (>= 1.4.6) highline (2.0.3) - i18n (0.9.5) + i18n (1.12.0) concurrent-ruby (~> 1.0) json (2.3.0) launchy (2.5.0) @@ -120,7 +118,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) mini_portile2 (2.5.3) - minitest (5.14.1) + minitest (5.18.0) nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -150,22 +148,22 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thread_safe (0.3.6) tins (1.25.0) sync - tzinfo (1.2.7) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unicode_utils (1.4.0) webrat (0.7.3) nokogiri (>= 1.2.0) rack (>= 1.0) rack-test (>= 0.5.3) + zeitwerk (2.6.7) PLATFORMS ruby DEPENDENCIES - activerecord (~> 4.2.5) + activerecord (~> 6.1.7) acts_as_list cucumber (= 0.10.6) cucumber-rails (= 0.3.2)