aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-15 13:33:44 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-15 13:33:44 -0200
commit4914adc2b0f0c6338f0763e364db02dcf7d49255 (patch)
tree46162d3ff475c2bbedb12048c460f737bcd02f79 /railties
parent5f295aebdbb15e2000cef5c9b8a2e28c5cc3db1b (diff)
parent5f07366bed77116dbfbb5b98d1cdf6c61b3dfc9b (diff)
downloadrails-4914adc2b0f0c6338f0763e364db02dcf7d49255.tar.gz
rails-4914adc2b0f0c6338f0763e364db02dcf7d49255.tar.bz2
rails-4914adc2b0f0c6338f0763e364db02dcf7d49255.zip
Merge pull request #14069 from arunagw/aa-plugin-generator-build-fix
Revert "Fixed plugin_generator test" As this commit 22a1a5ac8c4631f29cfeac451c361e8da1dd2261 has reverted all changes so this plugin generator also needs to fix.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/plugin/plugin_generator.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index dbe1e37d8e..f6f529b80a 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -185,7 +185,6 @@ task default: :test
end
public_task :set_default_accessors!
- public_task :apply_rails_template
public_task :create_root
def create_root_files
@@ -242,6 +241,7 @@ task default: :test
build(:leftovers)
end
+ public_task :apply_rails_template, :run_bundle
def name
@name ||= begin
@@ -255,9 +255,6 @@ task default: :test
end
end
- public_task :run_bundle
- public_task :replay_template
-
protected
def app_templates_dir