From c68bbdc82064c1ca548cc6faf80b0a9501928b11 Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Fri, 8 Jun 2018 23:44:05 +0000
Subject: [PATCH] Bump grape-path-helpers to 1.0.5
---
Gemfile.lock | 4 ++--
Gemfile.rails5.lock | 12 +++++++-----
...ackst0ne-bump-grape-path-helpers-gem-to-1-0-5.yml | 5 +++++
3 files changed, 14 insertions(+), 7 deletions(-)
create mode 100644 changelogs/unreleased/blackst0ne-bump-grape-path-helpers-gem-to-1-0-5.yml
diff --git a/Gemfile.lock b/Gemfile.lock
index 0ce0312e743b2..0a4dbdc058196 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -360,8 +360,8 @@ GEM
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
- grape-path-helpers (1.0.4)
- activesupport (~> 4)
+ grape-path-helpers (1.0.5)
+ activesupport (>= 4, < 5.1)
grape (~> 1.0)
rake (~> 12)
grape_logging (1.7.0)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index d9a89de32cb15..efb4dfd263a58 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -286,7 +286,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (0.100.0)
+ gitaly-proto (0.101.0)
google-protobuf (~> 3.1)
grpc (~> 1.10)
github-linguist (5.3.3)
@@ -363,10 +363,10 @@ GEM
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
- grape-path-helpers (1.0.0)
- activesupport
+ grape-path-helpers (1.0.5)
+ activesupport (>= 4, < 5.1)
grape (~> 1.0)
- rake
+ rake (~> 12)
grape_logging (1.7.0)
grape
graphiql-rails (1.4.10)
@@ -501,6 +501,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.0)
+ mini_magick (4.8.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.7.0)
@@ -1048,7 +1049,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 0.100.0)
+ gitaly-proto (~> 0.101.0)
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2)
@@ -1091,6 +1092,7 @@ DEPENDENCIES
loofah (~> 2.2)
mail_room (~> 0.9.1)
method_source (~> 0.8)
+ mini_magick
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
mysql2 (~> 0.4.10)
diff --git a/changelogs/unreleased/blackst0ne-bump-grape-path-helpers-gem-to-1-0-5.yml b/changelogs/unreleased/blackst0ne-bump-grape-path-helpers-gem-to-1-0-5.yml
new file mode 100644
index 0000000000000..9d975ff81bf54
--- /dev/null
+++ b/changelogs/unreleased/blackst0ne-bump-grape-path-helpers-gem-to-1-0-5.yml
@@ -0,0 +1,5 @@
+---
+title: Bump grape-path-helpers to 1.0.5
+merge_request: 19604
+author: "@blackst0ne"
+type: other
--
GitLab