|
[stripe-ruby (master)]$ git diff v1.7.7 v1.7.8 |
|
diff --git a/Gemfile.lock b/Gemfile.lock |
|
deleted file mode 100644 |
|
index eca470c..0000000 |
|
--- a/Gemfile.lock |
|
+++ /dev/null |
|
@@ -1,34 +0,0 @@ |
|
-PATH |
|
- remote: . |
|
- specs: |
|
- stripe (1.7.4) |
|
- multi_json (~> 1.1) |
|
- rest-client (~> 1.4) |
|
- |
|
-GEM |
|
- remote: https://rubygems.org/ |
|
- specs: |
|
- metaclass (0.0.1) |
|
- mime-types (1.19) |
|
- mocha (0.11.3) |
|
- metaclass (~> 0.0.1) |
|
- multi_json (1.3.6) |
|
- rake (0.9.2.2) |
|
- rest-client (1.6.7) |
|
- mime-types (>= 1.16) |
|
- shoulda (3.0.1) |
|
- shoulda-context (~> 1.0.0) |
|
- shoulda-matchers (~> 1.0.0) |
|
- shoulda-context (1.0.0) |
|
- shoulda-matchers (1.0.0) |
|
- test-unit (2.4.8) |
|
- |
|
-PLATFORMS |
|
- ruby |
|
- |
|
-DEPENDENCIES |
|
- mocha |
|
- rake |
|
- shoulda |
|
- stripe! |
|
- test-unit |
|
diff --git a/History.txt b/History.txt |
|
index 0fae279..ea298cc 100644 |
|
--- a/History.txt |
|
+++ b/History.txt |
|
@@ -1,3 +1,6 @@ |
|
+=== 1.7.8 2012-11-21 |
|
+* Relax the version constraint on multi_json (github issue #44) |
|
+ |
|
=== 1.7.7 2012-11-07 |
|
* Add support for updating charge disputes. |
|
* Fix Account API resource bug. |
|
diff --git a/VERSION b/VERSION |
|
index 91c74a5..84298f9 100644 |
|
--- a/VERSION |
|
+++ b/VERSION |
|
@@ -1 +1 @@ |
|
-1.7.7 |
|
+1.7.8 |
|
diff --git a/gemfiles/default-with-activesupport.gemfile.lock b/gemfiles/default-with-activesupport.gemfile.lock |
|
deleted file mode 100644 |
|
index 30e24a5..0000000 |
|
--- a/gemfiles/default-with-activesupport.gemfile.lock |
|
+++ /dev/null |
|
@@ -1,39 +0,0 @@ |
|
-PATH |
|
- remote: /home/evan/src/stripe-ruby |
|
- specs: |
|
- stripe (1.7.0) |
|
- multi_json (~> 1.1) |
|
- rest-client (~> 1.4) |
|
- |
|
-GEM |
|
- remote: https://rubygems.org/ |
|
- specs: |
|
- activesupport (3.2.3) |
|
- i18n (~> 0.6) |
|
- multi_json (~> 1.0) |
|
- i18n (0.6.0) |
|
- metaclass (0.0.1) |
|
- mime-types (1.18) |
|
- mocha (0.11.4) |
|
- metaclass (~> 0.0.1) |
|
- multi_json (1.3.4) |
|
- rake (0.9.2.2) |
|
- rest-client (1.6.7) |
|
- mime-types (>= 1.16) |
|
- shoulda (3.0.1) |
|
- shoulda-context (~> 1.0.0) |
|
- shoulda-matchers (~> 1.0.0) |
|
- shoulda-context (1.0.0) |
|
- shoulda-matchers (1.0.0) |
|
- test-unit (2.4.8) |
|
- |
|
-PLATFORMS |
|
- ruby |
|
- |
|
-DEPENDENCIES |
|
- activesupport |
|
- mocha |
|
- rake |
|
- shoulda |
|
- stripe! |
|
- test-unit |
|
diff --git a/gemfiles/json.gemfile.lock b/gemfiles/json.gemfile.lock |
|
deleted file mode 100644 |
|
index 8148377..0000000 |
|
--- a/gemfiles/json.gemfile.lock |
|
+++ /dev/null |
|
@@ -1,41 +0,0 @@ |
|
-PATH |
|
- remote: /home/evan/src/stripe-ruby |
|
- specs: |
|
- stripe (1.7.0) |
|
- multi_json (~> 1.1) |
|
: |
|
- remote: https://rubygems.org/ |
|
- specs: |
|
- activesupport (3.2.3) |
|
- i18n (~> 0.6) |
|
- multi_json (~> 1.0) |
|
- i18n (0.6.0) |
|
- metaclass (0.0.1) |
|
- mime-types (1.18) |
|
- mocha (0.11.4) |
|
- metaclass (~> 0.0.1) |
|
- multi_json (1.3.4) |
|
- rake (0.9.2.2) |
|
- rest-client (1.6.7) |
|
- mime-types (>= 1.16) |
|
- shoulda (3.0.1) |
|
- shoulda-context (~> 1.0.0) |
|
- shoulda-matchers (~> 1.0.0) |
|
- shoulda-context (1.0.0) |
|
- shoulda-matchers (1.0.0) |
|
- test-unit (2.4.8) |
|
- |
|
-PLATFORMS |
|
- ruby |
|
- |
|
-DEPENDENCIES |
|
- activesupport |
|
- mocha |
|
- rake |
|
- shoulda |
|
- stripe! |
|
- test-unit |
|
diff --git a/gemfiles/json.gemfile.lock b/gemfiles/json.gemfile.lock |
|
deleted file mode 100644 |
|
index 8148377..0000000 |
|
--- a/gemfiles/json.gemfile.lock |
|
+++ /dev/null |
|
@@ -1,41 +0,0 @@ |
|
-PATH |
|
- remote: /home/evan/src/stripe-ruby |
|
- specs: |
|
- stripe (1.7.0) |
|
- multi_json (~> 1.1) |
|
- rest-client (~> 1.4) |
|
- |
|
-GEM |
|
- remote: https://rubygems.org/ |
|
: |
|
- remote: https://rubygems.org/ |
|
- specs: |
|
- activesupport (3.2.3) |
|
- i18n (~> 0.6) |
|
- multi_json (~> 1.0) |
|
- i18n (0.6.0) |
|
- metaclass (0.0.1) |
|
- mime-types (1.18) |
|
- mocha (0.11.4) |
|
- metaclass (~> 0.0.1) |
|
- multi_json (1.3.4) |
|
- rake (0.9.2.2) |
|
- rest-client (1.6.7) |
|
- mime-types (>= 1.16) |
|
- shoulda (3.0.1) |
|
- shoulda-context (~> 1.0.0) |
|
- shoulda-matchers (~> 1.0.0) |
|
- shoulda-context (1.0.0) |
|
- shoulda-matchers (1.0.0) |
|
- test-unit (2.4.8) |
|
- |
|
-PLATFORMS |
|
- ruby |
|
- |
|
-DEPENDENCIES |
|
- activesupport |
|
- mocha |
|
- rake |
|
- shoulda |
|
- stripe! |
|
- test-unit |
|
diff --git a/gemfiles/json.gemfile.lock b/gemfiles/json.gemfile.lock |
|
deleted file mode 100644 |
|
index 8148377..0000000 |
|
--- a/gemfiles/json.gemfile.lock |
|
+++ /dev/null |
|
@@ -1,41 +0,0 @@ |
|
-PATH |
|
- remote: /home/evan/src/stripe-ruby |
|
- specs: |
|
- stripe (1.7.0) |
|
- multi_json (~> 1.1) |
|
- rest-client (~> 1.4) |
|
- |
|
-GEM |
|
- remote: https://rubygems.org/ |
|
- specs: |
|
- activesupport (3.2.3) |
|
- i18n (~> 0.6) |
|
- multi_json (~> 1.0) |
|
- i18n (0.6.0) |
|
- json (1.7.0) |
|
- metaclass (0.0.1) |
|
- mime-types (1.18) |
|
- mocha (0.11.3) |
|
- metaclass (~> 0.0.1) |
|
- multi_json (1.3.4) |
|
- rake (0.9.2.2) |
|
- rest-client (1.6.7) |
|
- mime-types (>= 1.16) |
|
- shoulda (3.0.1) |
|
- shoulda-context (~> 1.0.0) |
|
- shoulda-matchers (~> 1.0.0) |
|
- shoulda-context (1.0.0) |
|
- shoulda-matchers (1.0.0) |
|
- test-unit (2.4.8) |
|
- |
|
-PLATFORMS |
|
- ruby |
|
- |
|
-DEPENDENCIES |
|
- activesupport |
|
- json |
|
- mocha |
|
- rake |
|
- shoulda |
|
- stripe! |
|
- test-unit |
|
diff --git a/gemfiles/yajl.gemfile.lock b/gemfiles/yajl.gemfile.lock |
|
deleted file mode 100644 |
|
index 3e1ad71..0000000 |
|
--- a/gemfiles/yajl.gemfile.lock |
|
+++ /dev/null |
|
@@ -1,41 +0,0 @@ |
|
-PATH |
|
- remote: /home/evan/src/stripe-ruby |
|
- specs: |
|
- stripe (1.7.0) |
|
- multi_json (~> 1.1) |
|
- rest-client (~> 1.4) |
|
- |
|
-GEM |
|
- remote: https://rubygems.org/ |
|
- specs: |
|
- activesupport (3.2.3) |
|
- i18n (~> 0.6) |
|
- multi_json (~> 1.0) |
|
- i18n (0.6.0) |
|
- metaclass (0.0.1) |
|
- mime-types (1.18) |
|
- mocha (0.11.3) |
|
- metaclass (~> 0.0.1) |
|
- multi_json (1.3.4) |
|
- rake (0.9.2.2) |
|
- rest-client (1.6.7) |
|
- mime-types (>= 1.16) |
|
- shoulda (3.0.1) |
|
- shoulda-context (~> 1.0.0) |
|
- shoulda-matchers (~> 1.0.0) |
|
- shoulda-context (1.0.0) |
|
- shoulda-matchers (1.0.0) |
|
- test-unit (2.4.8) |
|
- yajl-ruby (1.1.0) |
|
- |
|
-PLATFORMS |
|
- ruby |
|
- |
|
-DEPENDENCIES |
|
- activesupport |
|
- mocha |
|
- rake |
|
- shoulda |
|
- stripe! |
|
- test-unit |
|
- yajl-ruby |
|
diff --git a/lib/stripe/version.rb b/lib/stripe/version.rb |
|
index 410288c..cfb608f 100644 |
|
--- a/lib/stripe/version.rb |
|
+++ b/lib/stripe/version.rb |
|
@@ -1,3 +1,3 @@ |
|
module Stripe |
|
- VERSION = '1.7.7' |
|
+ VERSION = '1.7.8' |
|
end |
|
diff --git a/stripe.gemspec b/stripe.gemspec |
|
index 62bef45..cbaac14 100644 |
|
--- a/stripe.gemspec |
|
+++ b/stripe.gemspec |
|
@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s| |
|
s.require_paths = %w{lib} |
|
|
|
s.add_dependency('rest-client', '~> 1.4') |
|
- s.add_dependency('multi_json', '~> 1.1') |
|
+ s.add_dependency('multi_json', '>= 1.0.4', '< 2') |
|
|
|
s.add_development_dependency('mocha') |
|
s.add_development_dependency('shoulda') |
|
(END) |
I am no longer seeing this issue.