aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails/controller/templates/controller.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-07-31 16:21:07 -0300
committerEmilio Tagua <miloops@gmail.com>2009-07-31 16:21:07 -0300
commit3de59e916d6a3d4eab202cf0c99b1f88905a3b43 (patch)
treedef6d6a808ebe187be1f37f8a739fd786cc11f02 /railties/lib/generators/rails/controller/templates/controller.rb
parentc1cbf02e3170f1004daf4a146cbc41176c2458d3 (diff)
parent62fd1d3716b4b5fd1d91cdcc77003efe80fc5a7e (diff)
downloadrails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.gz
rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.tar.bz2
rails-3de59e916d6a3d4eab202cf0c99b1f88905a3b43.zip
Merge commit 'rails/master'
Conflicts: activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/lib/generators/rails/controller/templates/controller.rb')
-rw-r--r--railties/lib/generators/rails/controller/templates/controller.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/railties/lib/generators/rails/controller/templates/controller.rb b/railties/lib/generators/rails/controller/templates/controller.rb
new file mode 100644
index 0000000000..cda2659e69
--- /dev/null
+++ b/railties/lib/generators/rails/controller/templates/controller.rb
@@ -0,0 +1,7 @@
+class <%= class_name %>Controller < ApplicationController
+<% for action in actions -%>
+ def <%= action %>
+ end
+
+<% end -%>
+end