diff options
| author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-04-19 16:34:34 +0200 |
|---|---|---|
| committer | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-04-19 16:34:34 +0200 |
| commit | b24621809ebd4c69796b5ca6b41e7720bc52228a (patch) | |
| tree | 5595ea3300d817dd1a3b5947671a5fe95236ff25 | |
| parent | e5919536a6d8372937b9bc34940f3daf4108290d (diff) | |
| download | rails-b24621809ebd4c69796b5ca6b41e7720bc52228a.tar.gz rails-b24621809ebd4c69796b5ca6b41e7720bc52228a.tar.bz2 rails-b24621809ebd4c69796b5ca6b41e7720bc52228a.zip | |
remove MultiJson from the Gemfile and instead add the current rc to the AS gemspec
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -15,8 +15,6 @@ gem "sprockets", :git => "git://github.com/sstephenson/sprockets.git" gem "coffee-script" gem "sass", ">= 3.0" -gem "multi_json", :git => 'git://github.com/intridea/multi_json.git' - gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index eaecb30090..968d6ff4d0 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -16,4 +16,6 @@ Gem::Specification.new do |s| s.files = Dir['CHANGELOG', 'README.rdoc', 'lib/**/*'] s.require_path = 'lib' + + s.add_dependency('multi_json', '~> 1.0.0.rc3') end |