Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Update guides for new rendering options | Prem Sichanugrist | 2014-02-18 | 3 | -6/+38 | |
| * | | | | | | | Cleanup `ActionController::Rendering` | Prem Sichanugrist | 2014-02-18 | 1 | -11/+27 | |
| * | | | | | | | Fix a fragile test on `action_view/render` | Prem Sichanugrist | 2014-02-18 | 1 | -1/+1 | |
| * | | | | | | | Introduce `render :html` for render HTML string | Prem Sichanugrist | 2014-02-18 | 8 | -3/+242 | |
| * | | | | | | | Introduce `render :plain` for render plain text | Prem Sichanugrist | 2014-02-18 | 6 | -4/+192 | |
| * | | | | | | | Update hash format for render_text_test | Prem Sichanugrist | 2014-02-18 | 1 | -18/+18 | |
| * | | | | | | | Introduce `render :body` for render raw content | Prem Sichanugrist | 2014-02-18 | 10 | -11/+219 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14095 from rails/rm-scopes | Rafael Mendonça França | 2014-02-18 | 4 | -12/+146 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't use `# =>` when it is not the expression values | Rafael Mendonça França | 2014-02-18 | 3 | -26/+26 | |
| * | | | | | | | Fix the column name [ci skip] | Rafael Mendonça França | 2014-02-18 | 3 | -14/+14 | |
| * | | | | | | | Document the default scopes change on the release notes, CHANGELOG | Rafael Mendonça França | 2014-02-18 | 3 | -0/+134 | |
| * | | | | | | | Aesthetic [ci skip] | Rafael Mendonça França | 2014-02-18 | 1 | -4/+4 | |
| * | | | | | | | Tell default_scope are prepended [ci skip] | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 | |
| * | | | | | | | Updated doc for default scope [ci skip] | Rashmi Yadav | 2014-02-18 | 1 | -4/+4 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #14094 from kalabiyau/fix_parameters_naming | Carlos Antonio da Silva | 2014-02-18 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix parameter naming in RemoteIp middleware constructor method | KalabiYau | 2014-02-18 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Move changelog entry to the top, fix examples indent [ci skip] | Carlos Antonio da Silva | 2014-02-18 | 1 | -10/+10 | |
* | | | | | | | Minor grammar/punctuation fixes [ci skip] | Carlos Antonio da Silva | 2014-02-18 | 1 | -4/+3 | |
* | | | | | | | Use assert_nil instead as its clearer about what the return is expected to be | David Heinemeier Hansson | 2014-02-18 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #14096 from arthurnn/precompile_all | Guillermo Iguaran | 2014-02-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Doc: assets:precompile:all was removed on 4 [skip ci] | Arthur Neves | 2014-02-18 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* / / / / / / | Added Object#present_in to simplify value whitelisting | David Heinemeier Hansson | 2014-02-18 | 3 | -0/+29 | |
|/ / / / / / | ||||||
* | | | | | | travel_to travels back and re-raises if the block raises | Xavier Noria | 2014-02-18 | 2 | -3/+18 | |
* | | | | | | adds a missing travel back | Xavier Noria | 2014-02-18 | 1 | -4/+4 | |
* | | | | | | time helpers honor the application time zone when passed a date | Xavier Noria | 2014-02-18 | 3 | -4/+37 | |
* | | | | | | Merge pull request #14000 from Fortisque/kevin/stream_error_management | Aaron Patterson | 2014-02-17 | 3 | -0/+27 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Correct prestreaming controller response status. | Kevin Casey | 2014-02-15 | 3 | -0/+27 | |
* | | | | | | | Merge pull request #14087 from 10io/patch-1 | Carlos Antonio da Silva | 2014-02-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Fix coffeescript sample [ci skip] | David Fernandez | 2014-02-13 | 1 | -1/+1 | |
* | | | | | | | Revert "Merge pull request #13344 from ccutrer/fix-from-default-select" | Rafael Mendonça França | 2014-02-17 | 3 | -21/+6 | |
* | | | | | | | No need to use symbols | Rafael Mendonça França | 2014-02-16 | 1 | -3/+3 | |
* | | | | | | | Don't skip tests if they are not broken. Just don't define they | Rafael Mendonça França | 2014-02-16 | 2 | -9/+5 | |
* | | | | | | | Fix typo [ci skip] | Rafael Mendonça França | 2014-02-16 | 2 | -2/+2 | |
* | | | | | | | Merge pull request #13512 from gsamokovarov/hstore_arrays_fix | Guillermo Iguaran | 2014-02-16 | 4 | -7/+52 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Resolve encoding issues with arrays of hstore (bug 11135). | Josh Goodall | 2014-02-17 | 4 | -7/+52 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #13937 from ktaragorn/guides_fixes | Vijay Dev | 2014-02-16 | 2 | -3/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Getting started guide fixes & Explain X-SendFile a little better, with links | Karthik T | 2014-02-14 | 2 | -3/+14 | |
* | | | | | | | | Merge pull request #14072 from robin850/patch-16 | Rafael Mendonça França | 2014-02-15 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add a missing changelog entry for #13981 and #14035 | Robin Dupret | 2014-02-15 | 1 | -0/+7 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14069 from arunagw/aa-plugin-generator-build-fix | Carlos Antonio da Silva | 2014-02-15 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Revert "Fixed plugin_generator test" | Arun Agrawal | 2014-02-15 | 1 | -4/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | implements new option :month_format_string for date select helpers [Closes #1... | Xavier Noria | 2014-02-15 | 3 | -9/+48 | |
* | | | | | | | add factory methods for empty alias trackers | Aaron Patterson | 2014-02-14 | 3 | -23/+38 | |
* | | | | | | | guarantee a list in the alias tracker so we can remove a conditional | Aaron Patterson | 2014-02-14 | 3 | -6/+12 | |
* | | | | | | | stop exposing table_joins | Aaron Patterson | 2014-02-14 | 1 | -4/+3 | |
* | | | | | | | make most parameters to the AliasTracker required | Aaron Patterson | 2014-02-14 | 2 | -6/+4 | |
* | | | | | | | make a singleton for AssociationScope | Aaron Patterson | 2014-02-14 | 3 | -3/+8 | |
* | | | | | | | pass the association and connection to the scope method | Aaron Patterson | 2014-02-14 | 3 | -11/+7 | |
* | | | | | | | pass the tracker down the stack and construct it in the scope method | Aaron Patterson | 2014-02-14 | 1 | -18/+18 | |
* | | | | | | | clean up add_constraints signature | Aaron Patterson | 2014-02-14 | 1 | -8/+9 |