From 8656678830f2811cd2fc8201d9ba2c35bfa820f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 27 Jul 2016 23:36:24 -0300
Subject: [PATCH] Use a form of rb-inotify to fix broken tests with Ruby 2.2.5

See https://github.com/nex3/rb-inotify/pull/49
---
 Gemfile      |  3 +++
 Gemfile.lock | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3639ed2a91..64cfa420fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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 17f2fdf0e4..d77a05d051 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,14 @@ GIT
     queue_classic (3.2.0.RC1)
       pg (>= 0.17, < 0.19)
 
+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/sass/sass.git
   revision: 7716e67f3507c6f65878c69aa49ec358ebf675c7
@@ -224,8 +232,6 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (11.2.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)
@@ -349,6 +355,7 @@ DEPENDENCIES
   rack-cache (~> 1.2)
   rails!
   rake (>= 11.1)
+  rb-inotify!
   redcarpet (~> 3.2.3)
   redis
   resque (< 1.26)