diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-27 12:09:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-27 12:09:31 +0300 |
| commit | 2df573afed782aebce8c020d92b42e9da7d2868e (patch) | |
| tree | 5ecaa1095fe3b89cd6f89a336db67b368a1bb915 /app/controllers/graphql_controller.rb | |
| parent | b505d34cfffb03e1b9b718e01c3d85221683a695 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/graphql_controller.rb')
| -rw-r--r-- | app/controllers/graphql_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb index b5deed70380..1852405e7cf 100644 --- a/app/controllers/graphql_controller.rb +++ b/app/controllers/graphql_controller.rb @@ -37,7 +37,11 @@ class GraphqlController < ApplicationController rescue_from StandardError do |exception| log_exception(exception) - render_error("Internal server error") + if Rails.env.test? || Rails.env.development? + render_error("Internal server error: #{exception.message}") + else + render_error("Internal server error") + end end rescue_from Gitlab::Graphql::Variables::Invalid do |exception| |