diff options
| author | azul <azul@riseup.net> | 2014-05-14 08:41:13 +0200 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2014-05-14 08:41:13 +0200 |
| commit | c85028fba2a25f22b375b8714c2e1999c35f8e82 (patch) | |
| tree | e9c6a5c25e0bb7acaddae1f34a9fd0de886bbeb8 /config | |
| parent | 4843db127a5d5d038f227d9ffe5f0b83d95fd9f6 (diff) | |
| parent | 3278e474a32ef4926b1dab0d97ca4df1c59aa2a0 (diff) | |
Merge pull request #157 from azul/bugfix/5664-stop-email-autofill
Bugfix/5664 stop email autofill
Diffstat (limited to 'config')
| -rw-r--r-- | config/defaults.yml | 5 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config/defaults.yml b/config/defaults.yml index 47cb641..1c7e694 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -54,12 +54,17 @@ service_levels: &service_levels description: "free account, with rate limited VPN" eip_rate_limit: true storage: 100 + services: + - eip 2: name: premium description: "premium account, with unlimited vpn" rate: USD: 10 EUR: 10 + services: + - eip + - email default_service_level: 1 development: diff --git a/config/routes.rb b/config/routes.rb index f612b47..745b97d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,7 +20,8 @@ LeapWeb::Application.routes.draw do namespace "api", { module: "v1", path: "/1/", defaults: {format: 'json'} } do - resources :sessions, :only => [:new, :create, :update] + resources :sessions, :only => [:new, :create, :update], + :constraints => { :id => /[^\/]+(?=\.json\z)|[^\/]+/ } delete "logout" => "sessions#destroy", :as => "logout" resources :users, :only => [:create, :update, :destroy, :index] resources :messages, :only => [:index, :update] |