Merge pull request #182 from gabceb/kandan-181

Updated devise and dependencies to latest version.
kandanapp · Mar 4, 2013 · 16d0108 · 16d0108
2 parents 11816d1 + 371e0a0
commit 16d0108
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -58,8 +58,15 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
+    colorize (0.5.8)
     columnize (0.3.6)
     cookiejar (0.3.0)
+    coveralls (0.6.0)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
     daemons (1.1.9)
     database_cleaner (0.9.1)
     debugger (1.3.3)
@@ -69,10 +76,11 @@ GEM
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
     debugger-ruby_core_source (1.2.0)
-    devise (1.5.3)
+    devise (2.2.3)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
     diff-lcs (1.1.3)
     eco (1.0.0)
       coffee-script
@@ -151,7 +159,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.6.1)
     nokogiri (1.5.6)
-    orm_adapter (0.0.7)
+    orm_adapter (0.4.0)
     paperclip (3.4.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
@@ -194,6 +202,8 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     remotipart (1.0.5)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -265,6 +275,7 @@ DEPENDENCIES
   bootstrap-sass (~> 2.3.0.1)
   bourbon (~> 1.4.0)
   coffee-rails
+  coveralls
   database_cleaner
   debugger
   devise

diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -26,8 +26,4 @@
   <p><%= f.submit "Update" %></p>
 <% end %>
 
-<h3>Cancel my account</h3>
-
 <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
-
-<p><%= link_to "Back", :back %></p>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -92,10 +92,6 @@
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}