diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-12-15 16:45:57 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-12-15 16:46:02 -0300 |
| commit | f8edd2043e864aff0bde9289da550709532268a6 (patch) | |
| tree | de1f0f70d9be602c1dbe1756f07b940bb647b6bb /railties/lib/rails | |
| parent | 8391007b7ca123d26ec9b8581b56d6243c3cb908 (diff) | |
| download | rails-f8edd2043e864aff0bde9289da550709532268a6.tar.gz rails-f8edd2043e864aff0bde9289da550709532268a6.tar.bz2 rails-f8edd2043e864aff0bde9289da550709532268a6.zip | |
Do not default to any Serializer
We will wait until 5.1 to make a decision
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 56c9d3e354..c243b0c60e 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -278,10 +278,8 @@ module Rails end def jbuilder_gemfile_entry - return [] if options[:api] - comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder' - GemfileEntry.version('jbuilder', '~> 2.0', comment) + GemfileEntry.new 'jbuilder', '~> 2.0', comment, {}, options[:api] end def coffee_gemfile_entry diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 2f7ffc055d..4384d9b6eb 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -22,9 +22,6 @@ source 'https://rubygems.org' # gem 'capistrano-rails', group: :development <%- if options.api? -%> -# Use ActiveModelSerializers to serialize JSON responses -gem 'active_model_serializers', '~> 0.10.0.rc2' - # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' |