diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-12-21 18:53:19 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-12-21 18:53:19 +0300 |
| commit | c9fdf739b220556124085b554a9a4c04e9c694ab (patch) | |
| tree | 85838dcb2de6c58357765990c472b1b20d13701d /lib | |
| parent | 845e2d3667ed697fea49123c9251226b1f7126ac (diff) | |
| parent | 90c6a1a3198ba8090c645d740ac619e01a2e834e (diff) | |
Merge branch '25908-fix-grape-after-update' into 'master'
Use Grape's new Route methods
See merge request !8223
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics/rack_middleware.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/metrics/rack_middleware.rb b/lib/gitlab/metrics/rack_middleware.rb index 01c96a6fe96..91fb0bb317a 100644 --- a/lib/gitlab/metrics/rack_middleware.rb +++ b/lib/gitlab/metrics/rack_middleware.rb @@ -70,8 +70,8 @@ module Gitlab def tag_endpoint(trans, env) endpoint = env[ENDPOINT_KEY] - path = endpoint_paths_cache[endpoint.route.route_method][endpoint.route.route_path] - trans.action = "Grape##{endpoint.route.route_method} #{path}" + path = endpoint_paths_cache[endpoint.route.request_method][endpoint.route.path] + trans.action = "Grape##{endpoint.route.request_method} #{path}" end private |