diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-05-30 14:09:38 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-05-30 14:09:38 +0000 |
| commit | 2c977029feb756955235f16a06e46d20adb1f557 (patch) | |
| tree | 7c7990bfcb52969eb35ee88ac8ccf456d151a0ca /Gemfile.lock | |
| parent | c53da5e9197df5fa9712fdee679da7f1b3c3224c (diff) | |
| parent | 990af4fb5dcc08894578cc7d1dd24176c1cbcef2 (diff) | |
| download | gitlab-ce-2c977029feb756955235f16a06e46d20adb1f557.tar.gz | |
Merge branch 'sh-use-grape-path-helpers' into 'master'
Replace grape-route-helpers with our own grape-path-helpers
Closes #45718
See merge request gitlab-org/gitlab-ce!19240
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8ae183188cc..471deae7e25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -348,7 +348,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.2) + grape (1.0.3) activesupport builder mustermann-grape (~> 1.0.0) @@ -358,10 +358,10 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-route-helpers (2.1.0) - activesupport - grape (>= 0.16.0) - rake + grape-path-helpers (1.0.1) + activesupport (~> 4) + grape (~> 1.0) + rake (~> 12) grape_logging (1.7.0) grape grpc (1.11.0) @@ -1049,7 +1049,7 @@ DEPENDENCIES gpgme grape (~> 1.0) grape-entity (~> 0.7.1) - grape-route-helpers (~> 2.1.0) + grape-path-helpers (~> 1.0) grape_logging (~> 1.7) grpc (~> 1.11.0) haml_lint (~> 0.26.0) |