aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #2046 from sikachu/master-test_fixSantiago Pastorino2011-07-171-2/+6
|\ \ \ \
| * | | | Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to be...Prem Sichanugrist2011-07-171-2/+6
| | |/ / | |/| |
* | | | Merge pull request #2018 from bhus/render_partial_invalid_checkSantiago Pastorino2011-07-173-0/+16
|\ \ \ \
| * | | | Added view template invalid name check, along with tests. No merges in commit.huskins2011-07-133-0/+16
* | | | | Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/f...Jon Leighton2011-07-171-2/+2
| |/ / / |/| | |
* | | | Merge pull request #2118 from arunagw/fix_plugin_gen_testSantiago Pastorino2011-07-171-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | As we are adding db folder in it. Required in test also.Arun Agrawal2011-07-171-1/+1
|/ / /
* | | indeed, if we are going to remove everything in public/assets on assets:clean...Xavier Noria2011-07-171-4/+1
* | | if we are cleaning all files, we are cleaning all gz filesXavier Noria2011-07-171-1/+0
* | | Merge pull request #2082 from htanata/rake_routes_formattingSantiago Pastorino2011-07-164-15/+107
|\ \ \
| * | | Improve formatting of route to Rack application in rake routes.Hendy Tanata2011-07-172-3/+24
| * | | Better formatting of route requirements in rake:routes.Hendy Tanata2011-07-164-14/+85
| | |/ | |/|
* | | Merge pull request #2108 from loz/masterSantiago Pastorino2011-07-161-0/+5
|\ \ \
| * | | Added gem helper to rake task for engines, as per pull request from 3-1-stabl...Jonathan Lozinski2011-07-161-0/+5
* | | | Fix the output a bitSantiago Pastorino2011-07-161-2/+2
* | | | Merge pull request #2101 from loz/masterJosé Valim2011-07-161-1/+1
|\| | |
| * | | Added db to gemspec files so migrations are correctly packagedJonathan Lozinski2011-07-161-1/+1
| |/ /
* | | Merge pull request #2090 from htanata/fix_wildcard_route_code_in_changelogSantiago Pastorino2011-07-151-2/+2
|\ \ \ | |/ / |/| |
| * | Fix wildcard route code example in changelog.Hendy Tanata2011-07-161-2/+2
|/ /
* | Merge pull request #2073 from bfolkens/masterSantiago Pastorino2011-07-141-0/+5
|\ \
| * | assert nothing raised for setting a cookie value to nil in ActionDispatchBradford Folkens2011-07-141-0/+5
* | | Merge pull request #2063 from elight/masterSantiago Pastorino2011-07-142-3/+29
|\ \ \
| * | | Fix and unit test for https://github.com/rails/rails/issues/2059Evan Light2011-07-142-3/+29
* | | | Merge pull request #1807 from caius/find_in_batches_id_bugSantiago Pastorino2011-07-142-2/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Stop find_in_batches using the records after yielding.Caius Durling2011-06-212-2/+21
* | | | Merge pull request #2066 from amatsuda/magicomeAaron Patterson2011-07-142-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | need magic commentsAkira Matsuda2011-07-142-0/+4
|/ / /
* | | Merge pull request #2052 from amatsuda/fullwidth_blankAaron Patterson2011-07-132-2/+6
|\ \ \
| * | | treat fullwidth whitespace as a blank characterAkira Matsuda2011-07-142-2/+6
| | |/ | |/|
* / | Bump rack upSantiago Pastorino2011-07-131-1/+1
|/ /
* | Use cache/assets instead.José Valim2011-07-124-5/+4
* | assets.cache_store now defaults to filesystem. You will want to share tmp/ass...José Valim2011-07-126-16/+9
* | Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patchSantiago Pastorino2011-07-121-7/+13
|\ \
| * | Fix for SqlBypass session storeJoseph Wong2011-07-121-7/+13
* | | Merge pull request #2041 from SAP-Oxygen/master-session-id-patch-with-testSantiago Pastorino2011-07-122-2/+37
|\ \ \
| * | | Fixed session ID fixation for ActiveRecord::SessionStoreJoseph Wong2011-07-122-2/+37
| |/ /
* | | Merge pull request #2038 from FLOChip/extra_spaceJosé Valim2011-07-122-4/+4
|\ \ \ | |/ / |/| |
| * | remove extra space since comment_if already returns the space.Teng Siong Ong2011-07-132-4/+4
|/ /
* | Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_...Jon Leighton2011-07-121-2/+2
* | Fix exception if old and new targets are both nil. Fixes #1471.Jon Leighton2011-07-124-2/+15
* | Ensure Dir.glob is sortedJoshua Peek2011-07-111-1/+1
* | Generate valid default fixtures for models with a type columnMarc-Andre Lafortune2011-07-112-1/+6
* | Merge pull request #1722 from AndrewRadev/grouped-selectJosé Valim2011-07-112-2/+48
|\ \
| * | Grouped select helperAndrew Radev2011-07-112-2/+48
* | | Merge pull request #1756 from shtirlic/xmlschema_fixJosé Valim2011-07-112-1/+8
|\ \ \ | |/ / |/| |
| * | Fix xmlschema output with fraction_digits >0shtirlic2011-07-112-1/+8
* | | Merge pull request #2032 from dziulius/masterXavier Noria2011-07-111-1/+1
|\ \ \
| * | | #many? uses count instead of select - a bit fasterJulius Markūnas2011-07-111-1/+1
* | | | Merge pull request #2009 from vatrai/autoload-todo-newJosé Valim2011-07-118-15/+7
|\ \ \ \
| * | | | TODO fix explicitly loading exceptations, autoload removedVishnu Atrai2011-07-118-15/+7