From 846868e92244ce5d34cd9c5b16396f995e8463a9 Mon Sep 17 00:00:00 2001
From: Pair <ken@seeice.com>
Date: Sat, 31 Aug 2013 02:36:23 +0000
Subject: [PATCH] updated the devise gem and removed the after create email
 sending

---
 Gemfile            |  2 +-
 Gemfile.lock       | 12 ++++++------
 app/models/user.rb |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index e19c24e..73f3bcc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'vacuum', '0.3.0'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'devise', '3.0.0.rc'
+gem 'devise' #, '3.0.0.rc'
 gem 'protected_attributes'
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 066bc64..9982f0a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,9 +51,9 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.0)
-    atomic (1.1.12)
+    atomic (1.1.13)
     awesome_print (1.1.0)
-    bcrypt-ruby (3.1.1)
+    bcrypt-ruby (3.1.2)
     better_errors (0.9.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -97,11 +97,11 @@ GEM
       debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.3)
-    devise (3.0.0.rc)
+    devise (3.0.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
-      warden (~> 1.2.1)
+      warden (~> 1.2.3)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     excon (0.16.10)
@@ -118,7 +118,7 @@ GEM
     gherkin (2.12.1)
       multi_json (~> 1.3)
     hike (1.2.3)
-    i18n (0.6.4)
+    i18n (0.6.5)
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
@@ -250,7 +250,7 @@ DEPENDENCIES
   cucumber-rails
   cucumber-rails-training-wheels
   database_cleaner
-  devise (= 3.0.0.rc)
+  devise
   factory_girl_rails
   faker (= 1.0.1)
   jasmine
diff --git a/app/models/user.rb b/app/models/user.rb
index 1ae4e35..5b8449d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -29,7 +29,7 @@
 
 class User < ActiveRecord::Base
   # before_create :set_user_blocked
-  after_create :email_admin_and_user
+  # after_create :email_admin_and_user
 
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,