Merge branch 'winh-upgrade-grape-path-helpers' into 'master'

Upgrade grape-path-helpers to 1.0.6 See merge request gitlab-org/gitlab-ce!20601

Merge branch 'winh-upgrade-grape-path-helpers' into 'master'
Upgrade grape-path-helpers to 1.0.6 See merge request gitlab-org/gitlab-ce!20601
924146a8 · Stan Hu · 226d4d0e · a412826b · 924146a8 · 924146a8
Commit 924146a8 authored Jul 12, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/winh-upgrade-grape-path-helpers.yml changelogs/unreleased/winh-upgrade-grape-path-helpers.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -359,7 +359,7 @@ GEM
    grape-entity (0.7.1)
      activesupport (>= 4.0)
      multi_json (>= 1.3.2)
-    grape-path-helpers (1.0.5)
+    grape-path-helpers (1.0.6)
      activesupport (>= 4, < 5.1)
      grape (~> 1.0)
      rake (~> 12)

--- a/changelogs/unreleased/winh-upgrade-grape-path-helpers.yml
+++ b/changelogs/unreleased/winh-upgrade-grape-path-helpers.yml
+---
+title: Upgrade grape-path-helpers to 1.0.6
+merge_request: 20601
+author:
+type: other