Merge branch '38208-due-dates-system-notes' into 'master'

Add system note when due date is changed

Closes #38208

See merge request gitlab-org/gitlab-ce!21628

4 files changed, 28 insertions, 2 deletions

diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index 5b4a141dbcf..b0826e23e31 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -21,7 +21,8 @@ module SystemNoteHelper
     'outdated' => 'pencil-square',
     'duplicate' => 'issue-duplicate',
     'locked' => 'lock',
-    'unlocked' => 'lock-open'
+    'unlocked' => 'lock-open',
+    'due_date' => 'calendar'
   }.freeze
 
   def system_note_icon_name(note)
diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index 376ef673ca8..6fadbcefa53 100644
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -15,7 +15,7 @@ class SystemNoteMetadata < ActiveRecord::Base
     commit description merge confidential visible label assignee cross_reference
     title time_tracking branch milestone discussion task moved
     opened closed merged duplicate locked unlocked
-    outdated tag
+    outdated tag due_date
   ].freeze
 
   validates :note, presence: true
diff --git a/app/services/issuable/common_system_notes_service.rb b/app/services/issuable/common_system_notes_service.rb
index ab53c38aa3a..765de9c66b0 100644
--- a/app/services/issuable/common_system_notes_service.rb
+++ b/app/services/issuable/common_system_notes_service.rb
@@ -17,6 +17,7 @@ module Issuable
       create_labels_note(old_labels) if issuable.labels != old_labels
       create_discussion_lock_note if issuable.previous_changes.include?('discussion_locked')
       create_milestone_note if issuable.previous_changes.include?('milestone_id')
+      create_due_date_note if issuable.previous_changes.include?('due_date')
     end
 
     private
@@ -90,6 +91,10 @@ module Issuable
       SystemNoteService.change_milestone(issuable, issuable.project, current_user, issuable.milestone)
     end
 
+    def create_due_date_note
+      SystemNoteService.change_due_date(issuable, issuable.project, current_user, issuable.due_date)
+    end
+
     def create_discussion_lock_note
       SystemNoteService.discussion_lock(issuable, current_user)
     end
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 3ea81445798..c5d05992575 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -119,6 +119,26 @@ module SystemNoteService
     create_note(NoteSummary.new(noteable, project, author, body, action: 'milestone'))
   end
 
+  # Called when the due_date of a Noteable is changed
+  #
+  # noteable  - Noteable object
+  # project   - Project owning noteable
+  # author    - User performing the change
+  # due_date  - Due date being assigned, or nil
+  #
+  # Example Note text:
+  #
+  #   "removed due date"
+  #
+  #   "changed due date to September 20, 2018"
+  #
+  # Returns the created Note object
+  def change_due_date(noteable, project, author, due_date)
+    body = due_date ? "changed due date to #{due_date.to_s(:long)}" : 'removed due date'
+
+    create_note(NoteSummary.new(noteable, project, author, body, action: 'due_date'))
+  end
+
   # Called when the estimated time of a Noteable is changed
   #
   # noteable      - Noteable object