Permalink
Browse files

update rails and devise

  • Loading branch information...
1 parent 11ff144 commit 1d320d242392b2293db4b5e786b09d3c18ec1afd @ck3g committed Mar 20, 2013
Showing with 36 additions and 36 deletions.
  1. +2 −2 Gemfile
  2. +34 −34 Gemfile.lock
View
4 Gemfile
@@ -1,11 +1,11 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.12'
+gem 'rails', '3.2.13'
gem "json", "~> 1.7.7"
gem 'mysql2', "~> 0.3.11"
-gem 'devise', "~> 2.1.2"
+gem 'devise', "~> 2.2.3"
gem "devise-encryptable", "~> 0.1.1"
gem 'haml', "~> 3.1.7"
gem 'has_scope', "~> 0.5.1"
View
68 Gemfile.lock
@@ -1,32 +1,32 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
- mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ 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.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
- 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)
addressable (2.3.2)
anjlab-bootstrap-rails (2.2.1.2)
@@ -70,7 +70,7 @@ GEM
colored (1.2)
daemons (1.1.9)
database_cleaner (0.9.1)
- devise (2.1.2)
+ devise (2.2.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@@ -142,15 +142,15 @@ GEM
websocket
listen (0.5.3)
lumberjack (1.0.2)
- 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
method_source (0.8.1)
mime-types (1.21)
- multi_json (1.5.1)
+ multi_json (1.7.1)
multipart-post (1.1.5)
mysql2 (0.3.11)
net-scp (1.0.4)
@@ -179,14 +179,14 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ 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.12)
+ railties (= 3.2.13)
rails_best_practices (1.12.0)
activesupport
awesome_print
@@ -195,9 +195,9 @@ GEM
erubis
i18n
progressbar
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -206,7 +206,7 @@ GEM
rb-fsevent (0.9.2)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
- rdoc (3.12.1)
+ rdoc (3.12.2)
json (~> 1.4)
rspec (2.11.0)
rspec-core (~> 2.11.0)
@@ -263,7 +263,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
- tilt (1.3.3)
+ tilt (1.3.6)
tinder (1.9.1)
eventmachine (>= 0.12.0, < 2)
faraday (~> 0.8)
@@ -281,7 +281,7 @@ GEM
eventmachine (>= 0.12.8)
http_parser.rb (~> 0.5.1)
simple_oauth (~> 0.1.4)
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -302,7 +302,7 @@ DEPENDENCIES
capybara (~> 1.1.2)
coffee-rails (~> 3.2.2)
database_cleaner
- devise (~> 2.1.2)
+ devise (~> 2.2.3)
devise-encryptable (~> 0.1.1)
email_spec
erb2haml
@@ -325,7 +325,7 @@ DEPENDENCIES
newrelic_rpm
pry-rails
psych (~> 1.3.4)
- rails (= 3.2.12)
+ rails (= 3.2.13)
rails_best_practices
rb-fsevent (>= 0.4.3)
rb-inotify (>= 0.8.6)

0 comments on commit 1d320d2

Please sign in to comment.