Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bumping to 3.2.2 | Aaron Patterson | 2012-03-01 | 9 | -9/+9 |
| | |||||
* | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 5 | -30/+72 |
|\ | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| * | Ensure [] respects the status of the buffer. | José Valim | 2012-02-29 | 2 | -17/+49 |
| | | |||||
| * | delete vulnerable AS::SafeBuffer#[] | Akira Matsuda | 2012-02-20 | 2 | -12/+0 |
| | | |||||
| * | use AS::SafeBuffer#clone_empty for flushing the output_buffer | Akira Matsuda | 2012-02-20 | 1 | -1/+1 |
| | | |||||
| * | add AS::SafeBuffer#clone_empty | Akira Matsuda | 2012-02-20 | 2 | -0/+15 |
| | | |||||
| * | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 2 | -4/+11 |
| | | |||||
* | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-23 | 1 | -1/+1 |
| | | | | | | | | Fix usage of psql in db:test:prepare | ||||
* | | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -2/+1 |
| | | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2... | ||||
* | | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 9 | -17/+17 |
| | | |||||
* | | Fix CHANGELOG | Santiago Pastorino | 2012-02-22 | 1 | -2/+2 |
| | | |||||
* | | Add CHANGELOG entry | Santiago Pastorino | 2012-02-22 | 1 | -0/+2 |
| | | |||||
* | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 11 | -36/+25 |
| | | | | | | | | | | | | is being rendered Closes #5025 part 2 | ||||
* | | bumping up arel | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | |||||
* | | prepared statements can be disabled | Aaron Patterson | 2012-02-21 | 8 | -30/+56 |
| | | |||||
* | | tag bind params with a bind param object | Aaron Patterson | 2012-02-21 | 3 | -3/+3 |
| | | |||||
* | | more ruby 2.0 respond_to? changes | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | |||||
* | | ruby 2.0 makes protected methods return false for respond_to, so pass true ↵ | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | | | | | | | as the second param | ||||
* | | fix bad docs from f373f296 [ci skip] | Vijay Dev | 2012-02-21 | 1 | -3/+3 |
| | | |||||
* | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 2 | -10/+12 |
| | | |||||
* | | Merge pull request #5096 from lawso017/master | Aaron Patterson | 2012-02-21 | 2 | -19/+43 |
| | | | | | | | | Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys | ||||
* | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 2 | -2/+5 |
| | | | | | | | | view | ||||
* | | Add CHANGELOG entry | Santiago Pastorino | 2012-02-21 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #5106 from kennyj/fix_warnings_20120210 | Santiago Pastorino | 2012-02-21 | 6 | -27/+29 |
|\ \ | |/ |/| | [3-2-stable] Fix some warnings | ||||
| * | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 6 | -27/+29 |
|/ | |||||
* | Fix a failing test | Santiago Pastorino | 2012-02-20 | 1 | -0/+2 |
| | |||||
* | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 3 | -0/+9 |
| | | | | Closes #5025 | ||||
* | Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset | José Valim | 2012-02-20 | 2 | -0/+7 |
|\ | | | | | Reset memoized hash keys when new ActionView::Template handler is registered | ||||
| * | Reset memoized hash keys when new entry added | Chris Kelly | 2012-02-20 | 2 | -0/+7 |
|/ | |||||
* | search private / protected methods in trunk ruby | Aaron Patterson | 2012-02-20 | 1 | -1/+1 |
| | |||||
* | sync __run_callbacks with ruby-trunk | Sokolov Yura | 2012-02-20 | 1 | -1/+1 |
| | | | | | | https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580 In this revision behavior of respond_to? had changed: now to ask about protected method one should pass second argument `true` | ||||
* | Remove fixture files with Windows incompatible filenames | Andrew White | 2012-02-20 | 13 | -39/+88 |
| | | | | | | Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows. | ||||
* | fix a typo [ci skip] | Vijay Dev | 2012-02-18 | 1 | -1/+1 |
| | |||||
* | Documenting the :inverse_of option for associations | Mike Gunderloy | 2012-02-18 | 1 | -0/+99 |
| | |||||
* | fix spacer template example | Sergey Nartimov | 2012-02-18 | 1 | -1/+1 |
| | |||||
* | Update Time#change docs to reflect the options it uses | Eric Oestrich | 2012-02-18 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | Fix actionpack readme weblog example | Alexey Vakhov | 2012-02-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #5081 from arunagw/fix_ar_test | Xavier Noria | 2012-02-18 | 1 | -1/+5 |
|\ | | | | | Fix ar test | ||||
| * | fix test with ruby 187-p358 | Arun Agrawal | 2012-02-18 | 1 | -1/+5 |
|/ | |||||
* | Simplify regexp | Andrew White | 2012-02-17 | 1 | -1/+1 |
| | |||||
* | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 14 | -2/+50 |
| | | | | | | | | | | | RFC 3986[1] allows sub-delim characters in path segments unencoded, however Rack::File requires them to be encoded so we use URI's unescape method to leave them alone and then escape them again. Also since the path gets passed to Dir[] we need to escape any glob characters in the path. [1]: http://www.ietf.org/rfc/rfc3986.txt | ||||
* | Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358 | Santiago Pastorino | 2012-02-17 | 1 | -2/+2 |
|\ | | | | | Fix failing test ruby187 p358 | ||||
| * | Fixes failing test with ruby 1.8.7-p358 | Arun Agrawal | 2012-02-17 | 1 | -2/+2 |
| | | | | | | Same as 91a9b2441783de118a2f9ec11b0aa3ae80133d91 | ||||
* | | Merge pull request #5073 from asanghi/4918_backport | José Valim | 2012-02-17 | 2 | -1/+15 |
|\ \ | |/ |/| | Backporting #4918 with one added test for googlebot accept header as I saw it | ||||
| * | backporting #4918 to 3.2 stable; adding extra test for accept header given ↵ | Aditya Sanghi | 2012-02-17 | 2 | -1/+15 |
|/ | | | | by googlebot | ||||
* | Merge pull request #5049 from fabioyamate/master | José Valim | 2012-02-15 | 2 | -3/+10 |
| | | | | Fix sanitize_for_mass_assigment when role is nil | ||||
* | adding tests to document behavior for #4817 | Aaron Patterson | 2012-02-14 | 1 | -0/+26 |
| | |||||
* | Rack body respond to each and not to join | Santiago Pastorino | 2012-02-14 | 2 | -2/+16 |
| | | | | | | | This fixes undef `to_str' for Rack::Chunked::Body when using caches_action + streaming on an action Closes #5027 | ||||
* | Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo | José Valim | 2012-02-14 | 1 | -1/+4 |
| | | | | Always reenable _dump task in AR databases rake. Closes #5030 | ||||
* | Fix deprecation warning in AS::Concern. | José Valim | 2012-02-13 | 1 | -1/+1 |
| |