Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | remove railties changes. fixes #14054 | Aaron Patterson | 2014-02-14 | 6 | -191/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 96991e8e919edfb20cc4120bca4e36ed51175d57 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:29:24 2014 -0800 Revert "gems can be added or skipped from the template" This reverts commit 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356. Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb railties/test/generators/app_generator_test.rb commit 35599c0e657245ef14ac0f28c9189ad16acf40e6 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:26:53 2014 -0800 Revert "oops, template replay needs to happen after bundle. :orz:" This reverts commit 9104702be61253f9448ca070a22fc86bb4299555. Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb commit f519c3902c313db8e906a49251c91643b8e6499e Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:51 2014 -0800 Revert "only ask for these ivars if the target responds to them" This reverts commit 656d412546cd97d5660c634c2a41c799d3f9e211. commit aa524a9428e3e4c45fe221f10a66a08efb827ab5 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:39 2014 -0800 Revert "refactor generator tests to use block form of Tempfile" This reverts commit 65251820ef0ab7f3cffb38130de3dd41af8d72be. commit 7d3740549fa4dfa62e3761f8d4bc6d6d441256e7 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:25 2014 -0800 Revert "add a more restricted codepath for templates fixes #13390" This reverts commit 2875b4a66e38e4333da887a4afbed33358999298. commit 525df0af1001918986cdfce59539fd2d52c4f32c Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:11 2014 -0800 Revert "add a send so `apply` can be called. Fixes #13510" This reverts commit c5034d60dba0cd31a6a8c612ee35d63b8127793a. | |||||
* | | | remove chain delegate | Aaron Patterson | 2014-02-14 | 1 | -5/+6 | |
| | | | ||||||
* | | | remove scope_chain delegate | Aaron Patterson | 2014-02-14 | 1 | -3/+3 | |
| | | | ||||||
* | | | 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 | |||||
| * | | | 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 | |||||
| * | | | 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 | |||||
| * | | | 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 case | |||||
| * | | | | 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 | |
|\ \ \ \ \ | | | | | | | | | | | | | [Guides] fix guide active_support_core_extensions. add Note to String#indent [ci skip] | |||||
| * | | | | | 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 | |||||
| * | | | | 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 ↵ | David Heinemeier Hansson | 2014-02-13 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | defined (just like any other variant) | |||||
* | | | | 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 | |||||
| * | | | | Check if variant array contains only symbols | Łukasz Strzałkowski | 2014-02-13 | 2 | -2/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #14034 from ↵ | Yves Senn | 2014-02-13 | 4 | -4/+49 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | hdabrows/drop-correct-index-when-reverting-migration Drop the correct index after reverting a migration | |||||
| * | | | | | Drop the correct index after reverting a migration | Hubert Dąbrowski | 2014-02-13 | 4 | -4/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when reverting a migration which added a named index it would instead drop a corresponding index with matching columns but without a name. | |||||
* | | | | | | Merge pull request #14045 from arthurnn/kill_fibers | Guillermo Iguaran | 2014-02-13 | 1 | -2/+4 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Dont use Enumarator on join_association | |||||
| * | | | | | 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 | |||||
| * | | | | | Variant negotiation | Lukasz Strzalkowski | 2014-02-13 | 5 | -12/+51 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting `request.variant` as an array - an order in which they will be rendered. For example: request.variant = [:tablet, :phone] respond_to do |format| format.html.none format.html.phone # this gets rendered end | |||||
* | | | | | | tests are responsible to clean up afterwards. | Yves Senn | 2014-02-13 | 1 | -82/+114 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | remove created state after test execution, not before the next test. This prevents the leak of the `ex` table outside of a single test. | |||||
* | | | | | Merge pull request #13945 from rails/json_cookie_serializer_improvements | Guillermo Iguaran | 2014-02-13 | 16 | -123/+316 | |
|\ \ \ \ \ | | | | | | | | | | | | | Cookies serializer improvements | |||||
| * | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Also added a `cookies_serializer.rb` initializer to the app template. | |||||
| * | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stringify the incoming as well to handle incoming symbol keys from marshalled sessions | |||||
| * | | | | | 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 ↵ | Godfrey Chan | 2014-02-11 | 1 | -10/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (currently failing) | |||||
| * | | | | | 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. |