aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
* fix incorrect url in the deprecation message for vendor/plugins [ci skip]Vijay Dev2012-03-291-1/+1
* Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2Santiago Pastorino2012-03-281-1/+1
|\
| * Changed the config.assets.manifest to nil in the comments in the production c...Anuj Dutta2012-03-281-1/+1
|/
* Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
* Merge pull request #5640 from yahonda/address_ora_00918_with_oracleSantiago Pastorino2012-03-281-1/+1
|\
| * Change the order argument from ('id') to ('taggings.id')Yasuo Honda2012-03-281-1/+1
* | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
* | Fix #5549.Jon Leighton2012-03-282-3/+7
* | Test for #5549.Aaron Patterson2012-03-282-1/+16
* | Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-285-14/+76
|\ \
| * | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-285-14/+76
|/ /
* | Merge pull request #5616 from cbartlett/migration-indentSantiago Pastorino2012-03-281-2/+2
* | Merge pull request #5624 from rafaelfranca/fix-buildMichael Koziarski2012-03-271-1/+1
|\ \
| * | Add arel branch to the testsRafael Mendonça França2012-03-271-1/+1
|/ /
* | Merge pull request #5622 from rafaelfranca/fix-2492-3-2Jeremy Kemper2012-03-272-2/+38
|\ \
| * | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-272-16/+24
| * | Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.Andrey Samsonov2012-03-272-2/+30
* | | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
|\ \ \
| * | | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
* | | | adding a branch to arelAaron Patterson2012-03-271-2/+2
* | | | Merge pull request #5618 from lest/patch-1Piotr Sarnacki2012-03-272-0/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | force datetime attributes to be changedSergey Nartimov2012-03-272-0/+15
* | | | Bumping to 3.2.3.rc1Santiago Pastorino2012-03-279-17/+17
| |_|/ |/| |
* | | Merge pull request #5603 from drogus/fix-rendered-format-for-render-partialJosé Valim2012-03-273-2/+22
|\ \ \
| * | | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
|/ / /
* | | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
* | | Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2José Valim2012-03-261-1/+1
|\ \ \ | |_|/ |/| |
| * | Return the same session data object when setting session idCarlos Antonio da Silva2012-03-241-1/+1
* | | Merge pull request #5596 from lest/patch-3Piotr Sarnacki2012-03-262-1/+12
|\ \ \ | | |/ | |/|
| * | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
|/ /
* / Fix 'Security#Mass Assignment' URL typoAbe Voelker2012-03-261-1/+1
|/
* chdir before globbing so that we don't need to escape directory names.Aaron Patterson2012-03-231-1/+30
* Merge pull request #5537 from kennyj/fix_4399-32Aaron Patterson2012-03-232-6/+34
|\
| * migrate(:down) method with table_name_prefixkennyj2012-03-212-6/+34
* | Merge pull request #5558 from carlosantoniodasilva/fix-build-3-2Piotr Sarnacki2012-03-231-16/+16
|\ \
| * | Fix identity map testsCarlos Antonio da Silva2012-03-231-16/+16
|/ /
* | Merge pull request #5557 from carlosantoniodasilva/fix-build-3-2Aaron Patterson2012-03-2213-46/+45
|\ \
| * | Add order to tests that rely on db ordering, to fix failing tests on pgCarlos Antonio da Silva2012-03-2213-46/+45
|/ /
* | Merge pull request #5525 from kennyj/fix_5411José Valim2012-03-222-1/+13
|\ \
| * | Fix GH #5411. When precompiling, params method is undefined.kennyj2012-03-222-1/+13
* | | Merge pull request #5542 from mhfs/port_5522_to_32stablePiotr Sarnacki2012-03-212-0/+21
|\| |
| * | [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating...Marcelo Silveira2012-03-212-0/+21
|/ /
* | Merge pull request #5533 from mhfs/migration_blank_line_3_2José Valim2012-03-212-1/+2
|\ \ | |/ |/|
| * [3-2-stable] Remove blank line from generated migrationMarcelo Silveira2012-03-202-1/+2
|/
* We dont need to merge in the parameters as thats all being reset by the rack ...David Heinemeier Hansson2012-03-201-1/+0
* Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stableJosé Valim2012-03-182-9/+7
|\
| * Build fix for ruby1.8.7-358Arun Agrawal2012-03-192-9/+7
|/
* Increase minimum version of mail.Mikel Lindsaar2012-03-191-1/+1
* Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-2-stableJosé Valim2012-03-181-1/+1
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 01:43:02 +0000