diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-07 17:39:14 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-07 17:39:14 +0000 |
| commit | 7e19b5bfb6e1e209388fa5464a980aa742fdd8c3 (patch) | |
| tree | 9296679fbbe1ff75eddd47f85dd44dc1dcd55b9c /Gemfile.lock | |
| parent | 66f08aad714b7d43333db1251474a11f1815ec4c (diff) | |
| parent | 35dec2c3e87f2f44c3ab0269e7f737afdc28801a (diff) | |
| download | gitlab-ce-7e19b5bfb6e1e209388fa5464a980aa742fdd8c3.tar.gz | |
Merge branch 'sh-add-grape-logging' into 'master'
Add JSON logger in `log/api_json.log` for Grape API endpoints
Closes #36189
See merge request !14102
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9fbf08d80e2..d7e1c7581d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -355,6 +355,8 @@ GEM activesupport grape (>= 0.16.0) rake + grape_logging (1.6.0) + grape grpc (1.4.5) google-protobuf (~> 3.1) googleauth (~> 0.5.1) @@ -1035,6 +1037,7 @@ DEPENDENCIES grape (~> 1.0) grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) + grape_logging (~> 1.6) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes |