diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /lib/gitlab/sidekiq_middleware | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'lib/gitlab/sidekiq_middleware')
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/server_metrics.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/size_limiter/exceed_limit_error.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/sidekiq_middleware/server_metrics.rb b/lib/gitlab/sidekiq_middleware/server_metrics.rb index f5fee8050ac..474afffcf93 100644 --- a/lib/gitlab/sidekiq_middleware/server_metrics.rb +++ b/lib/gitlab/sidekiq_middleware/server_metrics.rb @@ -119,4 +119,4 @@ module Gitlab end end -Gitlab::SidekiqMiddleware::ServerMetrics.prepend_if_ee('EE::Gitlab::SidekiqMiddleware::ServerMetrics') +Gitlab::SidekiqMiddleware::ServerMetrics.prepend_mod_with('Gitlab::SidekiqMiddleware::ServerMetrics') diff --git a/lib/gitlab/sidekiq_middleware/size_limiter/exceed_limit_error.rb b/lib/gitlab/sidekiq_middleware/size_limiter/exceed_limit_error.rb index da6c903ccae..540159e8a72 100644 --- a/lib/gitlab/sidekiq_middleware/size_limiter/exceed_limit_error.rb +++ b/lib/gitlab/sidekiq_middleware/size_limiter/exceed_limit_error.rb @@ -13,7 +13,7 @@ module Gitlab @size = size @size_limit = size_limit - super "#{@worker_class} job exceeds payload size limit (#{size}/#{size_limit})" + super "#{@worker_class} job exceeds payload size limit" end def sentry_extra_data |