diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-27 23:36:24 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-27 23:39:10 -0300 |
| commit | 5859cbddc3a2ee5e97ecf2c8ad26828a5aa19944 (patch) | |
| tree | 0b6b108ffcbf889a1c2d75dff408ed141a332132 | |
| parent | 70ec7feaecab2d3f4dcb84ef2373a80d427aa336 (diff) | |
| download | rails-5859cbddc3a2ee5e97ecf2c8ad26828a5aa19944.tar.gz rails-5859cbddc3a2ee5e97ecf2c8ad26828a5aa19944.tar.bz2 rails-5859cbddc3a2ee5e97ecf2c8ad26828a5aa19944.zip | |
Use a form of rb-inotify to fix broken tests with Ruby 2.2.5
See https://github.com/nex3/rb-inotify/pull/49
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 11 |
2 files changed, 12 insertions, 2 deletions
@@ -27,6 +27,9 @@ gem 'uglifier', '>= 1.3.0', require: false # Track stable branch of sass because it doesn't have circular require warnings. gem 'sass', github: 'sass/sass', branch: 'stable', require: false +# FIXME: Remove this fork after https://github.com/nex3/rb-inotify/pull/49 is fixed. +gem 'rb-inotify', github: 'matthewd/rb-inotify', branch: 'close-handling' + group :doc do gem 'sdoc', '~> 0.4.0' gem 'redcarpet', '~> 3.2.3', platforms: :ruby diff --git a/Gemfile.lock b/Gemfile.lock index 0a3d91ca29..cf8bb0fec9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,6 +22,14 @@ GIT delayed_job (>= 3.0, < 5) GIT + remote: git://github.com/matthewd/rb-inotify.git + revision: 90553518d1fb79aedc98a3036c59bd2b6731ac40 + branch: close-handling + specs: + rb-inotify (0.9.7) + ffi (>= 0.5.0) + +GIT remote: git://github.com/resque/resque.git revision: 06036388ec61e573c761ac5a25a2ef3c76537ec7 specs: @@ -254,8 +262,6 @@ GEM loofah (~> 2.0) rake (11.1.2) rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) rdoc (4.2.2) json (~> 1.4) redcarpet (3.2.3) @@ -381,6 +387,7 @@ DEPENDENCIES rack-cache (~> 1.2) rails! rake (>= 11.1) + rb-inotify! redcarpet (~> 3.2.3) redis resque! |