diff options
| author | Azul <azul@leap.se> | 2013-01-25 11:46:22 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-01-25 11:46:22 +0100 |
| commit | dac578781baf73a006cc78e29588dd1f6fdc0fd3 (patch) | |
| tree | a56ecff398a87efdd4840a8fc897d6471fbdaa69 /users/config | |
| parent | 75442ad26f3d30519f747bc98bc83cdc76aff750 (diff) | |
| parent | 9d053b6c9b61c68bf11f95bcb37631a518f1fba4 (diff) | |
Merge branch 'feature/webfinger' of https://github.com/leapcode/leap_web
Conflicts:
users/app/views/users/edit.html.haml
Diffstat (limited to 'users/config')
| -rw-r--r-- | users/config/locales/en.yml | 2 | ||||
| -rw-r--r-- | users/config/routes.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 7a6ab90..493b5db 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -13,10 +13,12 @@ en: set_email_address: "Set email address" forward_email: "Forward email" email_aliases: "Email aliases" + public_key: "Public Key" add_email_alias: "Add email alias" user_updated_successfully: "Settings have been updated successfully." user_created_successfully: "Successfully created your account." email_alias_destroyed_successfully: "Successfully removed the alias '%{alias}'." + use_ascii_key: "Use ASCII-armored PGP key" activemodel: models: diff --git a/users/config/routes.rb b/users/config/routes.rb index 0c2d8d9..4127862 100644 --- a/users/config/routes.rb +++ b/users/config/routes.rb @@ -18,4 +18,6 @@ Rails.application.routes.draw do resources :email_aliases, :only => [:destroy], :id => /.*/ end + get "/.well-known/host-meta" => 'webfinger#host_meta' + get "/webfinger" => 'webfinger#search' end |