summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-07-12 23:45:44 +0200
committerWinnie Hellmann <winnie@gitlab.com>2018-07-12 23:47:34 +0200
commita412826b5da119a404ecd00d7498bba1d6f2f5ad (patch)
treeb9ea7c7efa24c3895c7f13c72069b5da3f176d1d
parent0399b644ec7c8f473fdf67bb295999f76e1f389c (diff)
downloadgitlab-ce-a412826b5da119a404ecd00d7498bba1d6f2f5ad.tar.gz
Upgrade grape-path-helpers to 1.0.6
-rw-r--r--Gemfile.lock2
-rw-r--r--changelogs/unreleased/winh-upgrade-grape-path-helpers.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b8a777ceb4..7f9207d9dfe 100644
--- 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)
diff --git a/changelogs/unreleased/winh-upgrade-grape-path-helpers.yml b/changelogs/unreleased/winh-upgrade-grape-path-helpers.yml
new file mode 100644
index 00000000000..62addff1d0f
--- /dev/null
+++ b/changelogs/unreleased/winh-upgrade-grape-path-helpers.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade grape-path-helpers to 1.0.6
+merge_request: 20601
+author:
+type: other