summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-03-01 22:44:01 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-03-01 22:44:01 +0000
commit5c9aa45489aee7cd1edaa15a30fb8a3aa24417a8 (patch)
treec48821da19f721fb29b2cb9233fc1aa68eb16835
parent4dbf7d66a4f2478861aaee134017d9d74d64d955 (diff)
parent97e761a53e36fa6da8f5cf7a59ea8afd837aceb1 (diff)
downloadgitlab-ce-5c9aa45489aee7cd1edaa15a30fb8a3aa24417a8.tar.gz
Merge branch 'sh-bump-bootsnap-1.4.1' into 'master'
Bump Bootsnap to 1.4.1 See merge request gitlab-org/gitlab-ce!25701
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 0178ca9f352..11fdff8a094 100644
--- a/Gemfile
+++ b/Gemfile
@@ -325,7 +325,7 @@ group :development do
end
group :development, :test do
- gem 'bootsnap', '~> 1.3'
+ gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 74a06581da2..452546b547d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
binding_ninja (0.2.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
- bootsnap (1.3.2)
+ bootsnap (1.4.1)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
@@ -966,7 +966,7 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
- bootsnap (~> 1.3)
+ bootsnap (~> 1.4)
bootstrap_form (~> 2.7.0)
brakeman (~> 4.2)
browser (~> 2.5)