Merge branch 'develop' into feature/messages_api

Conflicts:
	users/config/locales/en.yml

3 files changed, 4 insertions, 3 deletions

diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index a874772..a5461cd 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -61,7 +61,7 @@ class UsersController < UsersBaseController
     else
       # let's remove the invalid session
       logout
-      redirect_to home_url
+      redirect_to bye_url
     end
   end
 
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 0db63eb..ed6653a 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -37,8 +37,9 @@ en:
   enable_description: "This will restore the account to full functionality"
   deactivate_account: "Deactivate the account %{username}"
   deactivate_description: "This will temporarily deactivate some account functionality." #todo detail exact functionality. can receive email but not send or renew client certificate?
-
   payment_one_month_warning: "We hope you have been enjoying this service this past month. Please sign up to pay within the next month, by %{date_in_one_month}. Directions for payment are available at INSERT_URL"
+  bye: "Goodbye!"
+  bye_message: "So long and thanks for all the fish."
 
   #
   # overview
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 002a011..57ae94d 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -103,7 +103,7 @@ class UsersControllerTest < ActionController::TestCase
     delete :destroy, :id => @current_user.id
 
     assert_response :redirect
-    assert_redirected_to home_path
+    assert_redirected_to bye_url
   end
 
   test "non-admin can't destroy user" do