aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵David Heinemeier Hansson2014-02-132-1/+5
| | | | defined (just like any other variant)
* 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
| * Check if variant array contains only symbolsŁukasz Strzałkowski2014-02-132-2/+10
| |
* | Merge pull request #14034 from ↵Yves Senn2014-02-134-4/+49
|\ \ | | | | | | | | | | | | hdabrows/drop-correct-index-when-reverting-migration Drop the correct index after reverting a migration
| * | Drop the correct index after reverting a migrationHubert Dąbrowski2014-02-134-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_fibersGuillermo Iguaran2014-02-131-2/+4
|\ \ \ | |_|/ |/| | Dont use Enumarator on join_association
| * | 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 negotiation
| * | | Variant negotiationLukasz Strzalkowski2014-02-135-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 Senn2014-02-131-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_improvementsGuillermo Iguaran2014-02-1316-123/+316
|\ \ \ | | | | | | | | Cookies serializer improvements
| * | | 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
| | | | | | | | | | | | | | | | Also added a `cookies_serializer.rb` initializer to the app template.
| * | | 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
| | | | | | | | | | | | | | | | | | | | Stringify the incoming as well to handle incoming symbol keys from marshalled sessions
| * | | Convert FlashHash in a Hash with indifferent accessGuillermo Iguaran2014-02-112-4/+25
| | | |
| * | | Changed the tests to ensure HybridSerializer actually migrates the cookies ↵Godfrey Chan2014-02-111-10/+18
| | | | | | | | | | | | | | | | (currently failing)
| * | | 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.
| * | | 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+
| * | | | Terminate the backend ourselves on PG 9.2+Matthew Draper2014-02-121-19/+29
|/ / / / | | | | | | | | | | | | This should make it harder to accidentally break this test.
* | | / `execute` is a hotspot, so let's reduce branchesAaron Patterson2014-02-121-6/+2
| |_|/ |/| |
* | | Merge pull request #13761 from iainbeeston/refactor_out_render_objectRafael Mendonça França2014-02-122-0/+11
|\ \ \ | |/ / |/| | Refactored object rendering in RenderingHelper#render into it's own method
| * | Added tests to render helper that expect `render partial: @foo` toIain Beeston2014-02-122-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-quietYves Senn2014-02-121-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 Wesselhoeft2014-02-111-1/+2
| |/ /
* | | Merge pull request #14026 from sferik/rbx-2Carlos Antonio da Silva2014-02-122-7/+2
|\ \ \ | | | | | | | | Update Travis settings for Rubinius
| * | | Update Travis settings for RubiniusErik Michaels-Ober2014-02-122-7/+2
|/ / / | | | | | | | | | /cc @brixen
* | | Merge pull request #14023 from prathamesh-sonpatki/assert_redirected_toCarlos Antonio da Silva2014-02-121-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 Sonpatki2014-02-121-1/+1
| | | | | | | | | | | | Active Record objects [ci skip]
* | | adding missed changekayvan2014-02-111-1/+1
| | |
* | | adding connection parameter to check_pending for migrationskayvan2014-02-111-5/+5
| | |
* | | add a send so `apply` can be called. Fixes #13510Aaron Patterson2014-02-112-1/+33
| | | | | | | | | | | | | | | | | | | | | THIS IS A HUGE HACK. Thor does not allow us to define public methods without turning them in to "thor tasks". That means we cannot subclass the `apply` method and make it public, so we have to make the method private and call `send` on it.
* | | Revert "Don't symbolize tainted data." [ci skip]Xavier Noria2014-02-111-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reason: i18n whitelists now locales without passing through symbols, see https://github.com/svenfuchs/i18n/blob/master/lib/i18n.rb#L278. Therefore, this snippet is no longer a good practice. This reverts commit ec0664a6eb8906fcd31a53a1efad69bdc7fe6f5b.
* | | Merge pull request #14016 from devlinzed/i18n_doc_fixXavier Noria2014-02-111-1/+5
|\ \ \ | | | | | | | | Documentation: Don't symbolize tainted data. [ci skip]
| * | | Don't symbolize tainted data.devlin zed2014-02-111-1/+5
|/ / / | | | | | | | | | | | | | | | | | | `I18n.locale=` symbolizes its argument, so passing it `params[:locale]` allows one to DOS your application by visiting `...?locale=` URLS repeatedly, with unique values, until the never-GCed symbols monopolize the available memory.