diff options
| author | Yves Senn <yves.senn@gmail.com> | 2016-07-21 09:54:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 09:54:28 +0200 |
| commit | 0800e5dcad571c00c8c33e886c50529001d0badc (patch) | |
| tree | 106d104327b0ea2195047ed617c9b5106e3bd9ab | |
| parent | cf5bc0dd5359e61dcb93e719279c7198e68a0eb8 (diff) | |
| parent | e072db77378cad43e720482d0d31297ebb7602c6 (diff) | |
| download | rails-0800e5dcad571c00c8c33e886c50529001d0badc.tar.gz rails-0800e5dcad571c00c8c33e886c50529001d0badc.tar.bz2 rails-0800e5dcad571c00c8c33e886c50529001d0badc.zip | |
Merge pull request #25907 from gsamokovarov/lock-web-console-for-5.0
Enforce minimal web-console version for Rails 5
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 86143ca1f1..7af5fcd3c1 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -35,7 +35,7 @@ group :development do <%- if options.dev? || options.edge? -%> gem 'web-console', github: 'rails/web-console' <%- else -%> - gem 'web-console' + gem 'web-console', '>= 3.3.0' <%- end -%> <%- end -%> <% if depend_on_listen? -%> diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 50751368c8..b968f9f207 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -574,7 +574,7 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "Gemfile" do |content| assert_match(/gem 'web-console',\s+github: 'rails\/web-console'/, content) - assert_no_match(/\Agem 'web-console'\z/, content) + assert_no_match(/\Agem 'web-console', '>= 3.3.0'\z/, content) end end @@ -583,7 +583,7 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "Gemfile" do |content| assert_match(/gem 'web-console',\s+github: 'rails\/web-console'/, content) - assert_no_match(/\Agem 'web-console'\z/, content) + assert_no_match(/\Agem 'web-console', '>= 3.3.0'\z/, content) end end |