Automatic merge of gitlab-org/gitlab master

.gitlab/ci/rules.gitlab-ci.yml

.gitlab/ci/workhorse.gitlab-ci.yml

.rubocop_manual_todo.yml

app/assets/javascripts/persistent_user_callouts.js

app/helpers/diff_helper.rb

app/helpers/user_callouts_helper.rb

app/models/commit_status.rb

app/models/project_services/discord_service.rb

app/models/user_callout.rb

app/views/layouts/_page.html.haml

...s/header/_service_templates_deprecation_callout.html.haml

app/workers/build_finished_worker.rb

.../31063-ensure-diff-collection-limits-are-configurable.yml

...unreleased/325196-service-template-deprecation-update.yml

...sed/325691-add-sync_code_onwers_approval_rules_worker.yml

...d/ab-remove-async_add_build_failure_todo-feature-flag.yml

...-fix-empty-line-after-let-it-be-services-award-emojis.yml

...-fix-empty-line-after-let-it-be-services-environments.yml

changelogs/unreleased/pks-workhorse-go-1-16.yml

changelogs/unreleased/ui-text-discord-integration.yml