diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-02 07:57:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-02 07:57:08 +0000 |
| commit | 023a3816e79a4ce7e8328635070b837b57e21c76 (patch) | |
| tree | 46b555f5fcfd7db20c647073a921f9eaad8d9e35 | |
| parent | 9ba9c3c8333311be79e3ca45a43da5e49423e669 (diff) | |
| parent | 991db50f883c14f7f1731f5d22713168320a0c76 (diff) | |
| download | gitlab-ce-023a3816e79a4ce7e8328635070b837b57e21c76.tar.gz | |
Merge branch 'blackst0ne-rails5-update-application-controller-log-exception' into 'master'
[Rails5] Update `ApplicationController#log_exception` to fix `undefined method 'clean'` error
See merge request gitlab-org/gitlab-ce!18636
| -rw-r--r-- | app/controllers/application_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0fdd4d2cb47..8ad13a82f89 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -110,7 +110,8 @@ class ApplicationController < ActionController::Base def log_exception(exception) Raven.capture_exception(exception) if sentry_enabled? - application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace + backtrace_cleaner = Gitlab.rails5? ? env["action_dispatch.backtrace_cleaner"] : env + application_trace = ActionDispatch::ExceptionWrapper.new(backtrace_cleaner, exception).application_trace application_trace.map! { |t| " #{t}\n" } logger.error "\n#{exception.class.name} (#{exception.message}):\n#{application_trace.join}" end |