aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-053-1/+28
* Merge pull request #14269 from arthurnn/expanded_key_arrayGuillermo Iguaran2014-03-043-4/+14
|\
| * Cache key should be different when is Array.Arthur Neves2014-03-033-4/+14
* | Merge pull request #14243 from pch/digestor-variantsDavid Heinemeier Hansson2014-03-046-24/+105
|\ \
| * | Variants in ActionView::DigestorPiotr Chmolowski2014-03-046-24/+105
* | | Always return an array from formats so there is no need to wrap it when callingCarlos Antonio da Silva2014-03-043-3/+3
* | | Fix for external generators extend Erb::GeneratorsAllen Fair2014-03-041-1/+1
|/ /
* | Inline block to fix indent [ci skip]Carlos Antonio da Silva2014-03-041-3/+1
* | Merge pull request #14273 from vipulnsward/fix-warning-13244Yves Senn2014-03-041-1/+1
|\ \
| * | Fix enum test unused variable warning.Vipul A M2014-03-041-1/+1
|/ /
* | Merge pull request #13244 from kommen/pg_enum_type_mapYves Senn2014-03-044-0/+45
|\ \
| * | Add Enum type to postgresql adapter's oids to prevent unknown OID warnings.Dieter Komendera2014-03-044-0/+45
| |/
* | Use 1.9 style hash on docs [ci skip]Carlos Antonio da Silva2014-03-041-1/+1
* | Simplify handling of defaults/options in button_tagCarlos Antonio da Silva2014-03-041-4/+1
* | Added missing changlog entry for #14255Godfrey Chan2014-03-041-0/+7
* | Merge pull request #14255 from prikha/masterGodfrey Chan2014-03-042-5/+19
|\ \ | |/ |/|
| * remove private method and rewrite into more precise notationSergey Prikhodko2014-03-041-12/+12
| * rollback to private methodSergey Prikhodko2014-03-031-5/+9
| * cleanup and move extracted method right into the helperSergey Prikhodko2014-03-031-9/+5
| * fix content_or_options to be replaced by options and set to nilSergey Prikhodko2014-03-031-1/+6
| * fix indentationsSergey Prikhodko2014-03-031-4/+3
| * fix form buttonSergey Prikhodko2014-03-031-5/+2
| * fix button tag without optionsSergey Prikhodko2014-03-031-2/+2
| * fix accept nil optionsSergey Prikhodko2014-03-031-3/+5
| * fixes default attributes for button_tagSergey Prikhodko2014-03-032-7/+18
* | Merge pull request #14258 from shuhei/fix_deep_munge_logCarlos Antonio da Silva2014-03-031-3/+3
|\ \
| * | Add spaces to deep_munge log message.Shuhei Kagawa2014-03-031-3/+3
|/ /
* | Add a comment to ensure that a test won't be removed [ci skip]Robin Dupret2014-03-031-1/+1
* | Merge pull request #14239 from zzak/refactor_actionpack_dispatch_request_testsJeremy Kemper2014-03-022-370/+386
|\ \
| * | Refactor tests from BaseRackTest into BaseRequestTestZachary Scott2014-03-012-370/+386
* | | Merge pull request #14248 from vipulnsward/fix-pg-ar-warningsYves Senn2014-03-022-2/+2
|\ \ \ | |/ / |/| |
| * | Fix warnings due to:Vipul A M2014-03-032-2/+2
|/ /
* | Merge pull request #14234 from arthurnn/fix_trans_on_replaceSantiago Pastorino2014-03-012-1/+13
|\ \
| * | Remove unnecessary db call when replacing.Arthur Neves2014-02-282-1/+13
* | | Merge pull request #14240 from sferik/flat_mapJosé Valim2014-03-012-5/+5
|\ \ \
| * | | Replace map.flatten(1) with flat_mapErik Michaels-Ober2014-02-282-5/+5
|/ / /
* | | make sure we wait for the threads to shut down before asserting closureAaron Patterson2014-02-281-0/+1
* | | Merge pull request #14195 from robin850/issue-14079Guillermo Iguaran2014-02-283-2/+23
|\ \ \
| * | | Avoid namespacing routes inside enginesRobin Dupret2014-02-263-2/+23
* | | | use built-in exception handling in live controllersAaron Patterson2014-02-282-17/+22
* | | | live controllers should have live responsesAaron Patterson2014-02-283-21/+38
| |/ / |/| |
* | | Merge pull request #14233 from kuldeepaggarwal/fix-secrets-docGuillermo Iguaran2014-02-282-4/+11
|\ \ \
| * | | [ci skip] use secrets.secret_key_base instead of config.secret_key_baseKuldeep Aggarwal2014-03-012-4/+11
* | | | set the error callback to a nice default in case nobody set an error callback...Aaron Patterson2014-02-282-1/+8
* | | | Merge pull request #14230 from kuldeepaggarwal/doc-selectRobin Dupret2014-02-281-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] correct select examples and doc, ref [522c0fd]Kuldeep Aggarwal2014-03-011-4/+4
* | | | Improve a bit the 4.1 release notes [ci skip]Robin Dupret2014-02-281-4/+6
* | | | Merge pull request #14226 from senny/14109_partial_revertAaron Patterson2014-02-283-1/+26
|\ \ \ \
| * | | | `includes` uses SQL parsing when String joins are involved.Yves Senn2014-02-283-1/+26
| |/ / /
* | | | Merge pull request #14231 from brianstorti/bs-docs-secret-tokenGuillermo Iguaran2014-02-281-3/+18
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 12:21:52 +0000