Merge pull request #4057 from joliss/gitignore

Add db/*.sqlite3-journal to .gitignore
rails · Dec 20, 2011 · df28b80 · df28b80
2 parents 6a6fc4e + 22cb97b
commit df28b80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -9,6 +9,7 @@
 
 # Ignore the default SQLite database.
 /db/*.sqlite3
+/db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
 /log/*.log

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
@@ -2,6 +2,7 @@
 log/*.log
 pkg/
 <%= dummy_path %>/db/*.sqlite3
+<%= dummy_path %>/db/*.sqlite3-journal
 <%= dummy_path %>/log/*.log
 <%= dummy_path %>/tmp/
 <%= dummy_path %>/.sass-cache