projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
8c79134
)
Stick with bigdecimal 1.1 for ruby 1.9 compatibility
author
Tom Hughes
<tom@compton.nu>
Sun, 30 Jun 2013 21:09:33 +0000
(22:09 +0100)
committer
Tom Hughes
<tom@compton.nu>
Sun, 30 Jun 2013 21:09:33 +0000
(22:09 +0100)
Gemfile
patch
|
blob
|
history
Gemfile.lock
patch
|
blob
|
history
diff --git
a/Gemfile
b/Gemfile
index 9bde0af13a287cc47f3095600a8843aa4d4d0245..76071aa2e7d48f00585d20277fa7a20596de237b 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-5,7
+5,7
@@
source 'http://rubygems.org'
gem 'rails', '3.2.12'
# Require things which have moved to gems in ruby 1.9
-gem 'bigdecimal', :platforms => :ruby_19
+gem 'bigdecimal',
"~> 1.1.0",
:platforms => :ruby_19
# Require things which have moved to gems in ruby 2.0
gem 'psych', :platforms => :ruby_20
diff --git
a/Gemfile.lock
b/Gemfile.lock
index ec220961bea376a8764745609575b20819b615e5..993b08aa7cccb919b5499c96d5c6f721303d2586 100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-30,7
+30,7
@@
GEM
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
- bigdecimal (1.
2
.0)
+ bigdecimal (1.
1
.0)
builder (3.0.4)
climate_control (0.0.3)
activesupport (>= 3.0)
@@
-180,7
+180,7
@@
PLATFORMS
DEPENDENCIES
SystemTimer (>= 1.1.3)
- bigdecimal
+ bigdecimal
(~> 1.1.0)
coffee-rails (~> 3.2.1)
composite_primary_keys (>= 5.0.10)
deadlock_retry (>= 1.2.0)