summaryrefslogtreecommitdiff
path: root/app/graphql/mutations/notes/update
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-09 06:09:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-09 06:09:23 +0000
commit4bfebcc481ca32ca0055e55cad509f400a2939ff (patch)
treeae2178cccb15c2c16a83865d496fd4a40f465dfb /app/graphql/mutations/notes/update
parent5d066c532d5fc4dc8a89be2068236b7058ddb645 (diff)
downloadgitlab-ce-4bfebcc481ca32ca0055e55cad509f400a2939ff.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql/mutations/notes/update')
-rw-r--r--app/graphql/mutations/notes/update/image_diff_note.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/graphql/mutations/notes/update/image_diff_note.rb b/app/graphql/mutations/notes/update/image_diff_note.rb
index ef70a8d2bf4..f4533cd9edb 100644
--- a/app/graphql/mutations/notes/update/image_diff_note.rb
+++ b/app/graphql/mutations/notes/update/image_diff_note.rb
@@ -47,12 +47,11 @@ module Mutations
end
def position_params(note, args)
- new_position = args[:position]&.to_h&.compact
- return unless new_position
+ return unless args[:position]
original_position = note.position.to_h
- Gitlab::Diff::Position.new(original_position.merge(new_position))
+ Gitlab::Diff::Position.new(original_position.merge(args[:position]))
end
end
end