diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-16 07:47:36 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-16 07:47:36 -0700 |
| commit | 9a97699460e9b35a4c9e7a9694cf444fa75c7861 (patch) | |
| tree | d2d985e469306d4087b519804bc4f154ac808eb4 | |
| parent | a748eca6cfc24c7615f8ab82c650321c9019b148 (diff) | |
| parent | 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b (diff) | |
| download | rails-9a97699460e9b35a4c9e7a9694cf444fa75c7861.tar.gz rails-9a97699460e9b35a4c9e7a9694cf444fa75c7861.tar.bz2 rails-9a97699460e9b35a4c9e7a9694cf444fa75c7861.zip | |
Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable
Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index e6fc7bf571..696f2ca803 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -19,5 +19,5 @@ Gem::Specification.new do |s| s.rdoc_options.concat ['--encoding', 'UTF-8'] s.add_dependency('i18n', '~> 0.6') - s.add_dependency('multi_json', '~> 1.0') + s.add_dependency('multi_json', '>= 1.0', '< 1.3') end |