aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update version to 4.2.0.alphaYves Senn2014-02-239-11/+11
* Add tests for default scope behaviour changeJon Leighton2014-02-232-0/+20
* Merge pull request #13515 from kuldeepaggarwal/f-model-generationGodfrey Chan2014-02-225-12/+40
|\
| * Add warning when user tried to create model with pluralize name.Kuldeep Aggarwal2014-02-235-12/+40
* | Merge pull request #14164 from vajrasky/fix_typo_max_idGuillermo Iguaran2014-02-221-1/+1
|\ \
| * | Fixed typo in comment about MAX_ID.Vajrasky Kok2014-02-231-1/+1
* | | Distinguish ConnectionNotEstablished messages: no conn pool for the class, or...Jeremy Kemper2014-02-221-1/+4
* | | Merge pull request #14140 from WojtekKruszewski/optimize_foreign_key_forCarlos Antonio da Silva2014-02-211-1/+1
|\ \ \
| * | | Prevent foreign_key_for? from type casting all attributesWojtek Kruszewski2014-02-211-1/+1
* | | | Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665."Guillermo Iguaran2014-02-213-26/+2
|/ / /
* | / releasing Rails no longer needs triggering docs generation by hand [ci skip]Xavier Noria2014-02-202-37/+0
| |/ |/|
* | Merge pull request #14131 from kuldeepaggarwal/upgrade-rails-versionArthur Nogueira Neves2014-02-201-2/+2
|\ \
| * | [ci skip] update guides to new version of rails 3.2.xKuldeep Aggarwal2014-02-211-2/+2
|/ /
* | adding a test for #14106Aaron Patterson2014-02-201-0/+25
* | Revert "context in validation goes through has many relationship"Aaron Patterson2014-02-204-27/+1
* | Merge pull request #14129 from joankaradimov/fix-render-to-stringCarlos Antonio da Silva2014-02-201-1/+3
|\ \
| * | Check if the `request` variable isn't nil when calling render_to_stringJoan Karadimov2014-02-201-1/+3
* | | Merge pull request #14086 from jingweno/masterArthur Nogueira Neves2014-02-201-1/+1
|\ \ \
| * | | [skip ci] Fix the javascript path in guide for asset modulesJingwen Owen Ou2014-02-201-1/+1
* | | | Merge pull request #14124 from arthurnn/fix_14116Aaron Patterson2014-02-202-5/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Add regression test for collection proxy readerArthur Neves2014-02-201-0/+7
| * | | Revert "speed up the collection proxy reader method, but slow down the constr...Arthur Neves2014-02-201-5/+1
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-201-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Add tip about using RDoc's --pipe command to quickly test the output ofZachary Scott2014-02-101-0/+7
* | | | Merge pull request #14120 from gregmolnar/guidesCarlos Antonio da Silva2014-02-201-3/+3
|\ \ \ \
| * | | | change 'assert !' to 'assert_not' in guides [ci skip]Greg Molnar2014-02-201-3/+3
|/ / / /
* | | | Pointing to latest guides [ci skip]Arun Agrawal2014-02-191-1/+1
* | | | Merge pull request #14102 from arthurnn/quietly_docXavier Noria2014-02-191-0/+4
|\ \ \ \
| * | | | Methods silence_stream/quietly are not thread-safe [skip ci]Arthur Neves2014-02-191-0/+4
* | | | | Merge pull request #14107 from prakashmurthy/patch-1Arun Agrawal2014-02-191-1/+1
|\ \ \ \ \
| * | | | | [ci skip] Close the meta tag with '/>' instead of '>'Prakash Murthy2014-02-191-1/+1
|/ / / / /
* | | | | Fix render plain docs example in AM::BaseGuillermo Iguaran2014-02-181-2/+2
* | | | | Merge pull request #14099 from robertomiranda/render-text-2-plainGuillermo Iguaran2014-02-184-11/+11
|\ \ \ \ \
| * | | | | Update Docs in favor to use render plain instead of text optionrobertomiranda2014-02-184-11/+11
|/ / / / /
* | | | | Merge pull request #14098 from Amit-Thawait/masterArthur Nogueira Neves2014-02-182-2/+2
|\ \ \ \ \
| * | | | | Typo fix for unscopeAmit Thawait2014-02-182-2/+2
|/ / / / /
* | | | | Use the reference for the mime type to get the formatRafael Mendonça França2014-02-184-2/+36
* | | | | 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