aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9366 from killthekitten/fix-content_for-regressionRafael Mendonça França2013-02-283-1/+7
|\
| * Fix #9360 regression in content_forNikolay Shebanov2013-02-253-1/+7
* | Ensure plugins generated with plugin new can boot the dummy applicationJosé Valim2013-02-286-53/+51
* | Merge pull request #9484 from senny/9480_change_table_and_hstoreCarlos Antonio da Silva2013-02-286-9/+67
|\ \
| * | Support PostgreSQL specific column types when using `change_table`.Yves Senn2013-02-285-6/+64
| * | update docs, change_table does not use TableDefinition.Yves Senn2013-02-281-3/+3
* | | Minor changelog improvement [ci skip]Carlos Antonio da Silva2013-02-281-1/+1
|/ /
* | Remove redundant methodAndrew White2013-02-281-8/+0
* | Merge pull request #9469 from senny/9466_format_enforcing_routesAndrew White2013-02-273-1/+35
|\ \
| * | `format: true` does not override existing format constraints.Yves Senn2013-02-273-1/+35
* | | Enforce i18n version >= v0.6.4Carlos Antonio da Silva2013-02-271-1/+1
|/ /
* | Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric"Steve Klabnik2013-02-278-50/+18
* | Improve docs for AbsC::RenderingJosé Valim2013-02-271-3/+11
* | There's no need to access Railties through self.classSantiago Pastorino2013-02-271-1/+2
* | Merge pull request #9218 from Fivell/masterCarlos Antonio da Silva2013-02-273-1/+24
|\ \
| * | fix db_runtime attribute value after raising ActionView::MissingTemplate exc...Igor2013-02-273-1/+24
* | | Merge pull request #9457 from senny/remove_duplicated_number_helper_testsCarlos Antonio da Silva2013-02-271-298/+50
|\ \ \
| * | | 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 #9359 from justinwb/masterCarlos Antonio da Silva2013-02-271-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Removed template_root as a configuration optionJustin Bingham2013-02-211-1/+0
* | | | 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