summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-06-07 08:28:17 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-06-07 08:28:17 +0000
commit29cfa7bf6c76290647f56111232c1597f6850201 (patch)
tree670042f444752df121c011059a2ad5e6ff4183eb
parent543459794a96c19e832ccfb6bb855cb60a84247f (diff)
parentdde7b97d0b2e562bf8e02e5dcf9e9b71fb601f79 (diff)
downloadgitlab-ce-29cfa7bf6c76290647f56111232c1597f6850201.tar.gz
Merge branch 'sh-bump-grape-path-helpers' into 'master'
Bump grape-path-helpers to solve a bug in GrapePathHelpers::NamedRouteMatcher See merge request gitlab-org/gitlab-ce!19506
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 20fe5daa58e..ff9e81bdc9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -360,7 +360,7 @@ GEM
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
- grape-path-helpers (1.0.2)
+ grape-path-helpers (1.0.4)
activesupport (~> 4)
grape (~> 1.0)
rake (~> 12)