diff --git a/Gemfile.lock b/Gemfile.lock index 8c127145..5228d7e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,8 +11,12 @@ GEM activerecord (3.2.14) activerecord-jdbc-adapter (1.3.15) activerecord (>= 2.2) - activesupport (3.1.12) - multi_json (~> 1.0) + activesupport (4.0.13) + i18n (~> 0.6, >= 0.6.9) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) addressable (2.2.7) appraisal (2.4.1) bundler @@ -43,7 +47,8 @@ GEM activesupport (>= 2.2.0) crack (>= 0.1.6) hitimes (1.2.2) - i18n (1.12.0) + hitimes (1.2.2-java) + i18n (0.9.5) concurrent-ruby (~> 1.0) integration (0.1.0) jdbc-sqlite3 (3.8.7) @@ -137,11 +142,14 @@ GEM ffi sqlite3 (1.4.4) thor (1.2.1) + thread_safe (0.3.6) + thread_safe (0.3.6-java) timecop (0.3.5) timers (4.0.1) hitimes toml (0.1.2) parslet (~> 1.5.0) + tzinfo (0.3.61) unicode-display_width (2.2.0) webmock (1.8.0) addressable (>= 2.2.7)