diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/services/jira_import/users_importer.rb | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/services/jira_import/users_importer.rb')
| -rw-r--r-- | app/services/jira_import/users_importer.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/jira_import/users_importer.rb b/app/services/jira_import/users_importer.rb index 9babd468d56..438a74343a5 100644 --- a/app/services/jira_import/users_importer.rb +++ b/app/services/jira_import/users_importer.rb @@ -2,8 +2,6 @@ module JiraImport class UsersImporter - attr_reader :user, :project, :start_at - def initialize(user, project, start_at) @project = project @start_at = start_at @@ -23,6 +21,8 @@ module JiraImport private + attr_reader :user, :project, :start_at + def mapped_users users_mapper_service.execute end @@ -44,9 +44,9 @@ module JiraImport # TODO: use deployment_type enum from jira service when https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37003 is merged case deployment_type.upcase when JiraService::DEPLOYMENT_TYPES[:server] - ServerUsersMapperService.new(project.jira_service, start_at) + ServerUsersMapperService.new(user, project, start_at) when JiraService::DEPLOYMENT_TYPES[:cloud] - CloudUsersMapperService.new(project.jira_service, start_at) + CloudUsersMapperService.new(user, project, start_at) else raise ArgumentError end |