From 96d58433c9a657a30f464c91b69e5ac472f4e6a2 Mon Sep 17 00:00:00 2001
From: utilum <oz@utilum.com>
Date: Sat, 17 Jun 2017 18:59:41 +0200
Subject: Fixes FIXME: rb-inotify 0.99 has been released

---
 Gemfile      |  3 +--
 Gemfile.lock | 14 +++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2a1b9fa7ef..9023eaca35 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,8 +33,7 @@ gem "bcrypt", "~> 3.1.11", require: false
 # sprockets.
 gem "uglifier", ">= 1.3.0", require: false
 
-# FIXME: Pending rb-inotify 0.9.9 release
-gem "rb-inotify", github: "guard/rb-inotify", branch: "master", require: false
+gem "rb-inotify", require: false
 
 # Explicitly avoid 1.x that doesn't support Ruby 2.4+
 gem "json", ">= 2.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 77eaa47cb8..d1b1ff9ac2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,14 +6,6 @@ GIT
     queue_classic (3.2.0.RC1)
       pg (>= 0.17, < 0.20)
 
-GIT
-  remote: https://github.com/guard/rb-inotify.git
-  revision: 7e3c714a09ae2b38d2620835e794150d8857cd49
-  branch: master
-  specs:
-    rb-inotify (0.9.9)
-      ffi (~> 1.0)
-
 GIT
   remote: https://github.com/matthewd/websocket-client-simple.git
   revision: e161305f1a466b9398d86df3b1731b03362da91b
@@ -185,8 +177,6 @@ GEM
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.9.17)
-    ffi (1.9.17-x64-mingw32)
-    ffi (1.9.17-x86-mingw32)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
     hiredis (0.6.1)
@@ -266,6 +256,8 @@ GEM
       rake
     rake (12.0.0)
     rb-fsevent (0.9.8)
+    rb-inotify (0.9.9)
+      ffi (~> 1.0)
     rdoc (5.1.0)
     redcarpet (3.2.3)
     redis (3.3.3)
@@ -413,7 +405,7 @@ DEPENDENCIES
   rack-cache (~> 1.2)
   rails!
   rake (>= 11.1)
-  rb-inotify!
+  rb-inotify
   redcarpet (~> 3.2.3)
   redis
   resque
-- 
cgit v1.2.3