diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-21 10:59:30 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-21 10:59:30 -0300 |
| commit | 9582b3f509c67171b4668b37cf7f2f0736539429 (patch) | |
| tree | f4fedd4fd036da2330b383a70730d471e41cba4b /railties | |
| parent | 36ea89a80c502067bf513b6d16a547411511fae8 (diff) | |
| parent | 8c6f7ca88859bfc67d81fdd1d24f14b1b5ae7e87 (diff) | |
| download | rails-9582b3f509c67171b4668b37cf7f2f0736539429.tar.gz rails-9582b3f509c67171b4668b37cf7f2f0736539429.tar.bz2 rails-9582b3f509c67171b4668b37cf7f2f0736539429.zip | |
Merge pull request #20819 from y-yagi/rails_api_gemfile
remove `web-console` from API app generated Gemfile
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 4 | ||||
| -rw-r--r-- | railties/test/generators/api_app_generator_test.rb | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index b083381255..6a1c2faaab 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -36,13 +36,15 @@ group :development, :test do end group :development do +<%- unless options.api? -%> # Access an IRB console on exception pages or by using <%%= console %> in views <%- if options.dev? || options.edge? -%> gem 'web-console', github: 'rails/web-console' <%- else -%> gem 'web-console', '~> 2.0' <%- end -%> -<%- if spring_install? %> +<%- end -%> +<% if spring_install? -%> # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' <% end -%> diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb index 9978ad0da1..998da3ef84 100644 --- a/railties/test/generators/api_app_generator_test.rb +++ b/railties/test/generators/api_app_generator_test.rb @@ -38,6 +38,7 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase assert_no_match(/gem 'jquery-rails'/, content) assert_no_match(/gem 'sass-rails'/, content) assert_no_match(/gem 'jbuilder'/, content) + assert_no_match(/gem 'web-console'/, content) assert_match(/gem 'active_model_serializers'/, content) end |