Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-22 02:50:22 +0300
committerDouwe Maan <douwe@selenight.nl>2017-02-23 18:31:57 +0300
commit030baf70d25a666b660b0024f000586631ee3daf (patch)
tree20dbdbb674e9a4fd0ad6d82161e34fd26aaf37cd /app/services/system_note_service.rb
parentc5a49cc3c56283ae5f015c808327b1a29ca09ed9 (diff)
Enable Performance/RedundantMerge
Diffstat (limited to 'app/services/system_note_service.rb')
-rw-r--r--app/services/system_note_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 87ba72cf991..71b4f8605a4 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -359,7 +359,7 @@ module SystemNoteService
if noteable.kind_of?(Commit)
note_options.merge!(noteable_type: 'Commit', commit_id: noteable.id)
else
- note_options.merge!(noteable: noteable)
+ note_options[:noteable] = noteable
end
if noteable.is_a?(ExternalIssue)