diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-12-21 18:53:19 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-21 18:59:05 +0300 |
| commit | c2786c97965afa145ac9418459dc4a41ffea5bb0 (patch) | |
| tree | f10392f23116797f45f280cbb6e4bd7e20a37aec /lib | |
| parent | fac8ce635a066523b22388532eab5f80b355ad9d (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 |