aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cleanup AP number_helpers_testYves Senn2013-02-271-47/+47
* remove duplicated number_helper tests in AP. They are already in AS.Yves Senn2013-02-271-270/+22
* Merge pull request #9452 from frodsan/remove_private_attribute_warningSteve Klabnik2013-02-261-1/+3
|\
| * remove private attribute? warningFrancesco Rodriguez2013-02-261-1/+3
* | Merge pull request #9439 from senny/9435_router_params_as_integersAndrew White2013-02-263-1/+33
|\ \
| * | allow non-String default params in the router.Yves Senn2013-02-263-1/+33
|/ /
* | Merge pull request #9437 from senny/9432_undefined_method_source_in_routesAndrew White2013-02-263-12/+62
|\ \
| * | the router allows String contraints.Yves Senn2013-02-263-12/+62
|/ /
* | Merge pull request #8010 from subwindow/postgres_inet_default_fixAaron Patterson2013-02-263-9/+20
|\ \
| * | Fix default output for postgres network address typesErik Peterson2013-02-263-9/+20
|/ /
* | Move AS CHANGELOG entry up.Steve Klabnik2013-02-261-2/+3
* | Merge pull request #9329 from chuckbjones/fix-cache-delete-rcSteve Klabnik2013-02-263-2/+16
|\ \
| * | Fix deletion of empty directories:Charles Jones2013-02-253-2/+16
* | | We want i18n >= 0.6.2 but < 1.0Santiago Pastorino2013-02-261-1/+1
* | | Merge pull request #9446 from bemurphy/enhance_root_route_guideCarlos Antonio da Silva2013-02-261-0/+10
|\ \ \
| * | | Add routing guide doc on root with namespaces.Brendon Murphy2013-02-261-0/+10
* | | | Merge pull request #9443 from exviva/belongs_to_touch_new_recordRafael Mendonça França2013-02-263-2/+19
|\ \ \ \
| * | | | Fix touching an invalid parent record for belongs_toOlek Janiszewski2013-02-263-2/+19
|/ / / /
* | | | Move the CHANGELOG entry to the proper placeRafael Mendonça França2013-02-261-2/+4
* | | | Merge pull request #9434 from zires/devRafael Mendonça França2013-02-263-1/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful excepti...zires2013-02-273-1/+7
| | |/ | |/|
* | | Merge pull request #9442 from czarneckid/adjust-generator-languageXavier Noria2013-02-261-1/+1
|\ \ \
| * | | Use less hyperbole in the language re: allowed parametersDavid Czarnecki2013-02-261-1/+1
| | |/ | |/|
* | | Merge pull request #9444 from frodsan/add_test_for_977455ccRafael Mendonça França2013-02-261-0/+16
|\ \ \
| * | | Add tests for #9441Francesco Rodriguez2013-02-261-0/+16
| |/ /
* | | Update CHANGELOGSRafael Mendonça França2013-02-267-5/+30
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-2613-23/+37
|\ \ \ | |/ / |/| |
| * | Typo fixCarson McDonald2013-02-251-1/+1
| * | BELONGS TO ASSOCIATION | Typo fixlibin2013-02-251-1/+1
| * | Update guide doc to use migration shortcutsQihuan Piao2013-02-251-1/+1
| * | Wrap `around_action` word with <code> tagQihuan Piao2013-02-251-1/+1
| * | Added documentation for beginning_of_minute and end_of_minute to Active Suppo...Gagan Awhad2013-02-221-1/+19
| * | Link is not relevant anymorebobbus2013-02-221-5/+0
| * | Typo fix.Carson McDonald2013-02-211-1/+1
| * | Update the "upgrading" guide for people coming from 3.0 and 3.1. The latest v...Arne Brasseur2013-02-201-4/+4
| * | improve grammar describing ActionDispatch::Cookies::CookieJar#deleteWeston Platter2013-02-191-1/+1
| * | improve grammar describing ActionDispatch::Cookies::CookieJar#deleteWeston Platter2013-02-191-1/+1
| * | Corrected link anchor and added colons for continuityDoug Yun2013-02-192-3/+3
| * | Fix bug in code example from layouts and rendering guideBrian Kim2013-02-181-1/+2
| * | Update guides/source/active_record_querying.mdHanfei Shen2013-02-191-2/+2
| * | clarify singular and plural routesNoam Gagliardi2013-02-181-1/+1
* | | Merge pull request #9441 from rubys/masterGuillermo Iguaran2013-02-261-2/+9
|\ \ \
| * | | Allow both a path and an option on root in config/routesSam Ruby2013-02-261-2/+9
|/ / /
* | | Merge pull request #9414 from senny/9275_order_with_symbol_and_joinRafael Mendonça França2013-02-264-2/+34
|\ \ \
| * | | Expand order(:symbol) to "table".symbol to prevent broken queries on PG.Yves Senn2013-02-254-3/+35
* | | | No need to send public methodsAkira Matsuda2013-02-263-3/+3
* | | | Merge pull request #9429 from frodsan/racc_jruby_incompatibilityGuillermo Iguaran2013-02-251-3/+3
|\ \ \ \
| * | | | JRuby does not support racc, include it only in ruby platformFrancesco Rodriguez2013-02-261-3/+3
* | | | | Merge pull request #9419 from banyan/change-default-root-route-helperGuillermo Iguaran2013-02-253-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change default root route helperKohei Hasegawa2013-02-263-4/+4