diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-30 08:59:57 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-30 08:59:57 +0000 |
| commit | 8312fec63f2f162c0ed0045fdc5249fcb474a87e (patch) | |
| tree | 2d8946f52412ba1b21906b6170598ea81d318638 | |
| parent | 68c2588f853c6583c942eaefc85889072816b219 (diff) | |
| download | redmine-8312fec63f2f162c0ed0045fdc5249fcb474a87e.tar.gz redmine-8312fec63f2f162c0ed0045fdc5249fcb474a87e.zip | |
Merged r10893 into 1.4-stable (#12472).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10896 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/roles_controller.rb | 1 | ||||
| -rw-r--r-- | doc/CHANGELOG | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index 67acb545d..f5a34b5b3 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -22,6 +22,7 @@ class RolesController < ApplicationController before_filter :require_admin_or_api_request, :only => :index before_filter :find_role, :only => [:edit, :update, :destroy] accept_api_auth :index + accept_api_auth :index, :show def index respond_to do |format| diff --git a/doc/CHANGELOG b/doc/CHANGELOG index e9e733b5c..a0b1e4411 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -7,6 +7,7 @@ http://www.redmine.org/ == TBD v1.4.6 * Defect #12409: Git: changesets aren't read after clear_changesets call +* Defect #12472: Roles REST API does not accept API authentication == 2012-11-17 v1.4.5 |