summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-01-23 12:05:58 -0800
committerjessib <jessib@riseup.net>2014-01-23 12:05:58 -0800
commitd578c07e196cd9758fbf1752a9bb8477c260bb30 (patch)
tree4dcbef4b1b2ea9dcd52cf98f1bb98b371a93c631 /users
parent01941b7d930c581a6684f6b939b3ae2f62bd832e (diff)
parentce412a9a0ccce22b5b9d90f70369b91d5fc46e4f (diff)
Merge pull request #135 from elijh/feature/pages
add some static pages
Diffstat (limited to 'users')
-rw-r--r--users/app/controllers/users_controller.rb2
-rw-r--r--users/config/locales/en.yml3
-rw-r--r--users/test/functional/users_controller_test.rb2
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 934fcee..e597164 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -37,7 +37,8 @@ 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?
-
+ 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