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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
bb650ad0
Commit
bb650ad0
authored
Apr 25, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove comma from the time system notes
parent
3d12ce95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
app/services/system_note_service.rb
app/services/system_note_service.rb
+1
-1
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+1
-7
No files found.
app/services/system_note_service.rb
View file @
bb650ad0
...
@@ -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'
))
...
...
spec/services/system_note_service_spec.rb
View file @
bb650ad0
...
@@ -909,13 +909,7 @@ describe SystemNoteService do
...
@@ -909,13 +909,7 @@ 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