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
bdbaebf8
Commit
bdbaebf8
authored
Jul 09, 2019
by
Felipe Artur
Committed by
Dmitriy Zaporozhets
Jul 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skip spam check for task list updates
Task list updates should not mark users action as spam on akismet.
parent
54820ac9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
4 deletions
+25
-4
app/services/issuable_base_service.rb
app/services/issuable_base_service.rb
+2
-2
app/services/issues/update_service.rb
app/services/issues/update_service.rb
+2
-2
changelogs/unreleased/issue_64021.yml
changelogs/unreleased/issue_64021.yml
+5
-0
spec/services/issues/update_service_spec.rb
spec/services/issues/update_service_spec.rb
+16
-0
No files found.
app/services/issuable_base_service.rb
View file @
bdbaebf8
...
...
@@ -182,7 +182,7 @@ class IssuableBaseService < BaseService
# To be overridden by subclasses
end
def
before_update
(
issuable
)
def
before_update
(
issuable
,
skip_spam_check:
false
)
# To be overridden by subclasses
end
...
...
@@ -257,7 +257,7 @@ class IssuableBaseService < BaseService
last_edited_at:
Time
.
now
,
last_edited_by:
current_user
))
before_update
(
issuable
)
before_update
(
issuable
,
skip_spam_check:
true
)
if
issuable
.
with_transaction_returning_status
{
issuable
.
save
}
# We do not touch as it will affect a update on updated_at field
...
...
app/services/issues/update_service.rb
View file @
bdbaebf8
...
...
@@ -17,8 +17,8 @@ module Issues
super
end
def
before_update
(
issue
)
spam_check
(
issue
,
current_user
)
def
before_update
(
issue
,
skip_spam_check:
false
)
spam_check
(
issue
,
current_user
)
unless
skip_spam_check
end
def
handle_changes
(
issue
,
options
)
...
...
changelogs/unreleased/issue_64021.yml
0 → 100644
View file @
bdbaebf8
---
title
:
Skip spam check for task list updates
merge_request
:
30279
author
:
type
:
fixed
spec/services/issues/update_service_spec.rb
View file @
bdbaebf8
...
...
@@ -480,6 +480,22 @@ describe Issues::UpdateService, :mailer do
update_issue
(
description:
"- [x] Task 1
\n
- [X] Task 2"
)
end
it
'does not check for spam on task status change'
do
params
=
{
update_task:
{
index:
1
,
checked:
false
,
line_source:
'- [x] Task 1'
,
line_number:
1
}
}
service
=
described_class
.
new
(
project
,
user
,
params
)
expect
(
service
).
not_to
receive
(
:spam_check
)
service
.
execute
(
issue
)
end
it
'creates system note about task status change'
do
note1
=
find_note
(
'marked the task **Task 1** as completed'
)
note2
=
find_note
(
'marked the task **Task 2** as completed'
)
...
...
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