summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-10-03 18:46:33 +0000
committerRobert Speicher <robert@gitlab.com>2018-10-03 18:46:33 +0000
commit8a8ae2f57fe0db9b33f100e9a68c9eac4fd71c4d (patch)
tree2dd0fe1932b06e5c5e99867bb80f74c340bdadb9 /Gemfile.lock
parent401b847a1b9c100cb0dde938ac65ce18b738fa7d (diff)
parente631c252fa5f83e7bfc100da1dd5562ff1111b07 (diff)
downloadgitlab-ce-8a8ae2f57fe0db9b33f100e9a68c9eac4fd71c4d.tar.gz
Merge branch 'update-dev-test-gems' into 'master'
Update Development related gems See merge request gitlab-org/gitlab-ce!22066
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock20
1 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 30c666932d1..301f4132476 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
bindata (2.4.3)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootsnap (1.3.1)
+ bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
@@ -140,7 +140,7 @@ GEM
creole (0.5.0)
css_parser (1.5.0)
addressable
- daemons (1.2.3)
+ daemons (1.2.6)
database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
@@ -187,7 +187,7 @@ GEM
escape_utils (1.1.1)
et-orbi (1.0.3)
tzinfo
- eventmachine (1.0.8)
+ eventmachine (1.2.7)
excon (0.62.0)
execjs (2.6.0)
expression_parser (0.9.0)
@@ -488,7 +488,7 @@ GEM
mime-types-data (3.2016.0521)
mimemagic (0.3.0)
mini_magick (4.8.0)
- mini_mime (1.0.0)
+ mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.7.0)
mousetrap-rails (1.4.6)
@@ -624,9 +624,9 @@ GEM
pry-byebug (3.4.3)
byebug (>= 9.0, < 9.1)
pry (~> 0.10)
- pry-rails (0.3.5)
- pry (>= 0.9.10)
- public_suffix (3.0.2)
+ pry-rails (0.3.6)
+ pry (>= 0.10.4)
+ public_suffix (3.0.3)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.10)
rack-accept (0.4.5)
@@ -853,7 +853,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slack-notifier (1.5.1)
- spring (2.0.1)
+ spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
@@ -883,7 +883,7 @@ GEM
test_after_commit (1.1.0)
activerecord (>= 3.2)
text (1.3.1)
- thin (1.7.0)
+ thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
@@ -942,7 +942,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
- webpack-rails (0.9.10)
+ webpack-rails (0.9.11)
railties (>= 3.2.0)
wikicloth (0.8.1)
builder