diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-12 21:43:20 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-12 21:43:20 +0300 |
| commit | 8d7951d879d13894dcc1fd5d845c8d844bee321a (patch) | |
| tree | ee1a7cc0f89edb8f79190ee66832c6fba2159d7f /app/services/issuable_base_service.rb | |
| parent | e889b4e8c2f9e31ceac6e456793de357d96067f7 (diff) | |
| parent | 7360703aabe448af7fec36cb806a5f3680afefd1 (diff) | |
Merge branch '32834-task-note-only' into 'master'
Prevent Description Change Notes When Toggling Tasks
Closes #32834
See merge request !12057
Diffstat (limited to 'app/services/issuable_base_service.rb')
| -rw-r--r-- | app/services/issuable_base_service.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index e77a3e3eac1..a65d6e11c47 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -313,11 +313,13 @@ class IssuableBaseService < BaseService end if issuable.previous_changes.include?('description') - create_description_change_note(issuable) - end - - if issuable.previous_changes.include?('description') && issuable.tasks? - create_task_status_note(issuable) + if issuable.tasks? && issuable.updated_tasks.any? + create_task_status_note(issuable) + else + # TODO: Show this note if non-task content was modified. + # https://gitlab.com/gitlab-org/gitlab-ce/issues/33577 + create_description_change_note(issuable) + end end if issuable.previous_changes.include?('time_estimate') |