diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-06-02 12:24:31 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-06-02 12:24:31 -0400 |
| commit | 62d316c6d88595940d6da08b3e6c97f9ca2aec1d (patch) | |
| tree | 49ae0076ff12a85d588857ef2864dbf1dd09cc81 /Gemfile.lock | |
| parent | feefa9fc9803780713f61c6eded0785e3844a681 (diff) | |
| parent | f7388635f246b97a1aa0be54579339c6659fb865 (diff) | |
| download | rails-62d316c6d88595940d6da08b3e6c97f9ca2aec1d.tar.gz rails-62d316c6d88595940d6da08b3e6c97f9ca2aec1d.tar.bz2 rails-62d316c6d88595940d6da08b3e6c97f9ca2aec1d.zip | |
Merge branch 'master' into unlock-minitest
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4c2c3e8695..13b44b6bc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,7 +209,6 @@ GEM nokogiri (>= 1.5.9) mail (2.6.5) mime-types (>= 1.16, < 4) - mathn (0.1.0) metaclass (0.0.4) method_source (0.8.2) mime-types (3.1) @@ -289,7 +288,7 @@ GEM redis (~> 3.3) resque (~> 1.26) rufus-scheduler (~> 3.2) - rubocop (0.49.0) + rubocop (0.49.1) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) @@ -406,7 +405,6 @@ DEPENDENCIES kindlerb (~> 1.2.0) libxml-ruby listen (>= 3.0.5, < 3.2) - mathn minitest-bisect mocha (~> 0.14) mysql2 (>= 0.4.4) |