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:
authorAndrew Smith <espadav8@gmail.com>2016-09-08 03:44:58 +0300
committerAndrew Smith <espadav8@gmail.com>2016-09-08 04:57:22 +0300
commit9a9e22a88cb670e5f3688a2ff8499e0e7bbe840e (patch)
tree5943733be78d5da49b0c03c076dae1e92b26d58d /lib/gitlab/gitlab_import
parent43d6328fbc40e95999fcbb2cdbd5932d7dc799ad (diff)
Rename `gl_user_id` to `gitlab_user_id` in importer classes
Diffstat (limited to 'lib/gitlab/gitlab_import')
-rw-r--r--lib/gitlab/gitlab_import/importer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index 46d40f75be6..0ce7d854e62 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -41,7 +41,7 @@ module Gitlab
title: issue["title"],
state: issue["state"],
updated_at: issue["updated_at"],
- author_id: gl_user_id(project, issue["author"]["id"])
+ author_id: gitlab_user_id(project, issue["author"]["id"])
)
end
end
@@ -51,7 +51,7 @@ module Gitlab
private
- def gl_user_id(project, gitlab_id)
+ def gitlab_user_id(project, gitlab_id)
user = User.joins(:identities).find_by("identities.extern_uid = ? AND identities.provider = 'gitlab'", gitlab_id.to_s)
(user && user.id) || project.creator_id
end