diff options
Diffstat (limited to 'app/services/issues')
-rw-r--r-- | app/services/issues/create_service.rb | 7 | ||||
-rw-r--r-- | app/services/issues/import_csv_service.rb | 2 | ||||
-rw-r--r-- | app/services/issues/update_service.rb | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb index 7869509aa9c..c0194f5b847 100644 --- a/app/services/issues/create_service.rb +++ b/app/services/issues/create_service.rb @@ -15,7 +15,7 @@ module Issues end def before_create(issue) - spam_check(issue, current_user) + spam_check(issue, current_user, action: :create) issue.move_to_end # current_user (defined in BaseService) is not available within run_after_commit block @@ -38,9 +38,8 @@ module Issues return if discussions_to_resolve.empty? Discussions::ResolveService.new(project, current_user, - merge_request: merge_request_to_resolve_discussions_of, - follow_up_issue: issue) - .execute(discussions_to_resolve) + one_or_more_discussions: discussions_to_resolve, + follow_up_issue: issue).execute end private diff --git a/app/services/issues/import_csv_service.rb b/app/services/issues/import_csv_service.rb index c01db5fcfe6..60790ba3547 100644 --- a/app/services/issues/import_csv_service.rb +++ b/app/services/issues/import_csv_service.rb @@ -46,7 +46,7 @@ module Issues end def email_results_to_user - Notify.import_issues_csv_email(@user.id, @project.id, @results).deliver_now + Notify.import_issues_csv_email(@user.id, @project.id, @results).deliver_later end def detect_col_sep(header) diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index ee1a22634af..8d22f0edcdd 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -18,7 +18,7 @@ module Issues end def before_update(issue, skip_spam_check: false) - spam_check(issue, current_user) unless skip_spam_check + spam_check(issue, current_user, action: :update) unless skip_spam_check end def after_update(issue) @@ -32,7 +32,7 @@ module Issues old_assignees = old_associations.fetch(:assignees, []) if has_changes?(issue, old_labels: old_labels, old_assignees: old_assignees) - todo_service.mark_pending_todos_as_done(issue, current_user) + todo_service.resolve_todos_for_target(issue, current_user) end if issue.previous_changes.include?('title') || @@ -68,7 +68,7 @@ module Issues end def handle_task_changes(issuable) - todo_service.mark_pending_todos_as_done(issuable, current_user) + todo_service.resolve_todos_for_target(issuable, current_user) todo_service.update_issue(issuable, current_user) end |