Skip to content

Commit

Permalink
Update rails and devise.
Browse files Browse the repository at this point in the history
  • Loading branch information
skyriverbend committed Feb 18, 2013
1 parent c7267d1 commit f291576
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'http://rubygems.org'

gem 'rails', '~> 3.2.11'
gem 'rails', '~> 3.2.12'
gem "haml-rails"
gem 'devise', '~> 2.1.0'
gem 'devise', '~> 2.2.3'
gem 'devise_invitable', '~> 1.0.0'
gem 'pg'
gem 'capistrano'
Expand Down
68 changes: 34 additions & 34 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ GEM
specs:
aasm (3.0.3)
activerecord
actionmailer (3.2.11)
actionpack (= 3.2.11)
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
actionpack (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
Expand All @@ -64,18 +64,18 @@ GEM
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
activemodel (3.2.11)
activesupport (= 3.2.11)
activemodel (3.2.12)
activesupport (= 3.2.12)
builder (~> 3.0.0)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activerecord (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
activeresource (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_commentable_with_threading (1.1.2)
Expand Down Expand Up @@ -155,7 +155,7 @@ GEM
delayed_job_active_record (0.3.3)
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
devise (2.1.2)
devise (2.2.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
Expand Down Expand Up @@ -248,7 +248,7 @@ GEM
thor (~> 0.14)
jquery-scrollto-rails (1.4.2)
railties (~> 3.1)
json (1.7.6)
json (1.7.7)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -286,9 +286,9 @@ GEM
activerecord (~> 3.1)
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
mime-types (1.19)
mime-types (1.21)
modernizr-rails (2.0.6)
multi_json (1.5.0)
multi_json (1.6.1)
multi_xml (0.5.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
Expand Down Expand Up @@ -317,7 +317,7 @@ GEM
rabl (0.7.3)
activesupport (>= 2.3.14)
multi_json (~> 1.0)
rack (1.4.3)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-canonical-host (0.0.8)
Expand All @@ -327,18 +327,18 @@ GEM
rack (>= 0.9.1)
rack-protection (1.3.1)
rack
rack-ssl (1.3.2)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
rails (3.2.12)
actionmailer (= 3.2.12)
actionpack (= 3.2.12)
activerecord (= 3.2.12)
activeresource (= 3.2.12)
activesupport (= 3.2.12)
bundler (~> 1.0)
railties (= 3.2.11)
railties (= 3.2.12)
rails-backbone (0.7.2)
coffee-script (~> 2.2.0)
ejs (~> 1.0.0)
Expand All @@ -350,9 +350,9 @@ GEM
i18n
progressbar
sexp_processor
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand All @@ -363,7 +363,7 @@ GEM
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
rdoc (3.12.1)
json (~> 1.4)
responders (0.6.4)
rmagick (2.13.1)
Expand Down Expand Up @@ -469,7 +469,7 @@ DEPENDENCIES
database_cleaner
debugger
delayed_job_active_record
devise (~> 2.1.0)
devise (~> 2.2.3)
devise_invitable (~> 1.0.0)
draper (~> 0.11.1)
email_spec
Expand Down Expand Up @@ -509,7 +509,7 @@ DEPENDENCIES
poltergeist!
rabl
rack-canonical-host
rails (~> 3.2.11)
rails (~> 3.2.12)
rails-backbone
rails_best_practices
rb-fchange
Expand Down

0 comments on commit f291576

Please sign in to comment.