diff --git a/Gemfile.lock b/Gemfile.lock index 8448a43..84a9072 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,8 +45,8 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.2) - atomic (1.1.13) builder (3.1.4) + concurrent-ruby (1.1.10) database_cleaner (1.1.1) diff-lcs (1.2.4) erubis (2.7.0) @@ -56,16 +56,17 @@ GEM factory_girl (~> 4.2.0) railties (>= 3.0.0) hike (1.2.3) - i18n (0.6.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) json (1.8.0) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) minitest (4.7.5) - money (5.1.1) - i18n (~> 0.6.0) - multi_json (1.7.9) + money (6.16.0) + i18n (>= 0.6.4, <= 2) + multi_json (1.15.0) nokogiri (1.5.10) pg (0.16.0) polyglot (0.3.4) @@ -116,13 +117,12 @@ GEM sprockets (~> 2.8) temple (0.6.6) thor (0.18.1) - thread_safe (0.1.2) - atomic + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.60) PLATFORMS ruby