aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-1815-15/+83
|\
| * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-1811-9/+17
| * Correctly escape PostgreSQL arrays.Aaron Patterson2014-02-182-1/+13
| * Escape format, negative_format and units options of number helpersRafael Mendonça França2014-02-182-5/+53
* | Merge pull request #14097 from chancancode/sync_4_1_release_notesGodfrey Chan2014-02-181-3/+11
|\ \
| * | Sync 4.1 release notes with changes since 7f648bc7 [ci skip]Godfrey Chan2014-02-181-3/+11
|/ /
* | Merge pull request #14062 from sikachu/ps-render-formatRafael Mendonça França2014-02-1822-41/+762
|\ \
| * | Update upgrading guide regarding `render :text`Prem Sichanugrist2014-02-181-0/+19
| * | Add `#no_content_type` attribute to `AD::Response`Prem Sichanugrist2014-02-185-11/+25
| * | 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
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 09:02:07 +0000