diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-01 17:34:31 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-01 22:19:47 -0300 |
| commit | fbd1e98cf983572ca9884f17f933ffe92833632a (patch) | |
| tree | fd569888ce2e9f4cd09e1676d47868bd64e7613c /railties/lib | |
| parent | 14996a1490baefb34d64c68403c1b5bcf3773736 (diff) | |
| download | rails-fbd1e98cf983572ca9884f17f933ffe92833632a.tar.gz rails-fbd1e98cf983572ca9884f17f933ffe92833632a.tar.bz2 rails-fbd1e98cf983572ca9884f17f933ffe92833632a.zip | |
Do not run `bundle install` when generating a new plugin.
Since bundler 1.12.0, the gemspec is validated so the `bundle install`
command will fail just after the gem is created causing confusion to the
users. This change was a bug fix to correctly validate gemspecs.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/plugin_generator.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 0835c09323..af3c6dead3 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -242,7 +242,7 @@ module Rails ] + dev_edge_common elsif options.edge? [ - GemfileEntry.github('rails', 'rails/rails') + GemfileEntry.github('rails', 'rails/rails', '5-0-stable') ] + dev_edge_common else [GemfileEntry.version('rails', diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index 56efd35a95..7f427947f5 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -258,7 +258,7 @@ task default: :test build(:leftovers) end - public_task :apply_rails_template, :run_bundle + public_task :apply_rails_template def run_after_bundle_callbacks @after_bundle_callbacks.each do |callback| |