Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
a6ddeb54
Commit
a6ddeb54
authored
Apr 11, 2018
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a comma to the time system notes estimates
parent
3a1b961d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
app/services/system_note_service.rb
app/services/system_note_service.rb
+1
-1
changelogs/unreleased/40402-time-estimate-system-notes-can-be-confusing.yml
...sed/40402-time-estimate-system-notes-can-be-confusing.yml
+5
-0
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+7
-1
No files found.
app/services/system_note_service.rb
View file @
a6ddeb54
...
@@ -159,7 +159,7 @@ module SystemNoteService
...
@@ -159,7 +159,7 @@ module SystemNoteService
body
=
if
noteable
.
time_estimate
==
0
body
=
if
noteable
.
time_estimate
==
0
"removed time estimate"
"removed time estimate"
else
else
"changed time estimate to
#{
parsed_time
}
"
"changed time estimate to
#{
parsed_time
}
,
"
end
end
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
author
,
body
,
action:
'time_tracking'
))
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
author
,
body
,
action:
'time_tracking'
))
...
...
changelogs/unreleased/40402-time-estimate-system-notes-can-be-confusing.yml
0 → 100644
View file @
a6ddeb54
---
title
:
Add a comma to the time estimate system notes
merge_request
:
18326
author
:
type
:
changed
spec/services/system_note_service_spec.rb
View file @
a6ddeb54
...
@@ -909,7 +909,13 @@ describe SystemNoteService do
...
@@ -909,7 +909,13 @@ describe SystemNoteService do
it
'sets the note text'
do
it
'sets the note text'
do
noteable
.
update_attribute
(
:time_estimate
,
277200
)
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
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
(
','
)
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment