Automatic merge of gitlab-org/gitlab master

Gemfile

@@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.4.0'
 gem 'pg', '~> 1.1'
 
 gem 'rugged', '~> 1.1'
-gem 'grape-path-helpers', '~> 1.6.3'
+gem 'grape-path-helpers', '~> 1.7.0'
 
 gem 'faraday', '~> 1.0'
 gem 'marginalia', '~> 1.10.0'

Gemfile.lock

@@ -546,7 +546,7 @@ GEM
     grape-entity (0.9.0)
       activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
-    grape-path-helpers (1.6.3)
+    grape-path-helpers (1.7.0)
       activesupport
       grape (~> 1.3)
       rake (> 12)
@@ -1493,7 +1493,7 @@ DEPENDENCIES
   gpgme (~> 2.0.19)
   grape (~> 1.5.2)
   grape-entity (~> 0.9.0)
-  grape-path-helpers (~> 1.6.3)
+  grape-path-helpers (~> 1.7.0)
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
   graphlient (~> 0.4.0)