aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14061 from davejachimiak/add_verb_in_guidesRafael Mendonça França2014-02-141-1/+1
|\
| * Add verb to sanitization noteDave Jachimiak2014-02-141-1/+1
|/
* Merge pull request #14060 from kassio/masterRafael Mendonça França2014-02-143-6/+6
|\
| * fix path shown in mailer's templatesKassio Borges2014-02-143-6/+6
|/
* Merge pull request #14048 from pcreux/better-error-message-db-migrate-downCarlos Antonio da Silva2014-02-141-1/+1
|\
| * Add hint to error message of task db:migrate:downPhilippe Creux2014-02-131-1/+1
* | Merge pull request #14057 from rajcybage/Ar_remove_unnecessary_fixturesCarlos Antonio da Silva2014-02-141-1/+1
|\ \
| * | remove unused fixtures from sqlite3 test casesRajarshi Das2014-02-141-1/+1
* | | Merge pull request #14059 from tbpgr/guides_active_support_core_extCarlos Antonio da Silva2014-02-141-0/+2
|\ \ \
| * | | fix guide active_support_core_extensions. add Note to String#indent [ci skip]tbpgr2014-02-141-0/+2
| |/ /
* | | Merge pull request #14058 from lantoli/masterRafael Mendonça França2014-02-141-1/+1
|\ \ \ | |/ / |/| |
| * | updated Travis build status image urlLeo Antoli2014-02-141-1/+1
|/ /
* | remove more delegate methodsAaron Patterson2014-02-131-7/+9
* | :scissors: whitespaceAaron Patterson2014-02-131-1/+0
* | rm delegate methods that are not actually usedAaron Patterson2014-02-131-2/+2
* | JoinHelper is never reused, so there is no need to separateAaron Patterson2014-02-133-42/+25
* | No variant should also be picked up by variant.any if variant.none is not def...David Heinemeier Hansson2014-02-132-1/+5
* | speed up the collection proxy reader method, but slow down the constructorAaron Patterson2014-02-131-1/+5
* | Merge pull request #14047 from strzalek/variants-array-checkDavid Heinemeier Hansson2014-02-132-2/+10
|\ \
| * | Check if variant array contains only symbolsŁukasz Strzałkowski2014-02-132-2/+10
* | | Merge pull request #14034 from hdabrows/drop-correct-index-when-reverting-mig...Yves Senn2014-02-134-4/+49
|\ \ \
| * | | Drop the correct index after reverting a migrationHubert Dąbrowski2014-02-134-4/+49
* | | | Merge pull request #14045 from arthurnn/kill_fibersGuillermo Iguaran2014-02-131-2/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Dont use Enumarator on join_associationArthur Neves2014-02-131-2/+4
* | | | Merge pull request #14043 from strzalek/variants-negotiationDavid Heinemeier Hansson2014-02-135-12/+51
|\ \ \ \
| * | | | Variant negotiationLukasz Strzalkowski2014-02-135-12/+51
* | | | | tests are responsible to clean up afterwards.Yves Senn2014-02-131-82/+114
|/ / / /
* | | | Merge pull request #13945 from rails/json_cookie_serializer_improvementsGuillermo Iguaran2014-02-1316-123/+316
|\ \ \ \
| * | | | rm warning about variable shadowingGodfrey Chan2014-02-111-2/+2
| * | | | Migrate hash-based cookie values correctlyGodfrey Chan2014-02-111-2/+4
| * | | | Updated CHANGELOG, docs, guides and release notes.Godfrey Chan2014-02-115-26/+44
| * | | | Added changelog entry for Flash changes [ci skip]Godfrey Chan2014-02-111-0/+4
| * | | | Missed FlashHash#replaceGodfrey Chan2014-02-111-1/+1
| * | | | Fixed broken flash testsGodfrey Chan2014-02-112-5/+5
| * | | | Fix AppGeneratorTest: serializer option was removed from session_storeGuillermo Iguaran2014-02-111-1/+1
| * | | | Remove serializer option from session_store.rb templateGuillermo Iguaran2014-02-111-1/+1
| * | | | Re-write legacy (marshal) cookies on readGodfrey Chan2014-02-112-35/+57
| * | | | Stringify the incoming hash in FlashHashGuillermo Iguaran2014-02-111-1/+3
| * | | | Convert FlashHash in a Hash with indifferent accessGuillermo Iguaran2014-02-112-4/+25
| * | | | Changed the tests to ensure HybridSerializer actually migrates the cookies (c...Godfrey Chan2014-02-111-10/+18
| * | | | Fixed minor typo in test codeGodfrey Chan2014-02-111-1/+1
| * | | | Tests for the HybridSerializerRafael Mendonça França2014-02-111-0/+68
| * | | | Removed an old testGodfrey Chan2014-02-111-5/+0
| * | | | Added HybridSerializer to upgrade existing marshal cookies (wip: need tests)Godfrey Chan2014-02-111-0/+14
| * | | | Just very so slightly better test coverageGodfrey Chan2014-02-111-15/+57
| * | | | Renamed session_serializer option to cookies_serializerGodfrey Chan2014-02-117-67/+64
* | | | | Merge pull request #14029 from senny/dont_crash_on_empty_secrets_ymlGuillermo Iguaran2014-02-133-1/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | do not crash when `config/secrets.yml` is blank.Yves Senn2014-02-123-1/+14
* | | | | Merge pull request #14035 from matthewd/pg_terminate_backendAaron Patterson2014-02-121-19/+29
|\ \ \ \ \
| * | | | | Terminate the backend ourselves on PG 9.2+Matthew Draper2014-02-121-19/+29
|/ / / / /