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
Léo-Paul Géneau
gitlab-ce
Commits
07717744
Commit
07717744
authored
Feb 03, 2017
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disallow system notes for closed issuables
parent
b0f5d1a9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
0 deletions
+44
-0
app/services/system_note_service.rb
app/services/system_note_service.rb
+1
-0
changelogs/unreleased/issue_19262.yml
changelogs/unreleased/issue_19262.yml
+4
-0
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+39
-0
No files found.
app/services/system_note_service.rb
View file @
07717744
...
@@ -385,6 +385,7 @@ module SystemNoteService
...
@@ -385,6 +385,7 @@ module SystemNoteService
# Returns Boolean
# Returns Boolean
def
cross_reference_disallowed?
(
noteable
,
mentioner
)
def
cross_reference_disallowed?
(
noteable
,
mentioner
)
return
true
if
noteable
.
is_a?
(
ExternalIssue
)
&&
!
noteable
.
project
.
jira_tracker_active?
return
true
if
noteable
.
is_a?
(
ExternalIssue
)
&&
!
noteable
.
project
.
jira_tracker_active?
return
true
if
noteable
.
is_a?
(
Issuable
)
&&
(
noteable
.
try
(
:closed?
)
||
noteable
.
try
(
:merged?
))
return
false
unless
mentioner
.
is_a?
(
MergeRequest
)
return
false
unless
mentioner
.
is_a?
(
MergeRequest
)
return
false
unless
noteable
.
is_a?
(
Commit
)
return
false
unless
noteable
.
is_a?
(
Commit
)
...
...
changelogs/unreleased/issue_19262.yml
0 → 100644
View file @
07717744
---
title
:
Disallow system notes for closed issuables
merge_request
:
author
:
spec/services/system_note_service_spec.rb
View file @
07717744
...
@@ -418,6 +418,45 @@ describe SystemNoteService, services: true do
...
@@ -418,6 +418,45 @@ describe SystemNoteService, services: true do
to
be_truthy
to
be_truthy
end
end
end
end
context
'when noteable is an Issue'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
it
'is truthy when issue is closed'
do
issue
.
close
expect
(
described_class
.
cross_reference_disallowed?
(
issue
,
project
.
commit
)).
to
be_truthy
end
it
'is falsey when issue is open'
do
expect
(
described_class
.
cross_reference_disallowed?
(
issue
,
project
.
commit
)).
to
be_falsy
end
end
context
'when noteable is a Merge Request'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
:simple
,
source_project:
project
)
}
it
'is truthy when merge request is closed'
do
allow
(
merge_request
).
to
receive
(
:closed?
).
and_return
(
:true
)
expect
(
described_class
.
cross_reference_disallowed?
(
merge_request
,
project
.
commit
)).
to
be_truthy
end
it
'is truthy when merge request is merged'
do
allow
(
merge_request
).
to
receive
(
:closed?
).
and_return
(
:true
)
expect
(
described_class
.
cross_reference_disallowed?
(
merge_request
,
project
.
commit
)).
to
be_truthy
end
it
'is falsey when merge request is open'
do
expect
(
described_class
.
cross_reference_disallowed?
(
merge_request
,
project
.
commit
)).
to
be_falsy
end
end
end
end
describe
'.cross_reference_exists?'
do
describe
'.cross_reference_exists?'
do
...
...
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