Permalink
Browse files

Update dependencies.

  • Loading branch information...
1 parent cfdf8ed commit f1d3f39d8c8335ba1134b97bb949d59bdc4718ec @gmanley committed Jun 13, 2012
Showing with 60 additions and 51 deletions.
  1. +58 −49 Gemfile.lock
  2. +1 −1 app/views/containers/_header_actions.haml
  3. +1 −1 spec/fabricators/fabricator.rb
View
107 Gemfile.lock
@@ -16,39 +16,39 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.3)
- actionpack (= 3.2.3)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
mail (~> 2.4.4)
- actionpack (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.3)
- activesupport (= 3.2.3)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
- activerecord (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
- activesupport (3.2.3)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.8)
arel (3.0.2)
bcrypt-ruby (3.0.1)
- bson (1.6.2)
- bson_ext (1.6.2)
- bson (~> 1.6.2)
+ bson (1.6.4)
+ bson_ext (1.6.4)
+ bson (~> 1.6.4)
builder (3.0.0)
cancan (1.6.7)
capybara (1.1.2)
@@ -64,7 +64,7 @@ GEM
carrierwave-mongoid (0.2.1)
carrierwave (~> 0.6.1)
mongoid (~> 2.1)
- celluloid (0.10.0)
+ celluloid (0.11.0)
childprocess (0.3.2)
ffi (~> 1.0.6)
coderay (1.0.6)
@@ -83,7 +83,7 @@ GEM
coffee-script
connection_pool (0.9.1)
daemons (1.1.8)
- database_cleaner (0.7.2)
+ database_cleaner (0.8.0)
devise (2.1.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.7)
@@ -95,7 +95,7 @@ GEM
excon (0.13.4)
execjs (1.4.0)
multi_json (~> 1.0)
- fabrication (1.4.0)
+ fabrication (2.0.2)
ffaker (1.14.0)
ffi (1.0.11)
fog (1.3.1)
@@ -110,21 +110,21 @@ GEM
ruby-hmac
formatador (0.2.3)
growl (1.0.3)
- guard (1.0.3)
- ffi (>= 0.5.0)
+ guard (1.1.1)
+ listen (>= 0.4.2)
thor (>= 0.14.6)
- guard-rspec (0.7.3)
- guard (>= 0.10.0)
- guard-spork (0.8.0)
- guard (>= 0.10.0)
+ guard-rspec (1.0.1)
+ guard (>= 1.1)
+ guard-spork (1.0.0)
+ guard (>= 1.0.0)
spork (>= 0.8.4)
haml (3.1.6)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
- haml_coffee_assets (0.9.3)
+ haml_coffee_assets (1.1.0)
execjs (>= 1.2.9)
sprockets (>= 2.0.3)
tilt (>= 1.3.3)
@@ -144,6 +144,10 @@ GEM
addressable (~> 2.2.6)
libwebsocket (0.1.3)
addressable
+ listen (0.4.4)
+ rb-fchange (~> 0.0.5)
+ rb-fsevent (~> 0.9.1)
+ rb-inotify (~> 0.8.8)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -152,9 +156,9 @@ GEM
mime-types (1.18)
mongo (1.6.2)
bson (~> 1.6.2)
- mongoid (2.4.10)
+ mongoid (2.4.11)
activemodel (~> 3.1)
- mongo (~> 1.3)
+ mongo (<= 1.6.2)
tzinfo (~> 0.3.22)
mongoid-rspec (1.4.5)
mongoid (>= 2.4.6)
@@ -165,11 +169,11 @@ GEM
mongoid_slug (0.10.0)
mongoid (~> 2.0)
stringex (~> 1.3)
- multi_json (1.3.5)
+ multi_json (1.3.6)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.5.2)
- nokogiri (1.5.2)
+ nokogiri (1.5.4)
orm_adapter (0.0.7)
polyglot (0.3.3)
pry (0.9.9.6)
@@ -187,25 +191,30 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.3)
- actionmailer (= 3.2.3)
- actionpack (= 3.2.3)
- activerecord (= 3.2.3)
- activeresource (= 3.2.3)
- activesupport (= 3.2.3)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.2.3)
- railties (3.2.3)
- actionpack (= 3.2.3)
- activesupport (= 3.2.3)
+ railties (= 3.2.6)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
+ rb-fchange (0.0.5)
+ ffi
+ rb-fsevent (0.9.1)
+ rb-inotify (0.8.8)
+ ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
- redis (3.0.0)
+ redis (3.0.1)
redis-namespace (1.2.0)
redis (~> 3.0.0)
responders (0.9.1)
@@ -230,17 +239,17 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.21.2)
+ selenium-webdriver (2.22.2)
childprocess (>= 0.2.5)
ffi (~> 1.0)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sidekiq (1.2.1)
- celluloid (~> 0.10.0)
+ sidekiq (2.0.1)
+ celluloid (~> 0.11.0)
connection_pool (~> 0.9.0)
multi_json (~> 1)
- redis
+ redis (~> 3)
redis-namespace
simple_form (2.0.2)
actionpack (~> 3.0)
@@ -264,7 +273,7 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.14.6)
+ thor (0.15.2)
tilt (1.3.3)
treetop (1.4.10)
polyglot
View
2 app/views/containers/_header_actions.haml
@@ -1,3 +1,3 @@
.header-actions.btn-toolbar
= link_to('Edit', edit_polymorphic_path(container), class: 'btn btn-primary btn-mini')
- = link_to('Delete', polymorphic_path(container), confirm: 'Are you sure?', method: :delete, class: 'btn btn-danger btn-mini')
+ = link_to('Delete', polymorphic_path(container), method: :delete, class: 'btn btn-danger btn-mini', data: { confirm: 'Are you sure?' })
View
2 spec/fabricators/fabricator.rb
@@ -14,7 +14,7 @@
Fabricator(:user) do
email { Faker::Internet.email }
password 'password'
- password_confirmation { |user| user.password }
+ password_confirmation { |user| user[:password] }
end
Fabricator(:confirmed_user, from: :user) do

0 comments on commit f1d3f39

Please sign in to comment.