diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-10 23:46:16 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-09-10 23:46:16 +0000 |
| commit | ce14fae5d43247a838debeb5dda7871845d127c8 (patch) | |
| tree | 6acdd2ed6164d8c5393fbd374d5fe309774f392f | |
| parent | 5d952f756bcf0355fc5d86d819dfc6913c0ae351 (diff) | |
| parent | 962e5bd95797249ecf83983f82ee0cfb2f97b355 (diff) | |
| download | gitlab-ce-ce14fae5d43247a838debeb5dda7871845d127c8.tar.gz | |
Merge branch 'sh-bump-grape-logging-for-status-codes' into 'master'
Bump grape_logging gem to 1.7.0 to get status codes for error messages
See merge request !14175
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -407,4 +407,4 @@ gem 'flipper-active_record', '~> 0.10.2' # Structured logging gem 'lograge', '~> 0.5' -gem 'grape_logging', '~> 1.6' +gem 'grape_logging', '~> 1.7' diff --git a/Gemfile.lock b/Gemfile.lock index d7e1c7581d5..bcbe6b4f394 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -355,7 +355,7 @@ GEM activesupport grape (>= 0.16.0) rake - grape_logging (1.6.0) + grape_logging (1.7.0) grape grpc (1.4.5) google-protobuf (~> 3.1) @@ -1037,7 +1037,7 @@ DEPENDENCIES grape (~> 1.0) grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) - grape_logging (~> 1.6) + grape_logging (~> 1.7) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes |