diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-07-28 06:18:43 +0000 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2018-02-17 14:26:19 -0800 |
| commit | 0f98954a83a5ec1d7c8def958422a62f0ead59a1 (patch) | |
| tree | ae962382204a40d7c76c7204358f5d7b7e0c4a46 /.gitignore | |
| parent | 5645149d3a27054450bd1130ff5715504638a5f5 (diff) | |
| download | rails-0f98954a83a5ec1d7c8def958422a62f0ead59a1.tar.gz rails-0f98954a83a5ec1d7c8def958422a62f0ead59a1.tar.bz2 rails-0f98954a83a5ec1d7c8def958422a62f0ead59a1.zip | |
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.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index da3b42cfbb..ab9ca8a6ac 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/ |