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
3cdac383
Commit
3cdac383
authored
Jul 09, 2020
by
ddash2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use getters instead of instance variables
parent
2b06da87
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
app/services/notes/post_process_service.rb
app/services/notes/post_process_service.rb
+11
-11
app/services/notes/quick_actions_service.rb
app/services/notes/quick_actions_service.rb
+1
-1
No files found.
app/services/notes/post_process_service.rb
View file @
3cdac383
...
...
@@ -10,13 +10,13 @@ module Notes
def
execute
# Skip system notes, like status changes and cross-references and awards
unless
@
note
.
system?
EventCreateService
.
new
.
leave_note
(
@note
,
@
note
.
author
)
unless
note
.
system?
EventCreateService
.
new
.
leave_note
(
note
,
note
.
author
)
return
if
@
note
.
for_personal_snippet?
return
if
note
.
for_personal_snippet?
@
note
.
create_cross_references!
::
SystemNoteService
.
design_discussion_added
(
@
note
)
if
create_design_discussion_system_note?
note
.
create_cross_references!
::
SystemNoteService
.
design_discussion_added
(
note
)
if
create_design_discussion_system_note?
execute_note_hooks
end
...
...
@@ -25,21 +25,21 @@ module Notes
private
def
create_design_discussion_system_note?
@note
&&
@note
.
for_design?
&&
@
note
.
start_of_discussion?
note
&&
note
.
for_design?
&&
note
.
start_of_discussion?
end
def
hook_data
Gitlab
::
DataBuilder
::
Note
.
build
(
@note
,
@
note
.
author
)
Gitlab
::
DataBuilder
::
Note
.
build
(
note
,
note
.
author
)
end
def
execute_note_hooks
return
unless
@
note
.
project
return
unless
note
.
project
note_data
=
hook_data
hooks_scope
=
@
note
.
confidential?
(
include_noteable:
true
)
?
:confidential_note_hooks
:
:note_hooks
hooks_scope
=
note
.
confidential?
(
include_noteable:
true
)
?
:confidential_note_hooks
:
:note_hooks
@
note
.
project
.
execute_hooks
(
note_data
,
hooks_scope
)
@
note
.
project
.
execute_services
(
note_data
,
hooks_scope
)
note
.
project
.
execute_hooks
(
note_data
,
hooks_scope
)
note
.
project
.
execute_services
(
note_data
,
hooks_scope
)
end
end
end
...
...
app/services/notes/quick_actions_service.rb
View file @
3cdac383
...
...
@@ -41,7 +41,7 @@ module Notes
@interpret_service
=
QuickActions
::
InterpretService
.
new
(
project
,
current_user
,
options
)
@
interpret_service
.
execute
(
note
.
note
,
note
.
noteable
)
interpret_service
.
execute
(
note
.
note
,
note
.
noteable
)
end
# Applies updates extracted to note#noteable
...
...
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