summaryrefslogtreecommitdiff
path: root/lib/gitlab/bitbucket_import
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-11-11 16:33:28 -0800
committerStan Hu <stanhu@gmail.com>2016-11-21 16:47:28 -0800
commit82d7a3a3dd61c70c87a8a4a116b2ce6c0612de59 (patch)
treef5b10b2eda8c14ddf84687de2835da51736a04ea /lib/gitlab/bitbucket_import
parent3b9d1c0f5d2996b946ab71704995b752c0ff8f60 (diff)
downloadgitlab-ce-82d7a3a3dd61c70c87a8a4a116b2ce6c0612de59.tar.gz
Fix typos in pull requests failing to import
Diffstat (limited to 'lib/gitlab/bitbucket_import')
-rw-r--r--lib/gitlab/bitbucket_import/importer.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 0060e350249..15cc64dd7f4 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -43,7 +43,7 @@ module Gitlab
title: issue.title,
description: description,
state: issue.state,
- author_id: gl_user_id(project, issue.author),
+ author_id: gitlab_user_id(project, issue.author),
created_at: issue.created_at,
updated_at: issue.updated_at
)
@@ -56,7 +56,7 @@ module Gitlab
issue.notes.create!(
project: project,
note: note,
- author_id: gl_user_id(project, comment.author),
+ author_id: gitlab_user_id(project, comment.author),
created_at: comment.created_at,
updated_at: comment.updated_at
)
@@ -93,7 +93,7 @@ module Gitlab
target_branch: pull_request.target_branch_name,
target_branch_sha: pull_request.target_branch_sha,
state: pull_request.state,
- author_id: gl_user_id(project, pull_request.author),
+ author_id: gitlab_user_id(project, pull_request.author),
assignee_id: nil,
created_at: pull_request.created_at,
updated_at: pull_request.updated_at