diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/services/jira_import/users_mapper_service.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/services/jira_import/users_mapper_service.rb')
-rw-r--r-- | app/services/jira_import/users_mapper_service.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/jira_import/users_mapper_service.rb b/app/services/jira_import/users_mapper_service.rb index 6c8610bfbf3..13e0dd5120e 100644 --- a/app/services/jira_import/users_mapper_service.rb +++ b/app/services/jira_import/users_mapper_service.rb @@ -13,7 +13,7 @@ module JiraImport def initialize(current_user, project, start_at) @current_user = current_user @project = project - @jira_service = project.jira_service + @jira_integration = project.jira_integration @start_at = start_at end @@ -29,14 +29,14 @@ module JiraImport private - attr_reader :current_user, :project, :jira_service, :start_at + attr_reader :current_user, :project, :jira_integration, :start_at def jira_users @jira_users ||= client.get(url) end def client - @client ||= jira_service.client + @client ||= jira_integration.client end def url @@ -77,7 +77,7 @@ module JiraImport end def project_member_ids - @project_member_ids ||= MembersFinder.new(project, current_user).execute.select(:user_id) + @project_member_ids ||= MembersFinder.new(project, current_user).execute.reselect(:user_id) end end end |