diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 06:16:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 06:16:09 +0300 |
| commit | 242358bb7b8e031b9b975340750be33b19015cfa (patch) | |
| tree | 55cf5342bc232ba517698a1f82e859d5fdf25fac /app/services | |
| parent | 517f254952ababb661160d3afd659902d18e29cd (diff) | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/git/process_ref_changes_service.rb | 8 | ||||
| -rw-r--r-- | app/services/jira_import/users_mapper_service.rb | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/services/git/process_ref_changes_service.rb b/app/services/git/process_ref_changes_service.rb index c012c61a337..d039ed00efc 100644 --- a/app/services/git/process_ref_changes_service.rb +++ b/app/services/git/process_ref_changes_service.rb @@ -42,7 +42,7 @@ module Git push_service_class = push_service_class_for(ref_type) create_bulk_push_event = changes.size > Gitlab::CurrentSettings.push_event_activities_limit - merge_request_branches = merge_request_branches_for(changes) + merge_request_branches = merge_request_branches_for(ref_type, changes) changes.each do |change| push_service_class.new( @@ -74,8 +74,10 @@ module Git Git::BranchPushService end - def merge_request_branches_for(changes) - @merge_requests_branches ||= MergeRequests::PushedBranchesService.new(project, current_user, changes: changes).execute + def merge_request_branches_for(ref_type, changes) + return [] if ref_type == :tag + + MergeRequests::PushedBranchesService.new(project, current_user, changes: changes).execute end end end diff --git a/app/services/jira_import/users_mapper_service.rb b/app/services/jira_import/users_mapper_service.rb index b5997d77215..480c034f952 100644 --- a/app/services/jira_import/users_mapper_service.rb +++ b/app/services/jira_import/users_mapper_service.rb @@ -2,6 +2,7 @@ module JiraImport class UsersMapperService + # MAX_USERS must match the pageSize value in app/assets/javascripts/jira_import/utils/constants.js MAX_USERS = 50 attr_reader :jira_service, :start_at |