Merge pull request #29488 from utilum/update_gemfile

Fixes FIXME: rb-inotify 0.99 has been released

Gemfile

@@ -31,9 +31,6 @@ 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
-
 # Explicitly avoid 1.x that doesn't support Ruby 2.4+
 gem "json", ">= 2.0.0"
 

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
@@ -259,6 +251,8 @@ GEM
     rainbow (2.2.1)
     rake (12.0.0)
     rb-fsevent (0.9.8)
+    rb-inotify (0.9.9)
+      ffi (~> 1.0)
     rdoc (5.0.0)
     redcarpet (3.2.3)
     redis (3.3.2)
@@ -404,7 +398,6 @@ DEPENDENCIES
   rack-cache (~> 1.2)
   rails!
   rake (>= 11.1)
-  rb-inotify!
   redcarpet (~> 3.2.3)
   redis
   resque