Skip to content

Commit

Permalink
coordinate tzinfo to be compatible w/ activesupport
Browse files Browse the repository at this point in the history
  • Loading branch information
hstove committed Aug 22, 2014
1 parent a65b689 commit dbe8cfa
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
31 changes: 15 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
rbtc_arbitrage (2.4.3)
rbtc_arbitrage (2.4.4)
activemodel (~> 4.0)
activesupport (~> 4.0)
bitstamp-rbtc-arbitrage (= 0.4.0)
Expand All @@ -15,22 +15,21 @@ PATH
stathat (= 0.1.7)
tco (= 0.1.0)
thor (= 0.18.1)
tzinfo (= 0.3.39)
tzinfo (~> 1.1)

GEM
remote: https://rubygems.org/
specs:
activemodel (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
activesupport (4.0.4)
activemodel (4.1.5)
activesupport (= 4.1.5)
builder (~> 3.1)
activesupport (4.1.5)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
tzinfo (~> 1.1)
addressable (2.3.5)
atomic (1.1.16)
bitstamp-rbtc-arbitrage (0.4.0)
activemodel (>= 3.1)
activesupport
Expand All @@ -40,7 +39,7 @@ GEM
tzinfo
btce (0.2.4)
monkey-patch
builder (3.1.4)
builder (3.2.2)
celluloid (0.15.2)
timers (~> 1.1.0)
codeclimate-test-reporter (0.2.0)
Expand Down Expand Up @@ -96,14 +95,14 @@ GEM
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.0)
minitest (4.7.5)
minitest (5.4.0)
monetize (0.3.0)
money (~> 6.1.0.beta1)
money (6.1.1)
i18n (~> 0.6.4)
monkey-patch (0.0.16)
activesupport
multi_json (1.9.2)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (1.2.0)
oauth2 (0.9.4)
Expand Down Expand Up @@ -157,12 +156,12 @@ GEM
term-ansicolor (1.2.2)
tins (~> 0.8)
thor (0.18.1)
thread_safe (0.3.1)
atomic (>= 1.1.7, < 2)
thread_safe (0.3.4)
tilt (1.4.1)
timers (1.1.0)
tins (0.13.1)
tzinfo (0.3.39)
tzinfo (1.2.2)
thread_safe (~> 0.1)
vcr (2.8.0)
webmock (1.16.1)
addressable (>= 2.2.7)
Expand Down
2 changes: 1 addition & 1 deletion lib/rbtc_arbitrage/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module RbtcArbitrage
VERSION = "2.4.3"
VERSION = "2.4.4"
end
2 changes: 1 addition & 1 deletion rbtc_arbitrage.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
spec.add_dependency "pony", '1.10'
spec.add_dependency "tco", "0.1.0"
spec.add_dependency "bitstamp-rbtc-arbitrage", "0.4.0"
spec.add_dependency "tzinfo", '0.3.39'
spec.add_dependency "tzinfo", '~> 1.1'
spec.add_dependency "mail", "2.6.1"
end

0 comments on commit dbe8cfa

Please sign in to comment.