diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/services/merge_requests | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r-- | app/services/merge_requests/merge_service.rb | 4 | ||||
-rw-r--r-- | app/services/merge_requests/update_service.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 31097b9151a..8d57a76f7d0 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -121,12 +121,12 @@ module MergeRequests end def handle_merge_error(log_message:, save_message_on_model: false) - Rails.logger.error("MergeService ERROR: #{merge_request_info} - #{log_message}") # rubocop:disable Gitlab/RailsLogger + Gitlab::AppLogger.error("MergeService ERROR: #{merge_request_info} - #{log_message}") @merge_request.update(merge_error: log_message) if save_message_on_model end def log_info(message) - @logger ||= Rails.logger # rubocop:disable Gitlab/RailsLogger + @logger ||= Gitlab::AppLogger @logger.info("#{merge_request_info} - #{message}") end diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 2d33e87bf4b..561695baeab 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -27,7 +27,7 @@ module MergeRequests old_assignees = old_associations.fetch(:assignees, []) if has_changes?(merge_request, old_labels: old_labels, old_assignees: old_assignees) - todo_service.mark_pending_todos_as_done(merge_request, current_user) + todo_service.resolve_todos_for_target(merge_request, current_user) end if merge_request.previous_changes.include?('title') || @@ -73,7 +73,7 @@ module MergeRequests end def handle_task_changes(merge_request) - todo_service.mark_pending_todos_as_done(merge_request, current_user) + todo_service.resolve_todos_for_target(merge_request, current_user) todo_service.update_merge_request(merge_request, current_user) end |