Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | No variant should also be picked up by variant.any if variant.none is not def... | David Heinemeier Hansson | 2014-02-13 | 2 | -1/+5 | |
* | | | | speed up the collection proxy reader method, but slow down the constructor | Aaron Patterson | 2014-02-13 | 1 | -1/+5 | |
* | | | | Merge pull request #14047 from strzalek/variants-array-check | David Heinemeier Hansson | 2014-02-13 | 2 | -2/+10 | |
|\ \ \ \ | ||||||
| * | | | | Check if variant array contains only symbols | Łukasz Strzałkowski | 2014-02-13 | 2 | -2/+10 | |
* | | | | | Merge pull request #14034 from hdabrows/drop-correct-index-when-reverting-mig... | Yves Senn | 2014-02-13 | 4 | -4/+49 | |
|\ \ \ \ \ | ||||||
| * | | | | | Drop the correct index after reverting a migration | Hubert Dąbrowski | 2014-02-13 | 4 | -4/+49 | |
* | | | | | | Merge pull request #14045 from arthurnn/kill_fibers | Guillermo Iguaran | 2014-02-13 | 1 | -2/+4 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Dont use Enumarator on join_association | Arthur Neves | 2014-02-13 | 1 | -2/+4 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #14043 from strzalek/variants-negotiation | David Heinemeier Hansson | 2014-02-13 | 5 | -12/+51 | |
|\ \ \ \ \ | ||||||
| * | | | | | Variant negotiation | Lukasz Strzalkowski | 2014-02-13 | 5 | -12/+51 | |
* | | | | | | tests are responsible to clean up afterwards. | Yves Senn | 2014-02-13 | 1 | -82/+114 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13945 from rails/json_cookie_serializer_improvements | Guillermo Iguaran | 2014-02-13 | 16 | -123/+316 | |
|\ \ \ \ \ | ||||||
| * | | | | | rm warning about variable shadowing | Godfrey Chan | 2014-02-11 | 1 | -2/+2 | |
| * | | | | | Migrate hash-based cookie values correctly | Godfrey Chan | 2014-02-11 | 1 | -2/+4 | |
| * | | | | | Updated CHANGELOG, docs, guides and release notes. | Godfrey Chan | 2014-02-11 | 5 | -26/+44 | |
| * | | | | | Added changelog entry for Flash changes [ci skip] | Godfrey Chan | 2014-02-11 | 1 | -0/+4 | |
| * | | | | | Missed FlashHash#replace | Godfrey Chan | 2014-02-11 | 1 | -1/+1 | |
| * | | | | | Fixed broken flash tests | Godfrey Chan | 2014-02-11 | 2 | -5/+5 | |
| * | | | | | Fix AppGeneratorTest: serializer option was removed from session_store | Guillermo Iguaran | 2014-02-11 | 1 | -1/+1 | |
| * | | | | | Remove serializer option from session_store.rb template | Guillermo Iguaran | 2014-02-11 | 1 | -1/+1 | |
| * | | | | | Re-write legacy (marshal) cookies on read | Godfrey Chan | 2014-02-11 | 2 | -35/+57 | |
| * | | | | | Stringify the incoming hash in FlashHash | Guillermo Iguaran | 2014-02-11 | 1 | -1/+3 | |
| * | | | | | Convert FlashHash in a Hash with indifferent access | Guillermo Iguaran | 2014-02-11 | 2 | -4/+25 | |
| * | | | | | Changed the tests to ensure HybridSerializer actually migrates the cookies (c... | Godfrey Chan | 2014-02-11 | 1 | -10/+18 | |
| * | | | | | Fixed minor typo in test code | Godfrey Chan | 2014-02-11 | 1 | -1/+1 | |
| * | | | | | Tests for the HybridSerializer | Rafael Mendonça França | 2014-02-11 | 1 | -0/+68 | |
| * | | | | | Removed an old test | Godfrey Chan | 2014-02-11 | 1 | -5/+0 | |
| * | | | | | Added HybridSerializer to upgrade existing marshal cookies (wip: need tests) | Godfrey Chan | 2014-02-11 | 1 | -0/+14 | |
| * | | | | | Just very so slightly better test coverage | Godfrey Chan | 2014-02-11 | 1 | -15/+57 | |
| * | | | | | Renamed session_serializer option to cookies_serializer | Godfrey Chan | 2014-02-11 | 7 | -67/+64 | |
* | | | | | | Merge pull request #14029 from senny/dont_crash_on_empty_secrets_yml | Guillermo Iguaran | 2014-02-13 | 3 | -1/+14 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | do not crash when `config/secrets.yml` is blank. | Yves Senn | 2014-02-12 | 3 | -1/+14 | |
* | | | | | | Merge pull request #14035 from matthewd/pg_terminate_backend | Aaron Patterson | 2014-02-12 | 1 | -19/+29 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Terminate the backend ourselves on PG 9.2+ | Matthew Draper | 2014-02-12 | 1 | -19/+29 | |
|/ / / / / / | ||||||
* | | / / / | `execute` is a hotspot, so let's reduce branches | Aaron Patterson | 2014-02-12 | 1 | -6/+2 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #13761 from iainbeeston/refactor_out_render_object | Rafael Mendonça França | 2014-02-12 | 2 | -0/+11 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Added tests to render helper that expect `render partial: @foo` to | Iain Beeston | 2014-02-12 | 2 | -0/+11 | |
* | | | | | Merge pull request #14025 from xtian/rails-new-quiet | Yves Senn | 2014-02-12 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Hide bundler output for `rails new` if quiet option is specified. | Christian Wesselhoeft | 2014-02-11 | 1 | -1/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #14026 from sferik/rbx-2 | Carlos Antonio da Silva | 2014-02-12 | 2 | -7/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update Travis settings for Rubinius | Erik Michaels-Ober | 2014-02-12 | 2 | -7/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #14023 from prathamesh-sonpatki/assert_redirected_to | Carlos Antonio da Silva | 2014-02-12 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | [Testing Guide] Explain usage of assert_redirected_to with named routes and A... | Prathamesh Sonpatki | 2014-02-12 | 1 | -1/+1 | |
* | | | | | adding missed change | kayvan | 2014-02-11 | 1 | -1/+1 | |
* | | | | | adding connection parameter to check_pending for migrations | kayvan | 2014-02-11 | 1 | -5/+5 | |
* | | | | | add a send so `apply` can be called. Fixes #13510 | Aaron Patterson | 2014-02-11 | 2 | -1/+33 | |
* | | | | | Revert "Don't symbolize tainted data." [ci skip] | Xavier Noria | 2014-02-11 | 1 | -5/+1 | |
* | | | | | Merge pull request #14016 from devlinzed/i18n_doc_fix | Xavier Noria | 2014-02-11 | 1 | -1/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't symbolize tainted data. | devlin zed | 2014-02-11 | 1 | -1/+5 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #14015 from acapilleri/add_patch | Guillermo Iguaran | 2014-02-11 | 1 | -1/+1 | |
|\ \ \ \ \ |