aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Use the right format when a partial is missing.Santiago Pastorino2012-02-203-0/+9
* | Merge pull request #5101 from ckdake/ckdake_actionview_handler_resetJosé Valim2012-02-202-0/+7
|\ \
| * | Reset memoized hash keys when new entry addedChris Kelly2012-02-202-0/+7
|/ /
* | search private / protected methods in trunk rubyAaron Patterson2012-02-201-1/+1
* | sync __run_callbacks with ruby-trunkSokolov Yura2012-02-201-1/+1
* | Remove fixture files with Windows incompatible filenamesAndrew White2012-02-2013-39/+88
|/
* fix a typo [ci skip]Vijay Dev2012-02-181-1/+1
* Documenting the :inverse_of option for associationsMike Gunderloy2012-02-181-0/+99
* fix spacer template exampleSergey Nartimov2012-02-181-1/+1
* Update Time#change docs to reflect the options it usesEric Oestrich2012-02-181-1/+1
* Fix actionpack readme weblog exampleAlexey Vakhov2012-02-181-1/+1
* Merge pull request #5081 from arunagw/fix_ar_testXavier Noria2012-02-181-1/+5
|\
| * fix test with ruby 187-p358Arun Agrawal2012-02-181-1/+5
|/
* Simplify regexpAndrew White2012-02-171-1/+1
* Fix ActionDispatch::Static to serve files with unencoded PCHARAndrew White2012-02-1714-2/+50
* Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358Santiago Pastorino2012-02-171-2/+2
|\
| * Fixes failing test with ruby 1.8.7-p358Arun Agrawal2012-02-171-2/+2
* | Merge pull request #5073 from asanghi/4918_backportJosé Valim2012-02-172-1/+15
|\ \ | |/ |/|
| * backporting #4918 to 3.2 stable; adding extra test for accept header given by...Aditya Sanghi2012-02-172-1/+15
|/
* Merge pull request #5049 from fabioyamate/masterJosé Valim2012-02-152-3/+10
* adding tests to document behavior for #4817Aaron Patterson2012-02-141-0/+26
* Rack body respond to each and not to joinSantiago Pastorino2012-02-142-2/+16
* Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redoJosé Valim2012-02-141-1/+4
* Fix deprecation warning in AS::Concern.José Valim2012-02-131-1/+1
* Fix that failed tests should exit with a nonzero error code.Jeremy Kemper2012-02-102-31/+17
* Merge pull request #4988 from kennyj/fix_4720-3Aaron Patterson2012-02-102-0/+31
* Merge pull request #4941 from rafaelfranca/fix-buildJosé Valim2012-02-081-3/+3
|\
| * Use real table and columns for index testRafael Mendonça França2012-02-081-3/+3
|/
* Push proper test changes for previous commit conflicts.José Valim2012-02-081-2/+4