Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | add has_key? to ActiveModel::Errors | Damien Mathieu | 2011-09-06 | 2 | -0/+7 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2577 from rails-noob/master | Santiago Pastorino | 2011-09-06 | 2 | -1/+51 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix bug #2579. | rails-noob | 2011-09-06 | 2 | -1/+51 | |
* | | | | | | Merge pull request #2889 from guilleiguaran/perform-caching-assets | Santiago Pastorino | 2011-09-06 | 2 | -1/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | config.action_controller.perform_caching isn't used anymore in assets pipelin... | Guillermo Iguaran | 2011-09-06 | 2 | -1/+10 | |
* | | | | | | | Nested through associations: preloads from the default scope of a through mod... | Jon Leighton | 2011-09-06 | 2 | -1/+10 | |
* | | | | | | | Ensure we are not comparing a string with a symbol in HasManyAssociation#inve... | Jon Leighton | 2011-09-06 | 3 | -2/+12 | |
* | | | | | | | Make the logic easier to read | Jon Leighton | 2011-09-06 | 1 | -4/+7 | |
* | | | | | | | Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they h... | Jon Leighton | 2011-09-06 | 2 | -0/+25 | |
* | | | | | | | Merge pull request #2883 from dmathieu/fix_test | Jon Leighton | 2011-09-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | #first doesn't take an order in this test | Damien Mathieu | 2011-09-06 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #2851 from dasch/patch-6 | Jon Leighton | 2011-09-06 | 1 | -5/+3 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | No need to use a begin block there | Daniel Schierbeck | 2011-09-04 | 1 | -5/+3 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Bump uglifier up | Santiago Pastorino | 2011-09-05 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #2870 from arunagw/uglifier_bump | Santiago Pastorino | 2011-09-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Uglifier bump | Arun Agrawal | 2011-09-05 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #2877 from dmathieu/fix_tests_pg_18 | Santiago Pastorino | 2011-09-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | first and last orders the records by id | Damien Mathieu | 2011-09-06 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #2716 from jbbarth/fix_invert_rename_index | Aaron Patterson | 2011-09-05 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fixed bad options order in ActiveRecord::Migration::CommandRecorder#invert_re... | jbbarth | 2011-08-28 | 2 | -3/+3 | |
* | | | | | | | | | | Don't find belongs_to target when the foreign_key is NULL. Fixes #2828 | Georg Friedrich | 2011-09-05 | 2 | -0/+10 | |
* | | | | | | | | | | Merge pull request #2873 from guilleiguaran/remove-unused-config | Santiago Pastorino | 2011-09-05 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove unused config variable from test.rb template | Guillermo Iguaran | 2011-09-05 | 1 | -3/+0 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2872 from sikachu/content_tag_html_safe | Santiago Pastorino | 2011-09-05 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Make sure that result from content_tag_for with collection is html_safe | Prem Sichanugrist | 2011-09-05 | 2 | -1/+13 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2815 from avakhov/current-page-non-get-requests | Santiago Pastorino | 2011-09-05 | 2 | -2/+16 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | current_page? returns false for non-GET requests | Alexey Vakhov | 2011-09-02 | 2 | -2/+16 | |
* | | | | | | | | | | | Merge pull request #2799 from tomstuart/3-1-stable | Santiago Pastorino | 2011-09-05 | 2 | -3/+39 | |
| |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2789 from dmathieu/limit_first_last | Jon Leighton | 2011-09-05 | 2 | -2/+32 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Use LIMIT sql word in last when it's possible | Damien Mathieu | 2011-09-05 | 2 | -2/+23 | |
| * | | | | | | | | | | use LIMIT SQL word in first - Closes #2783 | Damien Mathieu | 2011-09-05 | 2 | -1/+10 | |
|/ / / / / / / / / / | ||||||
* | / / / / / / / / | add blanks between methods | Vijay Dev | 2011-09-05 | 1 | -0/+3 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #2868 from arunagw/batches_test_pg_master | Jon Leighton | 2011-09-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Sort here to make sure the order is ok. | Arun Agrawal | 2011-09-05 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2713 from FLOChip/500-fixed | José Valim | 2011-09-05 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove misleading line on 500 error page. | Teng Siong Ong | 2011-08-27 | 1 | -1/+0 | |
| * | | | | | | | | | fixed 500 error message which is misleading by suggesting all rails apps have... | Jared Tame | 2011-08-27 | 1 | -1/+1 | |
* | | | | | | | | | | Remove empty test | Santiago Pastorino | 2011-09-05 | 1 | -3/+0 | |
* | | | | | | | | | | Merge pull request #2863 from raybaxter/silence_unitialized_instance_variable... | Santiago Pastorino | 2011-09-04 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Tests shouldn't produce warnings | Ray Baxter | 2011-09-04 | 1 | -0/+5 | |
* | | | | | | | | | | | Merge pull request #2861 from guilleiguaran/assets-fix-changelog | Santiago Pastorino | 2011-09-04 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add entry about Asset behaviour fix to ActionPack ChangeLog | Guillermo Iguaran | 2011-09-04 | 1 | -0/+3 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #2860 from guilleiguaran/fix-assets-behavior | Santiago Pastorino | 2011-09-04 | 2 | -2/+28 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | AssetNotPrecompiledError should be raise when config.assets.digest = false, c... | Guillermo Iguaran | 2011-09-04 | 2 | -2/+28 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | * is not allowed in windows file names. Closes #2574 #2847 | Santiago Pastorino | 2011-09-04 | 2 | -1/+1 | |
* | | | | | | | | | | Merge pull request #2855 from arunagw/fix_find_in_batches_master | Jon Leighton | 2011-09-04 | 3 | -1/+31 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | We need to recorder here. Need to drop the order from default scope. | Arun Agrawal | 2011-09-05 | 3 | -1/+31 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2852 from milandobrota/remove_unneeded_explicit_nil_checks | Jon Leighton | 2011-09-04 | 7 | -11/+11 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | if ... nil? is more expensive than unless | Milan Dobrota | 2011-09-04 | 7 | -11/+11 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge docrails, resolving conflicts in the assets guide | Vijay Dev | 2011-09-04 | 9 | -24/+26 | |
|\ \ \ \ \ \ \ \ |