1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Use a form of rb-inotify to fix broken tests with Ruby 2.2.5

See https://github.com/nex3/rb-inotify/pull/49
This commit is contained in:
Rafael Mendonça França 2016-07-27 23:36:24 -03:00
parent e54e4eca34
commit 8656678830
No known key found for this signature in database
GPG key ID: FC23B6D0F1EEE948
2 changed files with 12 additions and 2 deletions

View file

@ -27,6 +27,9 @@ gem 'uglifier', '>= 1.3.0', require: false
# Track stable branch of sass because it doesn't have circular require warnings. # Track stable branch of sass because it doesn't have circular require warnings.
gem 'sass', github: 'sass/sass', branch: 'stable', require: false 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 group :doc do
gem 'sdoc', '~> 0.4.0' gem 'sdoc', '~> 0.4.0'
gem 'redcarpet', '~> 3.2.3', platforms: :ruby gem 'redcarpet', '~> 3.2.3', platforms: :ruby

View file

@ -6,6 +6,14 @@ GIT
queue_classic (3.2.0.RC1) queue_classic (3.2.0.RC1)
pg (>= 0.17, < 0.19) 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 GIT
remote: git://github.com/sass/sass.git remote: git://github.com/sass/sass.git
revision: 7716e67f3507c6f65878c69aa49ec358ebf675c7 revision: 7716e67f3507c6f65878c69aa49ec358ebf675c7
@ -224,8 +232,6 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (11.2.2) rake (11.2.2)
rb-fsevent (0.9.7) rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdoc (4.2.2) rdoc (4.2.2)
json (~> 1.4) json (~> 1.4)
redcarpet (3.2.3) redcarpet (3.2.3)
@ -349,6 +355,7 @@ DEPENDENCIES
rack-cache (~> 1.2) rack-cache (~> 1.2)
rails! rails!
rake (>= 11.1) rake (>= 11.1)
rb-inotify!
redcarpet (~> 3.2.3) redcarpet (~> 3.2.3)
redis redis
resque (< 1.26) resque (< 1.26)