Permalink
Browse files

Merge branch 'activemodel'

[Fixes #798]
  • Loading branch information...
2 parents f4dd001 + 4549965 commit dd4408a9fa402e3537845c5813acfff28073b112 @alindeman alindeman committed Aug 13, 2013
Showing with 3 additions and 0 deletions.
  1. +2 −0 Changelog.md
  2. +1 −0 rspec-rails.gemspec
View
@@ -17,6 +17,8 @@ Bug fixes
* Where possible, check against the version of ActiveRecord, rather than
Rails. It is possible to use some of rspec-rails without all of Rails.
(Darryl Pogue)
+* Explicitly depends on `activemodel`. This allows libraries that do not bring
+ in all of `rails` to use `rspec-rails`. (John Firebaugh)
### 2.14.0 / 2013-07-06
[full changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0.rc1...v2.14.0)
View
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
s.require_path = "lib"
s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
+ s.add_runtime_dependency(%q<activemodel>, [">= 3.0"])
s.add_runtime_dependency(%q<actionpack>, [">= 3.0"])
s.add_runtime_dependency(%q<railties>, [">= 3.0"])
%w[core expectations mocks].each do |name|

0 comments on commit dd4408a

Please sign in to comment.