From 0f98954a83a5ec1d7c8def958422a62f0ead59a1 Mon Sep 17 00:00:00 2001 From: bogdanvlviv Date: Fri, 28 Jul 2017 06:18:43 +0000 Subject: [PATCH] Clean up and consolidate .gitignores * Global ignores at toplevel .gitignore * Component-specific ignores in each toplevel directory * Remove `actionview/test/tmp/.keep` for JRuby ``` rm actionview/test/tmp/ -fr cd actionview/ bundle exec jruby -Itest test/template/digestor_test.rb ``` Related to #11743, #30392. Closes #29978. --- .gitignore | 29 ++++++++-------------- actioncable/.gitignore | 4 +-- actionpack/test/tmp/.gitignore | 0 actionview/.gitignore | 7 ++++-- actionview/test/fixtures/public/.gitignore | 1 - actionview/test/tmp/.keep | 0 actionview/test/ujs/.gitignore | 1 - activerecord/.gitignore | 3 +++ activerecord/examples/.gitignore | 1 - activerecord/test/.gitignore | 1 - activerecord/test/fixtures/.gitignore | 1 - activestorage/.gitignore | 13 +++++----- activesupport/.gitignore | 1 + railties/.gitignore | 6 ++++- 14 files changed, 32 insertions(+), 36 deletions(-) delete mode 100644 actionpack/test/tmp/.gitignore delete mode 100644 actionview/test/fixtures/public/.gitignore delete mode 100644 actionview/test/tmp/.keep delete mode 100644 actionview/test/ujs/.gitignore create mode 100644 activerecord/.gitignore delete mode 100644 activerecord/examples/.gitignore delete mode 100644 activerecord/test/.gitignore delete mode 100644 activerecord/test/fixtures/.gitignore create mode 100644 activesupport/.gitignore diff --git a/.gitignore b/.gitignore index da3b42cfbba..ab9ca8a6ac1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,16 @@ -# Don't put *.swp, *.bak, etc here; those belong in a global ~/.gitignore. +# Don't put *.swp, *.bak, etc here; those belong in a global .gitignore. # Check out https://help.github.com/articles/ignoring-files for how to set that up. .Gemfile -.ruby-version .byebug_history -debug.log -pkg +.ruby-version +/*/doc/ +/*/test/tmp/ /.bundle -/dist -/doc/rdoc -/*/doc -/*/test/tmp -/activerecord/sqlnet.log -/activemodel/test/fixtures/fixture_database.sqlite3 -/activesupport/test/fixtures/isolation_test -/activestorage/test/service/configurations.yml -/railties/test/500.html -/railties/test/fixtures/tmp -/railties/test/initializer/root/log -/railties/doc -/railties/tmp -/guides/output +/dist/ +/doc/ +/guides/output/ +debug.log node_modules/ -/actionview/log +package-lock.json +pkg/ diff --git a/actioncable/.gitignore b/actioncable/.gitignore index 0a04b297867..f514e58c16f 100644 --- a/actioncable/.gitignore +++ b/actioncable/.gitignore @@ -1,2 +1,2 @@ -/lib/assets/compiled -/tmp +/lib/assets/compiled/ +/tmp/ diff --git a/actionpack/test/tmp/.gitignore b/actionpack/test/tmp/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/actionview/.gitignore b/actionview/.gitignore index 0a04b297867..246aabbb7f2 100644 --- a/actionview/.gitignore +++ b/actionview/.gitignore @@ -1,2 +1,5 @@ -/lib/assets/compiled -/tmp +/lib/assets/compiled/ +/log/ +/test/fixtures/public/absolute/ +/test/ujs/log/ +/tmp/ diff --git a/actionview/test/fixtures/public/.gitignore b/actionview/test/fixtures/public/.gitignore deleted file mode 100644 index 312e635ee65..00000000000 --- a/actionview/test/fixtures/public/.gitignore +++ /dev/null @@ -1 +0,0 @@ -absolute/* diff --git a/actionview/test/tmp/.keep b/actionview/test/tmp/.keep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/actionview/test/ujs/.gitignore b/actionview/test/ujs/.gitignore deleted file mode 100644 index 31dbbff57c2..00000000000 --- a/actionview/test/ujs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/log diff --git a/activerecord/.gitignore b/activerecord/.gitignore new file mode 100644 index 00000000000..884ee009eb2 --- /dev/null +++ b/activerecord/.gitignore @@ -0,0 +1,3 @@ +/sqlnet.log +/test/config.yml +/test/fixtures/*.sqlite* diff --git a/activerecord/examples/.gitignore b/activerecord/examples/.gitignore deleted file mode 100644 index 0dfc1cb7fb1..00000000000 --- a/activerecord/examples/.gitignore +++ /dev/null @@ -1 +0,0 @@ -performance.sql diff --git a/activerecord/test/.gitignore b/activerecord/test/.gitignore deleted file mode 100644 index a0ec5967dd6..00000000000 --- a/activerecord/test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/config.yml diff --git a/activerecord/test/fixtures/.gitignore b/activerecord/test/fixtures/.gitignore deleted file mode 100644 index 885029a512d..00000000000 --- a/activerecord/test/fixtures/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.sqlite* \ No newline at end of file diff --git a/activestorage/.gitignore b/activestorage/.gitignore index 29bdcc4468a..3e78878ffcd 100644 --- a/activestorage/.gitignore +++ b/activestorage/.gitignore @@ -1,7 +1,6 @@ -.byebug_history -node_modules -src -test/dummy/db/*.sqlite3 -test/dummy/db/*.sqlite3-journal -test/dummy/log/*.log -test/dummy/tmp/ +/src/ +/test/dummy/db/*.sqlite3 +/test/dummy/db/*.sqlite3-journal +/test/dummy/log/*.log +/test/dummy/tmp/ +/test/service/configurations.yml diff --git a/activesupport/.gitignore b/activesupport/.gitignore new file mode 100644 index 00000000000..8cde8514fd9 --- /dev/null +++ b/activesupport/.gitignore @@ -0,0 +1 @@ +/test/fixtures/isolation_test/ diff --git a/railties/.gitignore b/railties/.gitignore index 80dd262d2fa..c08562e0161 100644 --- a/railties/.gitignore +++ b/railties/.gitignore @@ -1 +1,5 @@ -log/ +/log/ +/test/500.html +/test/fixtures/tmp/ +/test/initializer/root/log/ +/tmp/