aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/rails
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-03 10:00:38 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-03 10:00:38 -0700
commit1337d51f44496d3279f9daf53961777f50b1910d (patch)
treeac0dc5f9d7a07acd8b1c7019c00befb293239d45 /railties/lib/rails/generators/rails
parent823ff55ffb5750e1ba99c9ec09bf455581aa29a3 (diff)
parent1c5722cdf675fce6c7f69bfb5ca773ce3db8fe19 (diff)
downloadrails-1337d51f44496d3279f9daf53961777f50b1910d.tar.gz
rails-1337d51f44496d3279f9daf53961777f50b1910d.tar.bz2
rails-1337d51f44496d3279f9daf53961777f50b1910d.zip
Merge pull request #6948 from frodsan/plugin_skip_ignore
remove test/dummy from gitignore when "plugin new -T"
Diffstat (limited to 'railties/lib/rails/generators/rails')
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/templates/gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
index 458b2c662e..086d87818a 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
@@ -1,8 +1,10 @@
.bundle/
log/*.log
pkg/
+<% unless options[:skip_test_unit] && options[:dummy_path] == 'test/dummy' -%>
<%= dummy_path %>/db/*.sqlite3
<%= dummy_path %>/db/*.sqlite3-journal
<%= dummy_path %>/log/*.log
<%= dummy_path %>/tmp/
<%= dummy_path %>/.sass-cache
+<% end -%> \ No newline at end of file