diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-30 02:57:46 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-30 03:15:03 -0700 |
| commit | 990af4fb5dcc08894578cc7d1dd24176c1cbcef2 (patch) | |
| tree | 20fba8c1147ea8c4a4c781daffe5d6773af33372 /Gemfile.lock | |
| parent | 5b1416aa74c4fa80e0c324fd2907166af5ca479b (diff) | |
| download | gitlab-ce-990af4fb5dcc08894578cc7d1dd24176c1cbcef2.tar.gz | |
Replace grape-route-helpers with our own grape-path-helpers
This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes:
1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21
2. Fixes some broken specs and code for Grape 1.0+
3. Optimizes the generation of paths by bringing in @dblessing's
HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793
Closes #45718
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 915e1c530fb..3aea70577ff 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) |