diff --git a/default_files/ruby/config/Gemfile b/default_files/ruby/config/Gemfile index 99e7cb4ea..e6a6e77d6 100644 --- a/default_files/ruby/config/Gemfile +++ b/default_files/ruby/config/Gemfile @@ -15,7 +15,7 @@ gem "Ascii85", "1.0.1" gem "aasm", "3.0.8" gem "active_record_inline_schema", "0.5.7" gem "activemodel", "3.2.6" -gem "activerecord", "3.2.6" +gem "activerecord", "3.2.14" # Updated activeresource from 3.2.1 to 3.2.6 to avoid conflict with activemodel gem "activeresource", "3.2.6" gem "activesupport", "3.2.6" diff --git a/default_files/ruby/config/Gemfile.lock b/default_files/ruby/config/Gemfile.lock index 9f5db7977..8b39ae7fe 100644 --- a/default_files/ruby/config/Gemfile.lock +++ b/default_files/ruby/config/Gemfile.lock @@ -18,11 +18,7 @@ GEM activemodel (3.2.6) activesupport (= 3.2.6) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) + activerecord (3.2.14) activeresource (3.2.6) activemodel (= 3.2.6) activesupport (= 3.2.6) @@ -107,7 +103,6 @@ GEM json monster_mash (0.3.0) typhoeus (>= 0.3.3) - typhoeus (>= 0.3.3) multi_json (1.1.0) multi_xml (0.5.1) multipart-post (1.1.5) @@ -203,7 +198,7 @@ DEPENDENCIES aasm (= 3.0.8) active_record_inline_schema (= 0.5.7) activemodel (= 3.2.6) - activerecord (= 3.2.6) + activerecord (= 3.2.14) activeresource (= 3.2.6) activesupport (= 3.2.6) addressable (= 2.2.7)