diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-12-20 10:11:07 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-12-20 10:11:07 +0000 |
| commit | 48afc0b15116d0ce47f12996b8d832f3c5f19427 (patch) | |
| tree | 22e18e3e8ac645413c662ffc3261b3e7c70ffdcf /app | |
| parent | 5ab9e10e7aeb24977a39d6fbefaaca4ee995fff6 (diff) | |
| download | redmine-48afc0b15116d0ce47f12996b8d832f3c5f19427.tar.gz redmine-48afc0b15116d0ce47f12996b8d832f3c5f19427.zip | |
Private note flag disappears in issue update conflict (#21551).
git-svn-id: http://svn.redmine.org/redmine/trunk@14984 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/issues_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index f2dd1acd2..29fc0c9f3 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -388,7 +388,7 @@ class IssuesController < ApplicationController issue_attributes = issue_attributes.dup issue_attributes.delete(:lock_version) when 'add_notes' - issue_attributes = issue_attributes.slice(:notes) + issue_attributes = issue_attributes.slice(:notes, :private_notes) when 'cancel' redirect_to issue_path(@issue) return false |