aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Add missing CHANGELOG entry to Action ViewPrem Sichanugrist2014-02-181-0/+5
| * | | | | | Update guides for new rendering optionsPrem Sichanugrist2014-02-183-6/+38
| * | | | | | Cleanup `ActionController::Rendering`Prem Sichanugrist2014-02-181-11/+27
| * | | | | | Fix a fragile test on `action_view/render`Prem Sichanugrist2014-02-181-1/+1
| * | | | | | Introduce `render :html` for render HTML stringPrem Sichanugrist2014-02-188-3/+242
| * | | | | | Introduce `render :plain` for render plain textPrem Sichanugrist2014-02-186-4/+192
| * | | | | | Update hash format for render_text_testPrem Sichanugrist2014-02-181-18/+18
| * | | | | | Introduce `render :body` for render raw contentPrem Sichanugrist2014-02-1810-11/+219
|/ / / / / /
* | | | | | Merge pull request #14095 from rails/rm-scopesRafael Mendonça França2014-02-184-12/+146
|\ \ \ \ \ \
| * | | | | | Don't use `# =>` when it is not the expression valuesRafael Mendonça França2014-02-183-26/+26
| * | | | | | Fix the column name [ci skip]Rafael Mendonça França2014-02-183-14/+14
| * | | | | | Document the default scopes change on the release notes, CHANGELOGRafael Mendonça França2014-02-183-0/+134
| * | | | | | Aesthetic [ci skip]Rafael Mendonça França2014-02-181-4/+4
| * | | | | | Tell default_scope are prepended [ci skip]Rafael Mendonça França2014-02-181-1/+1
| * | | | | | Updated doc for default scope [ci skip]Rashmi Yadav2014-02-181-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #14094 from kalabiyau/fix_parameters_namingCarlos Antonio da Silva2014-02-181-2/+2
|\ \ \ \ \ \
| * | | | | | Fix parameter naming in RemoteIp middleware constructor methodKalabiYau2014-02-181-2/+2
| |/ / / / /
* | | | | | Move changelog entry to the top, fix examples indent [ci skip]Carlos Antonio da Silva2014-02-181-10/+10
* | | | | | Minor grammar/punctuation fixes [ci skip]Carlos Antonio da Silva2014-02-181-4/+3
* | | | | | Use assert_nil instead as its clearer about what the return is expected to beDavid Heinemeier Hansson2014-02-181-1/+1
* | | | | | Merge pull request #14096 from arthurnn/precompile_allGuillermo Iguaran2014-02-181-1/+1
|\ \ \ \ \ \
| * | | | | | Doc: assets:precompile:all was removed on 4 [skip ci]Arthur Neves2014-02-181-1/+1
| |/ / / / /
* / / / / / Added Object#present_in to simplify value whitelistingDavid Heinemeier Hansson2014-02-183-0/+29
|/ / / / /
* | | | | travel_to travels back and re-raises if the block raisesXavier Noria2014-02-182-3/+18
* | | | | adds a missing travel backXavier Noria2014-02-181-4/+4
* | | | | time helpers honor the application time zone when passed a dateXavier Noria2014-02-183-4/+37
* | | | | Merge pull request #14000 from Fortisque/kevin/stream_error_managementAaron Patterson2014-02-173-0/+27
|\ \ \ \ \
| * | | | | Correct prestreaming controller response status.Kevin Casey2014-02-153-0/+27
* | | | | | Merge pull request #14087 from 10io/patch-1Carlos Antonio da Silva2014-02-171-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix coffeescript sample [ci skip]David Fernandez2014-02-131-1/+1
* | | | | | Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"Rafael Mendonça França2014-02-173-21/+6
* | | | | | No need to use symbolsRafael Mendonça França2014-02-161-3/+3
* | | | | | Don't skip tests if they are not broken. Just don't define theyRafael Mendonça França2014-02-162-9/+5
* | | | | | Fix typo [ci skip]Rafael Mendonça França2014-02-162-2/+2
* | | | | | Merge pull request #13512 from gsamokovarov/hstore_arrays_fixGuillermo Iguaran2014-02-164-7/+52
|\ \ \ \ \ \
| * | | | | | Resolve encoding issues with arrays of hstore (bug 11135).Josh Goodall2014-02-174-7/+52
|/ / / / / /
* | | | | | Merge pull request #13937 from ktaragorn/guides_fixesVijay Dev2014-02-162-3/+14
|\ \ \ \ \ \
| * | | | | | Getting started guide fixes & Explain X-SendFile a little better, with linksKarthik T2014-02-142-3/+14
* | | | | | | Merge pull request #14072 from robin850/patch-16Rafael Mendonça França2014-02-151-0/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add a missing changelog entry for #13981 and #14035Robin Dupret2014-02-151-0/+7
|/ / / / / /
* | | | | | Merge pull request #14069 from arunagw/aa-plugin-generator-build-fixCarlos Antonio da Silva2014-02-151-4/+1
|\ \ \ \ \ \
| * | | | | | Revert "Fixed plugin_generator test"Arun Agrawal2014-02-151-4/+1
|/ / / / / /
* | | | | | implements new option :month_format_string for date select helpers [Closes #1...Xavier Noria2014-02-153-9/+48
* | | | | | add factory methods for empty alias trackersAaron Patterson2014-02-143-23/+38
* | | | | | guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-143-6/+12
* | | | | | stop exposing table_joinsAaron Patterson2014-02-141-4/+3
* | | | | | make most parameters to the AliasTracker requiredAaron Patterson2014-02-142-6/+4
* | | | | | make a singleton for AssociationScopeAaron Patterson2014-02-143-3/+8
* | | | | | pass the association and connection to the scope methodAaron Patterson2014-02-143-11/+7
* | | | | | pass the tracker down the stack and construct it in the scope methodAaron Patterson2014-02-141-18/+18