Merge branch 'ee-jivl-revert-system-notes-can-be-confusing' into 'master'

Remove comma from the time system notes

See merge request gitlab-org/gitlab-ee!5490

app/services/system_note_service.rb

@@ -159,7 +159,7 @@ module SystemNoteService
     body = if noteable.time_estimate == 0
              "removed time estimate"
            else
-             "changed time estimate to #{parsed_time},"
+             "changed time estimate to #{parsed_time}"
            end
 
     create_note(NoteSummary.new(noteable, project, author, body, action: 'time_tracking'))

spec/services/system_note_service_spec.rb

@@ -947,7 +947,7 @@ describe SystemNoteService do
       it 'sets the note text' do
         noteable.update_attribute(:time_estimate, 277200)
 
-        expect(subject.note).to eq "changed time estimate to 1w 4d 5h,"
+        expect(subject.note).to eq "changed time estimate to 1w 4d 5h"
       end
     end