summaryrefslogtreecommitdiff
path: root/users/config
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-09-02 13:28:32 -0700
committerjessib <jessib@riseup.net>2013-09-02 13:28:32 -0700
commit57baaa65cab56d13b77fff674a57e7f3e4983f00 (patch)
tree719cdb3d4fd46b1e447262e4a29729513e4a08b1 /users/config
parentb69d37fcf00b7acfe1f35c3a6d79f244c5c28e01 (diff)
Remove references to email_settings controller, which has been removed. An identities controller will replace it.
Diffstat (limited to 'users/config')
-rw-r--r--users/config/locales/en.yml1
-rw-r--r--users/config/routes.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 55ba3a1..b69f7f4 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -1,5 +1,4 @@
en:
- email_settings: "Email Settings"
account_settings: "Account Settings"
logout: "Logout"
none: "None"
diff --git a/users/config/routes.rb b/users/config/routes.rb
index 4fa185f..d4d5933 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -15,7 +15,7 @@ Rails.application.routes.draw do
get "signup" => "users#new", :as => "signup"
resources :users, :except => [:create, :update] do
resource :overview, :only => [:show]
- resource :email_settings, :only => [:edit, :update]
+ # resource :email_settings, :only => [:edit, :update]
resources :email_aliases, :only => [:destroy], :id => /.*/
post 'deactivate', on: :member
post 'enable', on: :member