diff options
| author | Andrew Smith <espadav8@gmail.com> | 2016-09-08 03:44:58 +0300 |
|---|---|---|
| committer | Andrew Smith <espadav8@gmail.com> | 2016-09-08 04:57:22 +0300 |
| commit | 9a9e22a88cb670e5f3688a2ff8499e0e7bbe840e (patch) | |
| tree | 5943733be78d5da49b0c03c076dae1e92b26d58d /lib/gitlab/bitbucket_import | |
| parent | 43d6328fbc40e95999fcbb2cdbd5932d7dc799ad (diff) | |
Rename `gl_user_id` to `gitlab_user_id` in importer classes
Diffstat (limited to 'lib/gitlab/bitbucket_import')
| -rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index 7beaecd1cf0..f4b5097adb1 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -21,7 +21,7 @@ module Gitlab private - def gl_user_id(project, bitbucket_id) + def gitlab_user_id(project, bitbucket_id) if bitbucket_id user = User.joins(:identities).find_by("identities.extern_uid = ? AND identities.provider = 'bitbucket'", bitbucket_id.to_s) (user && user.id) || project.creator_id @@ -74,7 +74,7 @@ module Gitlab description: body, title: issue["title"], state: %w(resolved invalid duplicate wontfix closed).include?(issue["status"]) ? 'closed' : 'opened', - author_id: gl_user_id(project, reporter) + author_id: gitlab_user_id(project, reporter) ) end rescue ActiveRecord::RecordInvalid => e |