diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-02 09:52:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-02 09:52:14 -0500 |
commit | c6974229d018b73f70e38ca8c8862473870d0274 (patch) | |
tree | 51a95d540eeece7a77c44166caa1ebf120027eba /Gemfile.lock | |
parent | 4c3c4182a7bde6a736c0b489276da9f77fc430f2 (diff) | |
parent | 869cb93de12141425b73f43e93f6e3730147b0ed (diff) | |
download | rails-c6974229d018b73f70e38ca8c8862473870d0274.tar.gz rails-c6974229d018b73f70e38ca8c8862473870d0274.tar.bz2 rails-c6974229d018b73f70e38ca8c8862473870d0274.zip |
Merge branch 'master' into active-storage-import
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b00534675a..76a5af6fbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -301,7 +301,12 @@ GEM mime-types-data (3.2016.0521) mini_magick (4.8.0) mini_portile2 (2.2.0) - minitest (5.3.3) + minitest (5.10.2) + minitest-bisect (1.4.0) + minitest-server (~> 1.0) + path_expander (~> 1.0) + minitest-server (1.0.4) + minitest (~> 5.0) mocha (0.14.0) metaclass (~> 0.0.1) mono_logger (1.1.0) @@ -326,6 +331,7 @@ GEM parallel (1.11.2) parser (2.4.0.0) ast (~> 2.2) + path_expander (1.0.1) pg (0.19.0) pg (0.19.0-x64-mingw32) pg (0.19.0-x86-mingw32) @@ -507,6 +513,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) mini_magick minitest (< 5.3.4) + minitest-bisect mocha (~> 0.14) mysql2 (>= 0.4.4) nokogiri (>= 1.6.8) |