1 files changed, 18 insertions, 39 deletions

diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index dda89830179..c5d05992575 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -98,66 +98,45 @@ module SystemNoteService
     create_note(NoteSummary.new(issue, project, author, body, action: 'assignee'))
   end
 
-  # Called when one or more labels on a Noteable are added and/or removed
+  # Called when the milestone of a Noteable is changed
   #
-  # noteable       - Noteable object
-  # project        - Project owning noteable
-  # author         - User performing the change
-  # added_labels   - Array of Labels added
-  # removed_labels - Array of Labels removed
+  # noteable  - Noteable object
+  # project   - Project owning noteable
+  # author    - User performing the change
+  # milestone - Milestone being assigned, or nil
   #
   # Example Note text:
   #
-  #   "added ~1 and removed ~2 ~3 labels"
-  #
-  #   "added ~4 label"
+  #   "removed milestone"
   #
-  #   "removed ~5 label"
+  #   "changed milestone to 7.11"
   #
   # Returns the created Note object
-  def change_label(noteable, project, author, added_labels, removed_labels)
-    labels_count = added_labels.count + removed_labels.count
-
-    references     = ->(label) { label.to_reference(format: :id) }
-    added_labels   = added_labels.map(&references).join(' ')
-    removed_labels = removed_labels.map(&references).join(' ')
-
-    text_parts = []
-
-    if added_labels.present?
-      text_parts << "added #{added_labels}"
-      text_parts << 'and' if removed_labels.present?
-    end
-
-    if removed_labels.present?
-      text_parts << "removed #{removed_labels}"
-    end
-
-    text_parts << 'label'.pluralize(labels_count)
-    body = text_parts.join(' ')
+  def change_milestone(noteable, project, author, milestone)
+    format = milestone&.group_milestone? ? :name : :iid
+    body = milestone.nil? ? 'removed milestone' : "changed milestone to #{milestone.to_reference(project, format: format)}"
 
-    create_note(NoteSummary.new(noteable, project, author, body, action: 'label'))
+    create_note(NoteSummary.new(noteable, project, author, body, action: 'milestone'))
   end
 
-  # Called when the milestone of a Noteable is changed
+  # Called when the due_date of a Noteable is changed
   #
   # noteable  - Noteable object
   # project   - Project owning noteable
   # author    - User performing the change
-  # milestone - Milestone being assigned, or nil
+  # due_date  - Due date being assigned, or nil
   #
   # Example Note text:
   #
-  #   "removed milestone"
+  #   "removed due date"
   #
-  #   "changed milestone to 7.11"
+  #   "changed due date to September 20, 2018"
   #
   # Returns the created Note object
-  def change_milestone(noteable, project, author, milestone)
-    format = milestone&.group_milestone? ? :name : :iid
-    body = milestone.nil? ? 'removed milestone' : "changed milestone to #{milestone.to_reference(project, format: format)}"
+  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: 'milestone'))
+    create_note(NoteSummary.new(noteable, project, author, body, action: 'due_date'))
   end
 
   # Called when the estimated time of a Noteable is changed