Permalink
Browse files

update rails and devise

  • Loading branch information...
1 parent 071edb1 commit a8b6282bfba206b16ed50daa74ac412af2c1e00a @ck3g committed Mar 19, 2013
Showing with 39 additions and 39 deletions.
  1. +2 −2 Gemfile
  2. +37 −37 Gemfile.lock
View
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '~> 3.2.11'
+gem 'rails', '~> 3.2.13'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -15,7 +15,7 @@ gem 'activerecord-sqlserver-adapter', '~> 3.2.10'
gem 'haml'
gem 'meta-tags', '~> 1.2.6', :require => 'meta_tags'
gem 'kaminari' , "~> 0.13.0"
-gem 'devise', "~> 2.1.2"
+gem 'devise', "~> 2.2.3"
gem 'acts_as_commentable', "~> 3.0.1"
gem "acts-as-taggable-on", "~> 2.3.3"
View
@@ -1,34 +1,34 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
- mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
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)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-sqlserver-adapter (3.2.10)
activerecord (~> 3.2.0)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
rails (~> 3.0)
@@ -87,7 +87,7 @@ GEM
colored (1.2)
daemons (1.1.9)
database_cleaner (0.8.0)
- devise (2.1.2)
+ devise (2.2.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@@ -121,7 +121,7 @@ GEM
highline (1.6.15)
hike (1.2.1)
http_parser.rb (0.5.3)
- i18n (0.6.4)
+ i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
@@ -137,20 +137,20 @@ GEM
libwebsocket (0.1.7.1)
addressable
websocket
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta-tags (1.2.6)
actionpack
metaclass (0.0.1)
method_source (0.8.1)
- mime-types (1.19)
+ mime-types (1.21)
mini_magick (3.5.0)
subexec (~> 0.2.1)
mocha (0.10.5)
metaclass (~> 0.0.1)
- multi_json (1.6.1)
+ multi_json (1.7.1)
multipart-post (1.1.5)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@@ -179,14 +179,14 @@ GEM
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.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.11)
+ railties (= 3.2.13)
rails_best_practices (1.13.2)
activesupport
awesome_print
@@ -195,15 +195,15 @@ GEM
erubis
i18n
progressbar
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
- rdoc (3.12.1)
+ rdoc (3.12.2)
json (~> 1.4)
ref (1.0.2)
rspec (2.11.0)
@@ -263,7 +263,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
- tilt (1.3.4)
+ tilt (1.3.6)
tinder (1.9.2)
eventmachine (~> 1.0)
faraday (~> 0.8)
@@ -283,7 +283,7 @@ GEM
simple_oauth (~> 0.1.4)
twitter_cldr (2.2.0)
json
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -314,7 +314,7 @@ DEPENDENCIES
client_side_validations (~> 3.2.1)
coffee-rails (~> 3.2.2)
database_cleaner (~> 0.8.0)
- devise (~> 2.1.2)
+ devise (~> 2.2.3)
email_spec (~> 1.2.1)
exception_notification
factory_girl_rails (~> 3.5.0)
@@ -328,7 +328,7 @@ DEPENDENCIES
mini_magick (~> 3.5.0)
pg
pry-rails
- rails (~> 3.2.11)
+ rails (~> 3.2.13)
rails_best_practices
rspec-rails (~> 2.11.0)
russian (~> 0.6.0)

0 comments on commit a8b6282

Please sign in to comment.