aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9495 from trevorturk/upgrade-guideJeremy Kemper2013-02-281-1/+69
|\ | | | | Add some more documentation to the upgrade guide
| * Document introduction of ActionDispatch::ParamsParser::ParseErrorTrevor Turk2013-02-281-0/+2
| |
| * Document that scopes require a callable objectTrevor Turk2013-02-281-1/+9
| |
| * Document common deprecationsTrevor Turk2013-02-281-0/+11
| |
| * Document the deprecation of ActionView::RecordIdentifierTrevor Turk2013-02-281-0/+2
| |
| * Document ActiveRecord::Fixtures becoming ActiveRecord::FixtureSetTrevor Turk2013-02-281-0/+2
| |
| * Document change in routes using matchTrevor Turk2013-02-281-0/+13
| |
| * Document removal of assets:precompile:primaryTrevor Turk2013-02-281-0/+4
| |
| * Document sass-rails asset_url deprecationTrevor Turk2013-02-281-0/+4
| |
| * Document caveat from 5b3bb61 which fixed handling SCRIPT_NAME from within ↵Trevor Turk2013-02-281-0/+3
| | | | | | | | mounted engine
| * Document rails-observers extractionTrevor Turk2013-02-281-0/+4
| |
| * Document the switch from memcache-client to dalliTrevor Turk2013-02-281-0/+2
| |
| * Improve docs for UpgradeSignatureToEncryptionCookieStoreTrevor Turk2013-02-281-1/+10
| |
| * Document extraction of actionpack-xml_parserTrevor Turk2013-02-281-0/+2
| |
| * Document introduction of the ActionController::UnknownFormat exceptionTrevor Turk2013-02-281-0/+2
| |
* | Improve the CHANGELOG entryRafael Mendonça França2013-02-281-2/+3
| | | | | | | | [ci skip]
* | Merge pull request #9493 from kennyj/fix_wrong_exceptionRafael Mendonça França2013-02-283-0/+13
|\ \ | | | | | | | | | | | | Wrong exception is occured when raising no translatable exception Closes #8617
| * | Wrong exception is occured when raising no translatable exceptionkennyj2013-03-013-0/+13
| | |
* | | Improve the CHANGELOG entryRafael Mendonça França2013-02-281-2/+6
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #9366 from killthekitten/fix-content_for-regressionRafael Mendonça França2013-02-283-1/+7
|\ \ \ | |_|/ |/| | Fix for #9360 content_for regression
| * | 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`. We use `TableDefinition` for `#create_table` and `Table` for `#change_table`. The PostgreSQL sepcific types were only defined on `TableDefinition` so they needed to be added to `Table` as well.
| * | Support PostgreSQL specific column types when using `change_table`.Yves Senn2013-02-285-6/+64
| | | | | | | | | | | | | | | | | | | | | | | | Closes #9480. We use `TableDefinition` for `#create_table` and `Table` for `#change_table`. The PostgreSQL sepcifc types were only defined on `TableDefinition` so I also added them to `Table`.
| * | 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.
| * | `format: true` does not override existing format constraints.Yves Senn2013-02-273-1/+35
| | | | | | | | | | | | | | | | | | | | | Closes #9466. Passing `format: true` used to override the constraints: { format: /json/ } with `/.+/`. This patch only sets the format if there is no constraint present.
* | | Enforce i18n version >= v0.6.4Carlos Antonio da Silva2013-02-271-1/+1
|/ / | | | | | | Keep in sync with 3-2-stable.
* | Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric"Steve Klabnik2013-02-278-50/+18
| | | | | | | | | | This reverts commit 408227d9c5ed7de26310d72a1a99c1ee02311c63, reversing changes made to dca0b57d03deffc933763482e615c3cf0b9a1d97.
* | 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
| | | | | | | | Closes #9386
* | Merge pull request #9218 from Fivell/masterCarlos Antonio da Silva2013-02-273-1/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix calculation of db_runtime property in ActiveRecord::Railties::ControllerRuntime#cleanup_view_runtime. Previously, after raising ActionView::MissingTemplate, db_runtime was not populated. Closes #9218, Fixes #9215. Conflicts: activerecord/CHANGELOG.md
| * | fix db_runtime attribute value after raising ActionView::MissingTemplate ↵Igor2013-02-273-1/+24
| | | | | | | | | | | | exception
* | | Merge pull request #9457 from senny/remove_duplicated_number_helper_testsCarlos Antonio da Silva2013-02-271-298/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated number_helper tests in AP. They are already in AS. With 155cd5e the number_helpers were moved into AS all the tests were copied over but the tests in AP were not deleted. This is confusing. This removes all duplicated tests and reorganized the tests in AP to only test the functionality, that is added in AP. Also cleanup some of the number helper tests.
| * | | cleanup AP number_helpers_testYves Senn2013-02-271-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | * use 1.9 style hash syntax * don't use brances on assert_equal * prefere " over '
| * | | remove duplicated number_helper tests in AP. They are already in AS.Yves Senn2013-02-271-270/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With 155cd5e6 the number_helpers were moved into AS all the tests were copied over but the tests in AP were not deleted. This is confusing. I removed all duplicated tests and reorganized the tests in AP to only test the functionality, that is added in AP.
* | | | Merge pull request #9359 from justinwb/masterCarlos Antonio da Silva2013-02-271-1/+0
|\ \ \ \ | |/ / / |/| | | Removed template_root as a configuration option
| * | | Removed template_root as a configuration optionJustin Bingham2013-02-211-1/+0
| | | | | | | | | | | | Removed template root from actionmailer configuration options as it seems to have been pulled out completely in favor of explicit definition via template_path / template_name.
* | | | Merge pull request #9452 from frodsan/remove_private_attribute_warningSteve Klabnik2013-02-261-1/+3
|\ \ \ \ | | | | | | | | | | remove private attribute? warning
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | convert non-string default params to strings in the router.
| * | | | | allow non-String default params in the router.Yves Senn2013-02-263-1/+33
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9435. Skip valid encoding checks for non-String parameters that come from the matched route's defaults.
* | | | | Merge pull request #9437 from senny/9432_undefined_method_source_in_routesAndrew White2013-02-263-12/+62
|\ \ \ \ \ | | | | | | | | | | | | the router allows String contraints.
| * | | | | the router allows String contraints.Yves Senn2013-02-263-12/+62
|/ / / / / | | | | | | | | | | | | | | | Closes #9432.
* | | | | Merge pull request #8010 from subwindow/postgres_inet_default_fixAaron Patterson2013-02-263-9/+20
|\ \ \ \ \ | | | | | | | | | | | | Fix default output for postgres network address types
| * | | | | Fix default output for postgres network address typesErik Peterson2013-02-263-9/+20
|/ / / / /
* | | | | Move AS CHANGELOG entry up.Steve Klabnik2013-02-261-2/+3
| | | | | | | | | | | | | | | | | | | | I merged b883706 but forgot to move the entry past beta1.
* | | | | Merge pull request #9329 from chuckbjones/fix-cache-delete-rcSteve Klabnik2013-02-263-2/+16
|\ \ \ \ \ | | | | | | | | | | | | Fix deletion of empty directories