aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Remove hard coded references to Active Record in railtiesJosé Valim2013-03-025-23/+11
| | | |
* | | | Merge pull request #9431 from troyk/patch-2Andrew White2013-03-023-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time
| * | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::TimeTroy Kruthoff2013-03-013-4/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an AR model a timestamptz attribute would return a ruby string and AR tests did not check for any type casting. Previous tests would pass only because an assert_equal was being used on a Time.utc object, which will parse the right side of the eq to a valid Time instance for comparision. switch to test instance of Time instead of ActiveSupport::TimeWithZone
* | | | :scissors: extra blank lineAkira Matsuda2013-03-021-1/+0
| | | |
* | | | Merge pull request #9510 from ↵Rafael Mendonça França2013-03-013-9/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | senny/7364_warn_when_appending_prepending_to_an_association deal with `#append` and `#prepend` on association collections
| * | | | deal with `#append` and `#prepend` on association collections.Yves Senn2013-03-013-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7364. Collection associations behave similar to Arrays. However there is no way to prepend records. And to append one should use `<<`. Before this patch `#append` and `#prepend` did not add the record to the loaded association. `#append` now behaves like `<<` and `#prepend` is not defined.
| * | | | don't use non-ascii ' chars in documentationYves Senn2013-03-011-4/+4
| |/ / /
* / / / Restore note about nested SCRIPT_NAME handling.Jeremy Kemper2013-03-011-0/+2
|/ / /
* | | Merge pull request #8652 from codeodor/create_table_migrationCarlos Antonio da Silva2013-03-016-7/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support creating a table migration generator Sometimes you want to create a table without an associated model and test, which is also not a join table. With this commit, you can now do that. Example: rails g migration create_posts title:string or rails g migration CreatePosts title:string This commit also moves the template the model generator uses for the migration to the migration templates folder, as it seems a more sensible place for it now that it is shared code.
| * | | Support creating a table migration generatorSammy Larbi2013-03-016-7/+57
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes you want to create a table without an associated model and test, which is also not a join table. With this commit, you can now do that. Example: rails g migration create_posts title:string or rails g migration CreatePosts title:string This commit also moves the template the model generator uses for the migration to the migration templates folder, as it seems a more sensible place for it now that it is shared code.
* | | Wordsmithing @trevorturk's upgrade notesJeremy Kemper2013-02-281-7/+4
| | | | | | | | | | | | | | | Removed the bit about `SCRIPT_NAME` handling, since setting `default_url_options[:script_name]` does work correctly. We ran into an issue with it but it was an app bug.
* | | 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