From f7b5019eeab0b81d82fb0ee85e694ec5aa772fe4 Mon Sep 17 00:00:00 2001 From: Jonathan Hefner Date: Fri, 7 Feb 2020 13:45:53 -0600 Subject: [PATCH] Remove redundant .gitignore entries Follow-up to #37053. The `*.sqlite3-*` .gitignore entries added in that commit subsume previous `*.sqlite3-journal` entries. --- actionmailbox/.gitignore | 1 - actiontext/.gitignore | 1 - activestorage/.gitignore | 1 - railties/lib/rails/generators/rails/app/templates/gitignore.tt | 1 - .../lib/rails/generators/rails/plugin/templates/gitignore.tt | 1 - 5 files changed, 5 deletions(-) diff --git a/actionmailbox/.gitignore b/actionmailbox/.gitignore index dfdd231a8a..3ac26defd7 100644 --- a/actionmailbox/.gitignore +++ b/actionmailbox/.gitignore @@ -1,5 +1,4 @@ /test/dummy/db/*.sqlite3 -/test/dummy/db/*.sqlite3-journal /test/dummy/db/*.sqlite3-* /test/dummy/log/*.log /test/dummy/tmp/ diff --git a/actiontext/.gitignore b/actiontext/.gitignore index 330aad838b..a31afda69e 100644 --- a/actiontext/.gitignore +++ b/actiontext/.gitignore @@ -1,5 +1,4 @@ /test/dummy/db/*.sqlite3 -/test/dummy/db/*.sqlite3-journal /test/dummy/db/*.sqlite3-* /test/dummy/log/*.log /test/dummy/public/packs-test diff --git a/activestorage/.gitignore b/activestorage/.gitignore index 841360555b..2bef7bb06a 100644 --- a/activestorage/.gitignore +++ b/activestorage/.gitignore @@ -1,6 +1,5 @@ /src/ /test/dummy/db/*.sqlite3 -/test/dummy/db/*.sqlite3-journal /test/dummy/db/*.sqlite3-* /test/dummy/log/*.log /test/dummy/tmp/ diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore.tt b/railties/lib/rails/generators/rails/app/templates/gitignore.tt index 4d2bab9721..e4e3d26971 100644 --- a/railties/lib/rails/generators/rails/app/templates/gitignore.tt +++ b/railties/lib/rails/generators/rails/app/templates/gitignore.tt @@ -10,7 +10,6 @@ <% if sqlite3? -%> # Ignore the default SQLite database. /db/*.sqlite3 -/db/*.sqlite3-journal /db/*.sqlite3-* <% end -%> diff --git a/railties/lib/rails/generators/rails/plugin/templates/gitignore.tt b/railties/lib/rails/generators/rails/plugin/templates/gitignore.tt index 4bcc192cb1..8a1177ff3e 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/gitignore.tt +++ b/railties/lib/rails/generators/rails/plugin/templates/gitignore.tt @@ -4,7 +4,6 @@ pkg/ <% if with_dummy_app? -%> <% if sqlite3? -%> <%= dummy_path %>/db/*.sqlite3 -<%= dummy_path %>/db/*.sqlite3-journal <%= dummy_path %>/db/*.sqlite3-* <% end -%> <%= dummy_path %>/log/*.log