aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2016-10-03 09:11:08 -0400
committerGitHub <noreply@github.com>2016-10-03 09:11:08 -0400
commit60cc5064756c3d804596a1498a1d5196321342af (patch)
tree938c484ff05f7e5030df42e18b4d92a2b91b9214 /railties/lib/rails
parent8058ece4feea7fb8feed1d0cfc44c6065c773127 (diff)
parentddddedc487912e33edb7d78aec6bcf99b1312c6d (diff)
downloadrails-60cc5064756c3d804596a1498a1d5196321342af.tar.gz
rails-60cc5064756c3d804596a1498a1d5196321342af.tar.bz2
rails-60cc5064756c3d804596a1498a1d5196321342af.zip
Merge pull request #26695 from MentalPower/master
Allow the use of listen's 3.1.x branch.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile2
1 files changed, 1 insertions, 1 deletions
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