Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #14061 from davejachimiak/add_verb_in_guides | Rafael Mendonça França | 2014-02-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add verb to sanitization note | Dave Jachimiak | 2014-02-14 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14060 from kassio/master | Rafael Mendonça França | 2014-02-14 | 3 | -6/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix path shown in mailer's templates | Kassio Borges | 2014-02-14 | 3 | -6/+6 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14048 from pcreux/better-error-message-db-migrate-down | Carlos Antonio da Silva | 2014-02-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add hint to error message of task db:migrate:down | Philippe Creux | 2014-02-13 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #14057 from rajcybage/Ar_remove_unnecessary_fixtures | Carlos Antonio da Silva | 2014-02-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | remove unused fixtures from sqlite3 test cases | Rajarshi Das | 2014-02-14 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #14059 from tbpgr/guides_active_support_core_ext | Carlos Antonio da Silva | 2014-02-14 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix guide active_support_core_extensions. add Note to String#indent [ci skip] | tbpgr | 2014-02-14 | 1 | -0/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #14058 from lantoli/master | Rafael Mendonça França | 2014-02-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | updated Travis build status image url | Leo Antoli | 2014-02-14 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | remove more delegate methods | Aaron Patterson | 2014-02-13 | 1 | -7/+9 | |
* | | | | | | | :scissors: whitespace | Aaron Patterson | 2014-02-13 | 1 | -1/+0 | |
* | | | | | | | rm delegate methods that are not actually used | Aaron Patterson | 2014-02-13 | 1 | -2/+2 | |
* | | | | | | | JoinHelper is never reused, so there is no need to separate | Aaron Patterson | 2014-02-13 | 3 | -42/+25 | |
* | | | | | | | 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 | |
|/ / / / / / / / / |