summaryrefslogtreecommitdiff
path: root/lib/bitbucket
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-12-05 20:34:11 +0200
committerValery Sizov <valery@gitlab.com>2016-12-05 21:14:46 +0200
commit54221b5a3b9a2489f979944c77298c4adf004984 (patch)
treede9349c2f7559ce919b4dba1e466e23e42357370 /lib/bitbucket
parent32c6c9c457d88071ad82728ea6111a2d7d31b634 (diff)
downloadgitlab-ce-54221b5a3b9a2489f979944c77298c4adf004984.tar.gz
Fix inline comment importing for 1:1 diff type
Diffstat (limited to 'lib/bitbucket')
-rw-r--r--lib/bitbucket/representation/pull_request_comment.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bitbucket/representation/pull_request_comment.rb b/lib/bitbucket/representation/pull_request_comment.rb
index 94719edbf38..38090188919 100644
--- a/lib/bitbucket/representation/pull_request_comment.rb
+++ b/lib/bitbucket/representation/pull_request_comment.rb
@@ -14,7 +14,7 @@ module Bitbucket
end
def new_pos
- inline.fetch('to', nil) || 1
+ inline.fetch('to', nil) || old_pos || 1
end
def parent_id