gemfiles/3.1.gemfile.lock in shoulda-matchers-1.3.0 vs gemfiles/3.1.gemfile.lock in shoulda-matchers-1.4.0
- old
+ new
@@ -1,42 +1,42 @@
PATH
- remote: /Users/joshuaclayton/dev/gems/shoulda-matchers
+ remote: /Users/draper/Dropbox/Development/shoulda-matchers
specs:
shoulda-matchers (1.3.0)
activesupport (>= 3.0.0)
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.4)
- actionpack (= 3.1.4)
- mail (~> 2.3.0)
- actionpack (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
+ actionmailer (3.1.8)
+ actionpack (= 3.1.8)
+ mail (~> 2.3.3)
+ actionpack (3.1.8)
+ activemodel (= 3.1.8)
+ activesupport (= 3.1.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.6)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.4)
- activesupport (= 3.1.4)
+ sprockets (~> 2.0.4)
+ activemodel (3.1.8)
+ activesupport (= 3.1.8)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
+ activerecord (3.1.8)
+ activemodel (= 3.1.8)
+ activesupport (= 3.1.8)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
- activeresource (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- activesupport (3.1.4)
- multi_json (~> 1.0)
+ activeresource (3.1.8)
+ activemodel (= 3.1.8)
+ activesupport (= 3.1.8)
+ activesupport (3.1.8)
+ multi_json (>= 1.0, < 1.3)
appraisal (0.4.1)
bundler
rake
arel (2.2.3)
aruba (0.4.11)
@@ -44,11 +44,11 @@
cucumber (>= 1.1.1)
ffi (>= 1.0.11)
rspec (>= 2.7.0)
bourne (1.1.2)
mocha (= 0.10.5)
- builder (3.0.0)
+ builder (3.0.3)
childprocess (0.3.5)
ffi (~> 1.0, >= 1.0.6)
cucumber (1.1.9)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
@@ -59,12 +59,12 @@
erubis (2.7.0)
ffi (1.1.5)
gherkin (2.9.3)
json (>= 1.4.6)
hike (1.2.1)
- i18n (0.6.0)
- jquery-rails (2.1.1)
+ i18n (0.6.1)
+ jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
mail (2.3.3)
i18n (>= 0.4.0)
@@ -72,32 +72,32 @@
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.19)
mocha (0.10.5)
metaclass (~> 0.0.1)
- multi_json (1.3.6)
+ multi_json (1.2.0)
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.1.4)
- actionmailer (= 3.1.4)
- actionpack (= 3.1.4)
- activerecord (= 3.1.4)
- activeresource (= 3.1.4)
- activesupport (= 3.1.4)
+ rails (3.1.8)
+ actionmailer (= 3.1.8)
+ actionpack (= 3.1.8)
+ activerecord (= 3.1.8)
+ activeresource (= 3.1.8)
+ activesupport (= 3.1.8)
bundler (~> 1.0)
- railties (= 3.1.4)
- railties (3.1.4)
- actionpack (= 3.1.4)
- activesupport (= 3.1.4)
+ railties (= 3.1.8)
+ railties (3.1.8)
+ actionpack (= 3.1.8)
+ activesupport (= 3.1.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
@@ -143,15 +143,15 @@
activerecord-jdbc-adapter
activerecord-jdbcsqlite3-adapter
appraisal (~> 0.4.0)
aruba
bourne (~> 1.1.2)
- bundler (~> 1.1.0)
+ bundler (~> 1.1)
cucumber (~> 1.1.9)
jdbc-sqlite3
jquery-rails
jruby-openssl
- rails (= 3.1.4)
+ rails (= 3.1.8)
rake (~> 0.9.2)
rspec-rails (~> 2.8.1)
sass-rails
shoulda-context (~> 1.0.0)
shoulda-matchers!