aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-12-13 20:34:46 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2015-12-13 20:34:46 +0100
commit8404aa2a72a1aa03b6177d00c21612f09f23b8c8 (patch)
treea60b06eb7028e32e9560c099b81d167716905585 /railties
parentd8f993fa7da3483933284e7d89adf326ce24ddb6 (diff)
parent3ba44275f69b2de4ebeb4a1028338505e70b3a59 (diff)
downloadrails-8404aa2a72a1aa03b6177d00c21612f09f23b8c8.tar.gz
rails-8404aa2a72a1aa03b6177d00c21612f09f23b8c8.tar.bz2
rails-8404aa2a72a1aa03b6177d00c21612f09f23b8c8.zip
Merge pull request #22573 from gsamokovarov/web-console-3-0
Update web-console to 3.0.0
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile2
-rw-r--r--railties/test/generators/app_generator_test.rb4
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 975be07622..2f7ffc055d 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -41,7 +41,7 @@ group :development do
<%- if options.dev? || options.edge? -%>
gem 'web-console', github: 'rails/web-console'
<%- else -%>
- gem 'web-console', '~> 2.0'
+ gem 'web-console', '~> 3.0'
<%- end -%>
<%- end -%>
<% if spring_install? -%>
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 446fef562b..dd2e931c5c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -505,7 +505,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(/gem 'web-console', '~> 2.0'/, content)
+ assert_no_match(/gem 'web-console', '~> 3.0'/, content)
end
end
@@ -514,7 +514,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(/gem 'web-console', '~> 2.0'/, content)
+ assert_no_match(/gem 'web-console', '~> 3.0'/, content)
end
end