Commit 326b8a42 authored by Nick Thomas's avatar Nick Thomas
Browse files

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

Remove comma from the time system notes

See merge request gitlab-org/gitlab-ce!18593
......@@ -159,7 +159,7 @@ def change_time_estimate(noteable, project, author)
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'))
......
......@@ -909,13 +909,7 @@ def reloaded_merge_request
it 'sets the note text' do
noteable.update_attribute(:time_estimate, 277200)
expect(subject.note).to eq "changed time estimate to 1w 4d 5h,"
end
it 'appends a comma to separate the note from the update_at time' do
noteable.update_attribute(:time_estimate, 277200)
expect(subject.note).to end_with(',')
expect(subject.note).to eq "changed time estimate to 1w 4d 5h"
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment