diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-09-21 21:14:04 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-09-21 21:14:04 +0100 |
| commit | 340be9bddd8e5902e0218a0101a40a17a4afd558 (patch) | |
| tree | ef4de25f3f8eb610dc2235f0762b01cb1d464efd /.gitignore | |
| parent | b31cdb55422226cd45a2234a4b54986f1f611151 (diff) | |
| parent | 1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50 (diff) | |
| download | rails-340be9bddd8e5902e0218a0101a40a17a4afd558.tar.gz rails-340be9bddd8e5902e0218a0101a40a17a4afd558.tar.bz2 rails-340be9bddd8e5902e0218a0101a40a17a4afd558.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 43c4d7b124..f8c7d02ad6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,20 @@ +.DS_Store debug.log doc/rdoc +activemodel/doc activeresource/doc activerecord/doc actionpack/doc actionmailer/doc activesupport/doc +activemodel/pkg activeresource/pkg activerecord/pkg actionpack/pkg activemodel/test/fixtures/fixture_database.sqlite3 actionmailer/pkg activesupport/pkg +actionpack/test/tmp activesupport/test/fixtures/isolation_test railties/pkg railties/test/500.html @@ -23,3 +27,5 @@ railties/guides/output *.rbc *.swp *.swo +actionpack/bin +*/vendor/gems |