summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-29 13:14:08 +0200
committerRémy Coutable <remy@rymai.me>2017-09-29 18:57:22 +0200
commit3040b994df0de7b6a6c4159a887fe7c8733bbb4d (patch)
tree44a2083d313206bad2090fdb5fc4f3e4c87b574e /lib
parentc49d19a5dc058a670bdac1e23579fbb44c60bec4 (diff)
downloadgitlab-ce-3040b994df0de7b6a6c4159a887fe7c8733bbb4d.tar.gz
Ensure no exception is raised when Raven tries to get the current user in API context38571-fix-exception-in-raven-report
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib')
-rw-r--r--lib/api/helpers.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 1e8475ba3ec..4964a76bef6 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -464,10 +464,12 @@ module API
header(*Gitlab::Workhorse.send_artifacts_entry(build, entry))
end
- # The Grape Error Middleware only has access to env but no params. We workaround this by
- # defining a method that returns the right value.
+ # The Grape Error Middleware only has access to `env` but not `params` nor
+ # `request`. We workaround this by defining methods that returns the right
+ # values.
def define_params_for_grape_middleware
- self.define_singleton_method(:params) { Rack::Request.new(env).params.symbolize_keys }
+ self.define_singleton_method(:request) { Rack::Request.new(env) }
+ self.define_singleton_method(:params) { request.params.symbolize_keys }
end
# We could get a Grape or a standard Ruby exception. We should only report anything that