summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-09-10 23:46:16 +0000
committerJarka Kadlecova <jarka@gitlab.com>2017-09-12 12:52:44 +0200
commit39a3ba5c0eb6108ee8042e235efb83f956b1bb1a (patch)
treea60a970978212021b2a55710dc32a5339f5bf32c
parent564893d0c528ceeb0b371bbb742922133f19a60e (diff)
downloadgitlab-ce-39a3ba5c0eb6108ee8042e235efb83f956b1bb1a.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--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index a022319ae2c..cc6618d3557 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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