aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
* Merge branch '3-2-2' into 3-2-stableAaron Patterson2012-03-0114-39/+81
|\
| * bumping to 3.2.2Aaron Patterson2012-03-019-9/+9
| * Merge branch '3-2-stable-security' into 3-2-2Aaron Patterson2012-03-015-30/+72
| |\
| | * Ensure [] respects the status of the buffer.José Valim2012-02-292-17/+49
| | * delete vulnerable AS::SafeBuffer#[]Akira Matsuda2012-02-202-12/+0
| | * use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| | * add AS::SafeBuffer#clone_emptyAkira Matsuda2012-02-202-0/+15
| | * fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
| * | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
| * | Merge pull request #5084 from johndouthat/patch-1Aaron Patterson2012-02-221-2/+1
| * | updating RAILS_VERSIONAaron Patterson2012-02-229-17/+17
* | | Merge pull request #5206 from kennyj/fix_5173-32Aaron Patterson2012-02-293-12/+23
|\ \ \
| * | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.kennyj2012-02-293-12/+23
|/ / /
* | | call binmode on the tempfile for Ruby 1.8 compatibilityAaron Patterson2012-02-271-1/+2
* | | Merge pull request #5190 from rafaelfranca/fix-393-3-2-stableAaron Patterson2012-02-273-38/+38
|\ \ \
| * | | Add a new line after the textarea opening tag.Rafael Mendonça França2012-02-273-38/+38
* | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bugAaron Patterson2012-02-271-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixing Windows asset tag helper test failureRalph Shnelvar2012-02-251-1/+1
* | | | Revert "No need to pass options which is never used"Rafael Mendonça França2012-02-261-2/+2
* | | | Adding tests for non-optional glob parametersAndrew White2012-02-261-2/+27
|/ / /
* | | Fix typo in match :to docsJustin Woodbridge2012-02-251-1/+1
* | | Fixed typo in composed_of example with Money#<=>, was comparing amount itself...Noah Hendrix2012-02-251-1/+1
* | | Merge pull request #5170 from arunagw/3-2-stableSantiago Pastorino2012-02-251-3/+3
|\ \ \
| * | | assert => assert_equalArun Agrawal2012-02-251-3/+3
* | | | Merge pull request #5166 from arunagw/3-2-stableXavier Noria2012-02-251-4/+3
|\| | |
| * | | Checking headers in a better way. as doing hereArun Agrawal2012-02-251-4/+3
|/ / /
* | | Merge pull request #5164 from arunagw/build_fix_ruby187-p358Xavier Noria2012-02-251-2/+7
|\ \ \
| * | | Build fix for ruby187-p358Arun Agrawal2012-02-251-2/+7
|/ / /
* | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
* | | Avoid inspecting the whole route set, closes #1525José Valim2012-02-231-0/+6
* | | Merge pull request #5087 from pwnall/no_view_loggerAaron Patterson2012-02-221-3/+1
|\ \ \
| * | | Removed (outdated?) config.action_view.logger from configuration guide.Victor Costan2012-02-191-3/+1
* | | | Merge pull request #5084 from johndouthat/patch-1Aaron Patterson2012-02-221-2/+1
| |/ / |/| |
* | | Fix CHANGELOGSantiago Pastorino2012-02-221-2/+2
* | | Add CHANGELOG entrySantiago Pastorino2012-02-221-0/+2
* | | format lookup for partials is derived from the format in which the template i...Santiago Pastorino2012-02-2211-36/+25
* | | bumping up arelAaron Patterson2012-02-211-1/+1
* | | prepared statements can be disabledAaron Patterson2012-02-218-30/+56
* | | tag bind params with a bind param objectAaron Patterson2012-02-213-3/+3
* | | more ruby 2.0 respond_to? changesAaron Patterson2012-02-211-1/+1
* | | ruby 2.0 makes protected methods return false for respond_to, so pass true as...Aaron Patterson2012-02-211-1/+1
* | | fix bad docs from f373f296 [ci skip]Vijay Dev2012-02-211-3/+3
* | | Don't wrap the raise with ensureSantiago Pastorino2012-02-212-10/+12
* | | Merge pull request #5096 from lawso017/masterAaron Patterson2012-02-212-19/+43
* | | Restore lookup formats to the previous value after searching for the failing ...Santiago Pastorino2012-02-212-2/+5
* | | Add CHANGELOG entrySantiago Pastorino2012-02-211-0/+2
* | | Merge pull request #5106 from kennyj/fix_warnings_20120210Santiago Pastorino2012-02-216-27/+29
|\ \ \ | |_|/ |/| |
| * | Fix some warnings on 3-2-stablekennyj2012-02-216-27/+29
|/ /
* | Fix a failing testSantiago Pastorino2012-02-201-0/+2