diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-12 22:24:25 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-12 22:24:25 +0000 |
| commit | 924146a8d6b158fda1f9cddbdcd8ce957b6baec9 (patch) | |
| tree | abca00c69135f230956a01a70136d327144216df | |
| parent | 226d4d0eaa09a035ccb4cd8e83f92ffd9af9b40c (diff) | |
| parent | a412826b5da119a404ecd00d7498bba1d6f2f5ad (diff) | |
| download | gitlab-ce-924146a8d6b158fda1f9cddbdcd8ce957b6baec9.tar.gz | |
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
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/winh-upgrade-grape-path-helpers.yml | 5 |
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 |