diff options
| author | Jo Liss <joliss42@gmail.com> | 2011-12-20 16:08:01 +0100 |
|---|---|---|
| committer | Jo Liss <joliss42@gmail.com> | 2011-12-20 16:14:07 +0100 |
| commit | 22cb97ba5c1d02398d94d91bbdcce386fca11770 (patch) | |
| tree | b2911c4432a4e6f92174b0050c31a1967f27f7bb | |
| parent | 6a6fc4e1db2469bd309c074f607abb60764ba20d (diff) | |
| download | rails-22cb97ba5c1d02398d94d91bbdcce386fca11770.tar.gz rails-22cb97ba5c1d02398d94d91bbdcce386fca11770.tar.bz2 rails-22cb97ba5c1d02398d94d91bbdcce386fca11770.zip | |
Add db/*.sqlite3-journal to .gitignore
These can pop up while the SQLite DB is being written to.
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/gitignore | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore index eb3489a986..8910bf5a06 100644 --- 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 index 7833c586f3..458b2c662e 100644 --- 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 |