diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-06-18 05:13:38 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2017-06-18 05:23:53 +0930 |
| commit | 67a579419b275c4c982b02d9b6380cf4cbdaba20 (patch) | |
| tree | f92cdc0420646bab3e933288369fd38902a6ff71 | |
| parent | d904d46c2ddc6daaca732ec57470cd29100d9f22 (diff) | |
| parent | 96d58433c9a657a30f464c91b69e5ac472f4e6a2 (diff) | |
| download | rails-67a579419b275c4c982b02d9b6380cf4cbdaba20.tar.gz rails-67a579419b275c4c982b02d9b6380cf4cbdaba20.tar.bz2 rails-67a579419b275c4c982b02d9b6380cf4cbdaba20.zip | |
Merge pull request #29488 from utilum/update_gemfile
Fixes FIXME: rb-inotify 0.99 has been released
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 11 |
2 files changed, 2 insertions, 12 deletions
@@ -33,9 +33,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" diff --git a/Gemfile.lock b/Gemfile.lock index 77eaa47cb8..7586cdee56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,14 +7,6 @@ GIT 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 branch: close-race @@ -266,6 +258,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 +407,6 @@ DEPENDENCIES rack-cache (~> 1.2) rails! rake (>= 11.1) - rb-inotify! redcarpet (~> 3.2.3) redis resque |