diff --git a/Gemfile b/Gemfile index 50057d8..183e500 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.5' + +gem 'rails', '6.1.7.4' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index ece6bbf..3e4c02c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,46 +1,46 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (6.1.7.4) + actionpack (= 6.1.7.4) + actionview (= 6.1.7.4) + activejob (= 6.1.7.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (6.1.7.4) + actionview (= 6.1.7.4) + activesupport (= 6.1.7.4) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (6.1.7.4) + activesupport (= 6.1.7.4) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5) - activesupport (= 4.2.5) + activejob (6.1.7.4) + activesupport (= 6.1.7.4) globalid (>= 0.3.0) activemerchant (1.47.0) activesupport (>= 3.2.14, < 5.0.0) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) - nokogiri (~> 1.4) - activemodel (4.2.5) - activesupport (= 4.2.5) + nokogiri (~> 1.13.4) + activemodel (6.1.7.4) + activesupport (= 6.1.7.4) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (6.1.7.4) + activemodel (= 6.1.7.4) + activesupport (= 6.1.7.4) arel (~> 6.0) - activesupport (4.2.5) + activesupport (6.1.7.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) + tzinfo (~> 1.2.10) acts_as_list (0.7.4) activerecord (>= 3.0) addressable (2.4.0) @@ -174,7 +174,7 @@ GEM neat (1.7.4) bourbon (>= 4.0) sass (>= 3.3) - nokogiri (1.6.7.2) + nokogiri (1.13.4) mini_portile2 (~> 2.0.0.rc2) normalize-rails (3.0.3) orm_adapter (0.5.0) @@ -202,28 +202,28 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (6.1.7.4) + actionmailer (= 6.1.7.4) + actionpack (= 6.1.7.4) + actionview (= 6.1.7.4) + activejob (= 6.1.7.4) + activemodel (= 6.1.7.4) + activerecord (= 6.1.7.4) + activesupport (= 6.1.7.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) + railties (= 6.1.7.4) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.13.4) rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (6.1.7.4) + actionpack (= 6.1.7.4) + activesupport (= 6.1.7.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (11.1.2) @@ -334,7 +334,7 @@ GEM cldr-plurals-runtime-rb (~> 1.0.0) json tzinfo - tzinfo (1.2.2) + tzinfo (1.2.10) thread_safe (~> 0.1) uglifier (3.0.0) execjs (>= 0.3.0, < 3) @@ -364,7 +364,7 @@ DEPENDENCIES lingq puma rack-ssl (= 1.0.0) - rails (= 4.2.5) + rails (= 6.1.7.4) sinatra (= 1.1.4) spree (= 3.0.7) spring