Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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. | |||||
| * | | | | | | | 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+ | |||||
| * | | | | | | | | Terminate the backend ourselves on PG 9.2+ | Matthew Draper | 2014-02-12 | 1 | -19/+29 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This should make it harder to accidentally break this test. | |||||
* | | / / / / / | `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 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Refactored object rendering in RenderingHelper#render into it's own method | |||||
| * | | | | | | Added tests to render helper that expect `render partial: @foo` to | Iain Beeston | 2014-02-12 | 2 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatically call @foo.to_partial_path Calling `render @foo` allows local variables but not options to be passed to the partial renderer. The correct way to render an object AND pass options to the partial renderer is to pass the object in the `:partial` parameter. However, there were previously no tests for this behaviour (in `render_helper_test.rb` at least). | |||||
* | | | | | | | 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. | |||||
| * | | | | | | | 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 | |||||
| * | | | | | | | Update Travis settings for Rubinius | Erik Michaels-Ober | 2014-02-12 | 2 | -7/+2 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | /cc @brixen | |||||
* | | | | | | | 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 ActiveRecord objects [ci skip] | |||||
| * | | | | | | [Testing Guide] Explain usage of assert_redirected_to with named routes and ↵ | Prathamesh Sonpatki | 2014-02-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record objects [ci skip] | |||||
* | | | | | | | 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 | |
| | | | | | | |