Commit 29cfa7bf authored by Sean McGivern's avatar Sean McGivern

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
parents 54345979 dde7b97d
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment