diff --git a/Gemfile.lock b/Gemfile.lock index 356623a..5fac178 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: git://github.com/pellegrino/jackpot.git - revision: fffd17093cbfdc1a58b72cfbcda10c3c6e36585f + revision: ece1ed0bf564f2d614708ce2e69d18febc3e7f85 specs: jackpot (0.0.3) - activemerchant (~> 1.20.1) + activemerchant (~> 1.20) devise (~> 2.0) formtastic-bootstrap (~> 1.1) rails (~> 3.1) @@ -27,12 +27,12 @@ GEM active_utils (1.0.3) activesupport (>= 2.3.11) i18n - activemerchant (1.20.3) + activemerchant (1.21.0) active_utils (>= 1.0.2) activesupport (>= 2.3.11) - braintree (>= 2.0.0) builder (>= 2.0.0) i18n + json (>= 1.5.1) money (<= 3.7.1) activemodel (3.2.1) activesupport (= 3.2.1) @@ -49,10 +49,8 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.7) - arel (3.0.0) + arel (3.0.2) bcrypt-ruby (3.0.1) - braintree (2.13.4) - builder (>= 2.0.0) builder (3.0.0) devise (2.0.4) bcrypt-ruby (~> 3.0) @@ -62,40 +60,41 @@ GEM erubis (2.7.0) execjs (1.3.0) multi_json (~> 1.0) - formtastic (2.0.2) - rails (~> 3.0) + formtastic (2.1.1) + actionpack (~> 3.0) formtastic-bootstrap (1.1.1) formtastic rails (~> 3.1) - heroku (2.20.1) + heroku (2.23.0) launchy (>= 0.3.2) + netrc (~> 0.7.1) rest-client (~> 1.6.1) rubyzip - term-ansicolor (~> 1.0.5) hike (1.2.1) i18n (0.6.0) - journey (1.0.1) - jquery-rails (2.0.0) - railties (>= 3.2.0.beta, < 5.0) + journey (1.0.3) + jquery-rails (2.0.1) + railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.6.5) - kgio (2.7.2) - launchy (2.0.5) + json (1.6.6) + kgio (2.7.4) + launchy (2.1.0) addressable (~> 2.2.6) libv8 (3.3.10.4) - mail (2.4.1) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.17.2) + mime-types (1.18) money (3.7.1) i18n (~> 0.4) - multi_json (1.0.4) - orm_adapter (0.0.6) - pg (0.13.1) + multi_json (1.1.0) + netrc (0.7.1) + orm_adapter (0.0.7) + pg (0.13.2) polyglot (0.3.3) rack (1.4.1) - rack-cache (1.1) + rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack @@ -124,7 +123,7 @@ GEM mime-types (>= 1.16) rubyzip (0.9.6.1) sass (3.1.15) - sass-rails (3.2.4) + sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) @@ -132,19 +131,18 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - term-ansicolor (1.0.7) - therubyracer (0.9.9) + therubyracer (0.9.10) libv8 (~> 3.3.10) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.31) + tzinfo (0.3.32) uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) - unicorn (4.2.0) + unicorn (4.2.1) kgio (~> 2.6) rack raindrops (~> 0.7)