Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
| | | | | | ||||||
* | | | | | add a send so `apply` can be called. Fixes #13510 | Aaron Patterson | 2014-02-11 | 2 | -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 Noria | 2014-02-11 | 1 | -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_fix | Xavier Noria | 2014-02-11 | 1 | -1/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | Documentation: Don't symbolize tainted data. [ci skip] | |||||
| * | | | | | Don't symbolize tainted data. | devlin zed | 2014-02-11 | 1 | -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. | |||||
* | | | | | Merge pull request #14015 from acapilleri/add_patch | Guillermo Iguaran | 2014-02-11 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | add patch in HTTP Verb Constraints [ci skip] | |||||
| * | | | | | add patch in HTTP Verb Constraints [ci skip] | Angelo capilleri | 2014-02-11 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | test case to illustrate current PostgreSQL composite behavior. | Yves Senn | 2014-02-11 | 1 | -0/+42 | |
| | | | | | ||||||
* | | | | | Merge pull request #13571 from bak/getting_started_guide | Vijay Dev | 2014-02-11 | 1 | -17/+32 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | A pass over the Getting Started guide sections 1, 2, and 3 [ci skip] | |||||
| * | | | | A pass over the Getting Started guide sections 1, 2, and 3 [ci skip] | Ben Cullen-Kerney | 2014-02-09 | 1 | -17/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add note about managing Ruby environments * Point to curated lists of Ruby learning resources * Expound on DRY and Convention over Configuration * Remove note on superuser--thankfuly coders new to Rails don't have to sudo anymore :) * Installation/verification instructions for SQLite3, since it's a dependency | |||||
* | | | | | Merge pull request #14008 from udaykadaboina/jqueryUpgrade | Carlos Antonio da Silva | 2014-02-11 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Upgraded jquery-rails gem version | |||||
| * | | | | | Upgraded jquery-rails gem version | Uday Kadaboina | 2014-02-03 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | docs, hide inflector comment targeting only contributors. [ci skip] | Yves Senn | 2014-02-11 | 1 | -1/+3 | |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to: https://github.com/rails/rails/commit/07c70245a128cfe42f134be8759963dc98f1a63e As suggested by @fxn this comment should not be visible in the API: https://github.com/rails/rails/commit/07c70245a128cfe42f134be8759963dc98f1a63e#commitcomment-5331658 | |||||
* | | | | Merge pull request #14007 from kintamanimatt/missing_directory_slashes | Rafael Mendonça França | 2014-02-10 | 1 | -9/+9 | |
|\ \ \ \ | | | | | | | | | | | Add missing directory slashes [ci skip] | |||||
| * | | | | Add missing directory slashes [ci skip] | Matthew Nicholas Bradley | 2014-02-10 | 1 | -9/+9 | |
| | | | | | ||||||
* | | | | | Avoid using deprecated arel constants | Rafael Mendonça França | 2014-02-10 | 2 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #13919 from jcoyne/fix_jruby_encoding | Rafael Mendonça França | 2014-02-10 | 2 | -3/+10 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix tidy_bytes for JRuby | |||||
| * | | | | | Fix tidy_bytes for JRuby | Justin Coyne | 2014-02-10 | 2 | -3/+10 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | The previous implementation was broken because JRuby (1.7.10) doesn't have a code converter for UTF-8 to UTF8-MAC. | |||||
* | | | | | docs, link to HTTP and CGI header definitions. [ci skip] | Yves Senn | 2014-02-10 | 2 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210 | |||||
* | | | | | docs, update broken link. [ci skip] | Yves Senn | 2014-02-10 | 1 | -2/+2 | |
|/ / / / | | | | | | | | | | | | | from https://github.com/rack/rack/blob/master/lib/rack/server.rb#L289-L300. |