diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-11-03 13:20:28 -0800 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-11-03 13:20:28 -0800 |
commit | 876fd5a5d4f424e6699a66058a13c9cda8d92f64 (patch) | |
tree | e2a418cb630c5e99a1d13359e93c4e881d20b722 | |
parent | 2b66f556edfc2a1c4c9bc231b903372984cf8a49 (diff) | |
parent | fae08dd9ca917c09a136d68065a2ea59ae35a6ea (diff) | |
download | rails-876fd5a5d4f424e6699a66058a13c9cda8d92f64.tar.gz rails-876fd5a5d4f424e6699a66058a13c9cda8d92f64.tar.bz2 rails-876fd5a5d4f424e6699a66058a13c9cda8d92f64.zip |
Merge pull request #12750 from arunagw/webconsole-invite-only
Not adding webconsole by default in new apps
-rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/app_base.rb | 6 | ||||
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 8963f6e604..aadf24a125 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -19,10 +19,6 @@ *Ben Pickles* -* Include `web-console` into newly generated applications' Gemfile. - - *Genadi Samokovarov* - * `rails server` will only extend the logger to output to STDOUT in development environment. diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 1a270a6c8c..6448e5eda9 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -109,7 +109,6 @@ module Rails assets_gemfile_entry, javascript_gemfile_entry, jbuilder_gemfile_entry, - webconsole_gemfile_entry, sdoc_gemfile_entry, @extra_entries].flatten.find_all(&@gem_filter) end @@ -261,11 +260,6 @@ module Rails GemfileEntry.version('jbuilder', '~> 1.2', comment) end - def webconsole_gemfile_entry - comment = 'Run `rails console` in the browser. Read more: https://github.com/rails/web-console' - GemfileEntry.new('web-console', nil, comment, group: :development) - end - def sdoc_gemfile_entry comment = 'bundle exec rake doc:rails generates the API under doc/api.' GemfileEntry.new('sdoc', nil, comment, { group: :doc, require: false }) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 39d4acb7b2..cbcfe48f71 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -313,11 +313,6 @@ class AppGeneratorTest < Rails::Generators::TestCase end end - def test_inclusion_of_web_console - run_generator - assert_file "Gemfile", /gem 'web-console', \s+group: :development/ - end - def test_inclusion_of_jbuilder run_generator assert_file "Gemfile", /gem 'jbuilder'/ |