Gemfile.lock in piggybak-0.6.32 vs Gemfile.lock in piggybak-0.6.33

- old
+ new

@@ -1,172 +1,177 @@ PATH remote: . specs: - piggybak (0.6.32) + piggybak (0.6.33) activemerchant countries devise rack-ssl-enforcer rails (~> 3.2.8) rails_admin (~> 0.4.5) GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.16) + actionpack (= 3.2.16) + mail (~> 2.5.4) + actionpack (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - active_utils (1.0.5) + active_utils (2.0.1) activesupport (>= 2.3.11) i18n - activemerchant (1.31.1) - active_utils (>= 1.0.2) - activesupport (>= 2.3.14) - builder (>= 2.0.0) - i18n - json (>= 1.5.1) - money - nokogiri - activemodel (3.2.13) - activesupport (= 3.2.13) + activemerchant (1.42.4) + active_utils (~> 2.0, >= 2.0.1) + activesupport (>= 2.3.14, < 5.0.0) + builder (>= 2.1.2, < 4.0.0) + i18n (~> 0.5) + json (~> 1.7) + money (< 7.0.0) + nokogiri (~> 1.4) + activemodel (3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) + activesupport (3.2.16) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - arel (3.0.2) - bcrypt-ruby (3.0.1) - bootstrap-sass (2.3.1.0) + arel (3.0.3) + atomic (1.1.14) + bcrypt-ruby (3.1.2) + bootstrap-sass (2.3.2.2) sass (~> 3.2) builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.2) - countries (0.9.2) - currencies (>= 0.4.0) - currencies (0.4.0) - devise (2.2.3) + coffee-script-source (1.6.3) + countries (0.9.3) + currencies (~> 0.4.2) + currencies (0.4.2) + devise (3.2.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) - railties (~> 3.1) - warden (~> 1.2.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - font-awesome-sass-rails (3.0.2.2) - railties (>= 3.1.1) - sass-rails (>= 3.1.1) - haml (4.0.1) + execjs (2.0.2) + font-awesome-rails (3.2.1.3) + railties (>= 3.2, < 5.0) + haml (4.0.5) tilt - hike (1.2.1) - i18n (0.6.1) + hike (1.2.3) + i18n (0.6.9) journey (1.0.4) - jquery-rails (2.2.1) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (3.0.1) jquery-rails railties (>= 3.1.0) - json (1.7.7) - kaminari (0.14.1) + json (1.8.1) + kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.21) - money (5.1.1) - i18n (~> 0.6.0) - multi_json (1.7.2) - nested_form (0.3.1) - nokogiri (1.5.9) - orm_adapter (0.4.0) + mime-types (1.25.1) + mini_portile (0.5.2) + monetize (0.1.3) + money (6.0.1) + i18n (~> 0.6.4) + monetize (~> 0.1.3) + multi_json (1.8.4) + nested_form (0.3.2) + nokogiri (1.6.1) + mini_portile (~> 0.5.0) + orm_adapter (0.5.0) polyglot (0.3.3) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) rack-pjax (0.7.0) nokogiri (~> 1.5) rack (~> 1.3) rack-ssl (1.3.3) rack - rack-ssl-enforcer (0.2.5) + rack-ssl-enforcer (0.2.6) rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + rails (3.2.16) + actionmailer (= 3.2.16) + actionpack (= 3.2.16) + activerecord (= 3.2.16) + activeresource (= 3.2.16) + activesupport (= 3.2.16) bundler (~> 1.0) - railties (= 3.2.13) - rails_admin (0.4.6) + railties (= 3.2.16) + rails_admin (0.4.9) bootstrap-sass (~> 2.2) builder (~> 3.0) - coffee-rails (~> 3.1) - font-awesome-sass-rails (~> 3.0, >= 3.0.0.1) + coffee-rails (>= 3.1, < 5) + font-awesome-rails (~> 3.0) haml (~> 4.0) - jquery-rails (~> 2.1) + jquery-rails (>= 2.1, < 4) jquery-ui-rails (~> 3.0) kaminari (~> 0.14) nested_form (~> 0.3) rack-pjax (~> 0.6) rails (~> 3.1) remotipart (~> 1.0) safe_yaml (~> 0.6) sass-rails (~> 3.1) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (3.2.16) + actionpack (= 3.2.16) + activesupport (= 3.2.16) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.3) + rake (10.1.1) rdoc (3.12.2) json (~> 1.4) - remotipart (1.0.5) - safe_yaml (0.8.6) - sass (3.2.7) + remotipart (1.2.1) + safe_yaml (0.9.7) + sass (3.2.13) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thor (0.17.0) - tilt (1.3.6) - treetop (1.4.12) + thor (0.18.1) + thread_safe (0.1.3) + atomic + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) - warden (1.2.1) + tzinfo (0.3.38) + warden (1.2.3) rack (>= 1.0) PLATFORMS ruby