diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-08-06 15:07:18 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-08-06 15:07:18 +1000 |
| commit | fc77b9df8b6a49c86e9c1eb949f1b1162470d2ee (patch) | |
| tree | 96aad0a31543fa520626dc1c5efabff1367a0bab /app/controllers/graphql_controller.rb | |
| parent | 9c71bf3e6df2dcb20ea19df21a127823bbe5e615 (diff) | |
| parent | fa216b0e86433192ba4e39a05f42217fb4685173 (diff) | |
| download | gitlab-ce-fc77b9df8b6a49c86e9c1eb949f1b1162470d2ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into alerts-dropdown-to-modal-part-2-cealerts-dropdown-to-modal-part-2-ce
Diffstat (limited to 'app/controllers/graphql_controller.rb')
| -rw-r--r-- | app/controllers/graphql_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb index 9fbbe373b0d..72d40f709e6 100644 --- a/app/controllers/graphql_controller.rb +++ b/app/controllers/graphql_controller.rb @@ -30,6 +30,10 @@ class GraphqlController < ApplicationController render_error(exception.message, status: :unprocessable_entity) end + rescue_from Gitlab::Graphql::Errors::ArgumentError do |exception| + render_error(exception.message, status: :unprocessable_entity) + end + private def execute_multiplex |