diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-15 08:19:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-15 08:19:01 +0000 |
| commit | ddec8e777f31d747d8c5c6599acf6b84afeea92d (patch) | |
| tree | 6b8f5a574f3c48b0af783bd74c63eb8b53b30bcf /config | |
| parent | 4e2f068c5fd7505be0674546ac977977152d3800 (diff) | |
| parent | a434ffd3b3a895bd75daed76000def23f4002f5a (diff) | |
| download | gitlab-ce-ddec8e777f31d747d8c5c6599acf6b84afeea92d.tar.gz | |
Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master'
Make /profile/keys/new redirects to /profile/keys for back-compat
This addresses https://github.com/gitlabhq/gitlabhq/issues/10138.
See merge request !3717
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 408132f4217..46a25262844 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -328,7 +328,7 @@ Rails.application.routes.draw do end end resource :preferences, only: [:show, :update] - resources :keys, except: [:new] + resources :keys resources :emails, only: [:index, :create, :destroy] resource :avatar, only: [:destroy] resource :two_factor_auth, only: [:new, :create, :destroy] do |