| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup" | José Valim | 2011-10-25 | 3 | -57/+4 |
| | | | | | | | | Tests were failing on Travis-CI. This reverts commit 79d01a8f16e20c556a086a2f07e3ccb4400f9819, reversing changes made to b838570bd69ff13d677fb43e79f10d6f3168c696. | ||||
| * | Merge pull request #3422 from arunagw/unused_var_warning | Vijay Dev | 2011-10-25 | 1 | -1/+1 |
| |\ | | | | | Unused variable removed | ||||
| | * | Unused variable removed | Arun Agrawal | 2011-10-24 | 1 | -1/+1 |
| | | | |||||
| * | | safeguard against configs missing environment or the database key | Vijay Dev | 2011-10-26 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #3424 from avakhov/av-scaffold-func-test-remove-to_param | José Valim | 2011-10-24 | 1 | -4/+4 |
| |\ \ | |/ |/| | Remove needless to_param in scaffold functional test | ||||
| | * | Remove needless to_param in scaffold functional test | Alexey Vakhov | 2011-10-24 | 1 | -4/+4 |
| |/ | |||||
| * | minor revision to some new code in databases.rake | Xavier Noria | 2011-10-24 | 1 | -2/+3 |
| | | |||||
| * | registers PR #2419 in the CHANGELOG | Xavier Noria | 2011-10-24 | 1 | -0/+3 |
| | | |||||
| * | Merge pull request #2419 from ↵ | Xavier Noria | 2011-10-24 | 1 | -11/+15 |
| |\ | | | | | | | | | dmitriy-kiriyenko/drop_test_database_in_development_when_running_rake_db_drop When running "rake db:drop" also drop test database in development environment | ||||
| | * | When running "rake db:drop" also drop test database in development environment. | Dmitriy Kiriyenko | 2011-09-29 | 1 | -11/+15 |
| | | | |||||
| * | | Merge pull request #3416 from arunagw/rbx_test_fixes | José Valim | 2011-10-24 | 2 | -2/+9 |
| |\ \ | | | | | | | ActionPack test fix for RBX | ||||
| | * | | ActionPack test fix for RBX | Arun Agrawal | 2011-10-24 | 2 | -2/+9 |
| |/ / | |||||
| * | | Ignore .rbx directories (rbx compiled bytecode files) | Jon Leighton | 2011-10-23 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-23 | 4 | -20/+15 |
| |\ \ | |||||
| | * | | edge doesnt provide turn gem in the gemfile anymore | Vijay Dev | 2011-10-23 | 1 | -5/+0 |
| | | | | |||||
| | * | | Updated rack version in docs for 3.2 | Arun Agrawal | 2011-10-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Rails version to 3.2.0.beta in docs | Arun Agrawal | 2011-10-22 | 1 | -6/+6 |
| | | | | |||||
| | * | | Middleware details updated for 3.2 | Arun Agrawal | 2011-10-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add some note on adding index to HABTM table | Prem Sichanugrist | 2011-10-20 | 1 | -0/+4 |
| | | | | |||||
| | * | | Use new migration style in HABTM join table | Prem Sichanugrist | 2011-10-20 | 1 | -5/+1 |
| | | | | | | | | | | Yes, we're on Rails 3.1 now. | ||||
| | * | | Fixed typo. | Pepe Hipolito | 2011-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | Ruby will know to look for this file at => Ruby will know how to look for this file at | ||||
| | * | | Fixed typo. | Pepe Hipolito | 2011-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | a long the way => along the way | ||||
| * | | | Merge pull request #3352 from arunagw/bump_sprockets | Vijay Dev | 2011-10-22 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Bump sprockets | ||||
| | * | | | Bump sprockets | Arun Agrawal | 2011-10-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3408 from guilleiguaran/remove-turn | José Valim | 2011-10-22 | 3 | -28/+0 |
| |\ \ \ \ | | | | | | | | | | | Remove Turn from default Gemfile. | ||||
| | * | | | | Remove Turn from default Gemfile. | Guillermo Iguaran | 2011-10-22 | 3 | -28/+0 |
| | | | | | | | | | | | | | | | | | | | | | We still looking for a best presentation for tests output. | ||||
| * | | | | | Revert "Merge pull request #3405 from arunagw/middleware_name" | Aaron Patterson | 2011-10-22 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | This reverts commit c33090523c3504a2a125d7f725a7f2a4b99ff3c0, reversing changes made to 1c1c3fc2c06fc02e67a8272adf2c2d2381e005b4. | ||||
| * | | | | Merge pull request #3405 from arunagw/middleware_name | Aaron Patterson | 2011-10-22 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Using middleware name to show proper name in the info | ||||
| | * | | | | Using middleware name to show proper name in the info | Arun Agrawal | 2011-10-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | minor fixes in the composed_of doc | Vijay Dev | 2011-10-22 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #3407 from arunagw/rake_upgrade | Xavier Noria | 2011-10-22 | 1 | -6/+1 |
| |\ \ \ \ \ | |/ / / / |/| | | | | No need to check ruby version here as rake 9.2.2 is out with the same fix | ||||
| | * | | | | No need to check ruby version here | Arun Agrawal | 2011-10-22 | 1 | -6/+1 |
| |/ / / / | | | | | | | | | | | | | As rake 0.9.2.2 is out with the same fix as 0.9.3.beta having | ||||
| * | | | | Merge pull request #3404 from arunagw/warning_removed_request_id | José Valim | 2011-10-22 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Warnings removed from RequestIdTest | ||||
| | * | | | | Warnings removed from RequestIdTest | Arun Agrawal | 2011-10-22 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | Merge pull request #3396 from bdurand/session_cache_store | José Valim | 2011-10-21 | 6 | -8/+243 |
| |\ \ \ \ | | | | | | | | | | | Add ActionDispatch::Session::CacheStore as a generic way of storing sessions in a cache | ||||
| | * | | | | Add ActionDispatch::Session::CacheStore as a generic way of storing sessions ↵ | Brian Durand | 2011-10-21 | 6 | -8/+243 |
| | | | | | | | | | | | | | | | | | | | | | in a cache. | ||||
| * | | | | | Merge pull request #3400 from greinacker/sqlite-decimal | Aaron Patterson | 2011-10-21 | 2 | -0/+39 |
| |\ \ \ \ \ | | | | | | | | | | | | | sqlite3 adapter drops :decimal columns precision & scale when migration tries to alter them | ||||
| | * | | | | | preserve decimal column attributes after migration | Greg Reinacker | 2011-10-21 | 2 | -0/+39 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #3395 from bdurand/fix_file_store_cleanup | José Valim | 2011-10-21 | 3 | -4/+57 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix ActiveSupport::Cache::FileStore.cleanup to actually work. | ||||
| | * | | | | | Fix ActiveSupport::Cache::FileStore.cleanup to actually work. | Brian Durand | 2011-10-21 | 3 | -4/+57 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3394 from bdurand/buffered_logger_threads | José Valim | 2011-10-21 | 2 | -8/+89 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Fix threading issues with BufferedLogger. | ||||
| | * | | | | Fix threading issues with BufferedLogger. | Brian Durand | 2011-10-21 | 2 | -8/+89 |
| |/ / / / | |||||
| * | | | | Merge pull request #3387 from arunagw/tagged_log_nil | José Valim | 2011-10-21 | 2 | -1/+7 |
| |\ \ \ \ | |_|/ / |/| | | | Checking blank if tag might coming nil or blank | ||||
| | * | | | Checking blank if tag might coming nil or blank | Arun Agrawal | 2011-10-21 | 2 | -1/+7 |
| |/ / / | | | | | | | In log it should not show the empty array. | ||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-20 | 10 | -60/+281 |
| |\ \ \ | |||||
| | * | | | Fixed misleading docs for String#to_formatted_s(:db) | Martin Svalin | 2011-10-20 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Correct ActionMailer subject i18n lookup scope. | Andrew France | 2011-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | The :actionmailer i18n scope part is not used and according to https://github.com/rails/rails/pull/2542 the implementation is correct. | ||||
| | * | | | [engines guide] explanation of overriding views + referencing routes from an ↵ | Ryan Bigg | 2011-10-20 | 1 | -2/+57 |
| | | | | | | | | | | | | | | | | | engine within an application | ||||
| | * | | | [engines guide] some fixes for the author id migration including proof of ↵ | Ryan Bigg | 2011-10-20 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | not copying over other migrations again | ||||
| | * | | | [engines guide] add missing end for to_s method | Ryan Bigg | 2011-10-20 | 1 | -0/+1 |
| | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |