diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-07 01:01:17 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-07 01:01:17 +1030 |
| commit | 4137d44b2282abb7a7e7763f0abdc2fc108065ba (patch) | |
| tree | 289985b609c22888476a33aa26a0f51ace2712d4 | |
| parent | 0ff3e9466a4f476ee2e56d9e2b40acce01924683 (diff) | |
| parent | 4ba66ef108fef1bdf702c34ce2588ee2d8a2bea2 (diff) | |
| download | rails-4137d44b2282abb7a7e7763f0abdc2fc108065ba.tar.gz rails-4137d44b2282abb7a7e7763f0abdc2fc108065ba.tar.bz2 rails-4137d44b2282abb7a7e7763f0abdc2fc108065ba.zip | |
Merge pull request #22940 from lsylvester/activemodel-depends-on-builder-but-doesnt-use-it
remove activemodel dependency on builder
| -rw-r--r-- | Gemfile.lock | 1 | ||||
| -rw-r--r-- | activemodel/activemodel.gemspec | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7c6622dbed..e56ad217d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,6 @@ PATH globalid (>= 0.3.6) activemodel (5.0.0.beta1) activesupport (= 5.0.0.beta1) - builder (~> 3.1) activerecord (5.0.0.beta1) activemodel (= 5.0.0.beta1) activesupport (= 5.0.0.beta1) diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index 8d00b3aa27..53206580f0 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -19,6 +19,4 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.add_dependency 'activesupport', version - - s.add_dependency 'builder', '~> 3.1' end |