diff --git a/Gemfile b/Gemfile index 996606f..8110a2c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' gem 'mysql2' -gem "activerecord", "~> 3.2.3" +gem "activerecord", "~> 3.2.22" gem 'rest-client' gem "composite_primary_keys", ">= 4.0.0" gem 'unicode_utils' diff --git a/Gemfile.lock b/Gemfile.lock index d4e86c2..f0efb91 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,23 +1,24 @@ GEM remote: http://rubygems.org/ specs: - activemodel (3.2.3) - activesupport (= 3.2.3) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activesupport (3.2.3) - i18n (~> 0.6) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.2) - arel (3.0.2) - builder (3.0.0) + arel (3.0.3) + builder (3.0.4) columnize (0.3.6) composite_primary_keys (5.0.6) activerecord (~> 3.2.0) + concurrent-ruby (1.1.10) debugger (1.2.0) columnize (>= 0.3.1) debugger-linecache (~> 1.1.1) @@ -26,9 +27,10 @@ GEM debugger-ruby_core_source (>= 1.1.1) debugger-ruby_core_source (1.1.3) diff-lcs (1.1.3) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) mime-types (1.18) - multi_json (1.3.5) + multi_json (1.15.0) mysql2 (0.3.11) perftools.rb (2.0.0) posix-spawn (0.3.6) @@ -44,14 +46,14 @@ GEM rspec-expectations (2.10.0) diff-lcs (~> 1.1.3) rspec-mocks (2.10.1) - tzinfo (0.3.33) + tzinfo (0.3.60) unicode_utils (1.3.0) PLATFORMS ruby DEPENDENCIES - activerecord (~> 3.2.3) + activerecord (~> 3.2.22) addressable composite_primary_keys (>= 4.0.0) debugger