diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-20 07:22:26 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-20 07:22:26 -0800 |
| commit | df28b80472657d749e63c9e86aab0cda83cacd56 (patch) | |
| tree | b2911c4432a4e6f92174b0050c31a1967f27f7bb /railties/lib | |
| parent | 6a6fc4e1db2469bd309c074f607abb60764ba20d (diff) | |
| parent | 22cb97ba5c1d02398d94d91bbdcce386fca11770 (diff) | |
| download | rails-df28b80472657d749e63c9e86aab0cda83cacd56.tar.gz rails-df28b80472657d749e63c9e86aab0cda83cacd56.tar.bz2 rails-df28b80472657d749e63c9e86aab0cda83cacd56.zip | |
Merge pull request #4057 from joliss/gitignore
Add db/*.sqlite3-journal to .gitignore
Diffstat (limited to 'railties/lib')
| -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 |