diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 06:09:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 06:09:00 +0300 |
commit | 56201db1dc66f3a2d598f6f8da0bec170dc26ba1 (patch) | |
tree | 8317b0a17c76866b981b497b13786dadceee5abf /lib | |
parent | ce2a803dc413f289352deecbf2cfd32896c8b2ef (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/sidekiq_logging/structured_logger.rb | 4 | ||||
-rw-r--r-- | lib/tasks/gitlab/assets.rake | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/sidekiq_logging/structured_logger.rb b/lib/gitlab/sidekiq_logging/structured_logger.rb index 6dacca5529b..b45014d283f 100644 --- a/lib/gitlab/sidekiq_logging/structured_logger.rb +++ b/lib/gitlab/sidekiq_logging/structured_logger.rb @@ -77,7 +77,9 @@ module Gitlab end def parse_job(job) - job = job.dup + # Error information from the previous try is in the payload for + # displaying in the Sidekiq UI, but is very confusing in logs! + job = job.except('error_backtrace', 'error_class', 'error_message') # Add process id params job['pid'] = ::Process.pid diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake index 3aa1dc403d6..b398bbe403f 100644 --- a/lib/tasks/gitlab/assets.rake +++ b/lib/tasks/gitlab/assets.rake @@ -8,7 +8,6 @@ namespace :gitlab do yarn:check gettext:po_to_json rake:assets:precompile - gitlab:assets:vendor webpack:compile gitlab:assets:fix_urls ].each(&Gitlab::TaskHelpers.method(:invoke_and_time_task)) |