diff options
author | Esteban Santana Santana <sesteban@amazon.com> | 2016-10-03 16:58:17 +0530 |
---|---|---|
committer | Esteban Santana Santana <sesteban@amazon.com> | 2016-10-03 16:58:17 +0530 |
commit | ddddedc487912e33edb7d78aec6bcf99b1312c6d (patch) | |
tree | 938c484ff05f7e5030df42e18b4d92a2b91b9214 /railties | |
parent | 8058ece4feea7fb8feed1d0cfc44c6065c773127 (diff) | |
download | rails-ddddedc487912e33edb7d78aec6bcf99b1312c6d.tar.gz rails-ddddedc487912e33edb7d78aec6bcf99b1312c6d.tar.bz2 rails-ddddedc487912e33edb7d78aec6bcf99b1312c6d.zip |
Allow the use of listen's 3.1.x branch.
When the initial evented monitor feature was written, the latest version of listen
was the 3.0.x series. Since then the listen project has moved on to the 3.1.x series.
This patch allows the use of the new versions.
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index b03c87e9ba..b488e4ed8e 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +* Allow the use of listen's 3.1.x branch + + *Esteban Santana Santana* + * Run `Minitest.after_run` hooks when running `rails test`. *Michael Grosser* diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 7af5fcd3c1..422217286c 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -39,7 +39,7 @@ group :development do <%- end -%> <%- end -%> <% if depend_on_listen? -%> - gem 'listen', '~> 3.0.5' + gem 'listen', '>= 3.0.5', '< 3.2' <% end -%> <% if spring_install? -%> # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring |