diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-19 18:43:36 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-19 18:43:36 +0000 |
| commit | ef91a50cc2dcadbb39d2361de2599d887d9e524a (patch) | |
| tree | 63e97d0336763605c0eeb570579b98a387d546e6 | |
| parent | d6f389658b9e83d7a5d74c57fc46a203a5a88591 (diff) | |
| download | redmine-ef91a50cc2dcadbb39d2361de2599d887d9e524a.tar.gz redmine-ef91a50cc2dcadbb39d2361de2599d887d9e524a.zip | |
Changed /my/show_api_key route to /my/api_key (#19851).
git-svn-id: http://svn.redmine.org/redmine/trunk@14334 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | test/integration/routing/my_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index ab0ae6f27..625440c8e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -67,7 +67,7 @@ Rails.application.routes.draw do match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post - match 'my/show_api_key', :controller => 'my', :action => 'show_api_key', :via => :get + match 'my/api_key', :controller => 'my', :action => 'show_api_key', :via => :get match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post] match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post diff --git a/test/integration/routing/my_test.rb b/test/integration/routing/my_test.rb index e08c71c56..585764a0b 100644 --- a/test/integration/routing/my_test.rb +++ b/test/integration/routing/my_test.rb @@ -30,6 +30,7 @@ class RoutingMyTest < Redmine::RoutingTest should_route 'POST /my/reset_rss_key' => 'my#reset_rss_key' should_route 'POST /my/reset_api_key' => 'my#reset_api_key' + should_route 'GET /my/api_key' => 'my#show_api_key' should_route 'GET /my/password' => 'my#password' should_route 'POST /my/password' => 'my#password' |