Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Document that scopes require a callable object | Trevor Turk | 2013-02-28 | 1 | -1/+9 | |
| | | | ||||||
| * | | Document common deprecations | Trevor Turk | 2013-02-28 | 1 | -0/+11 | |
| | | | ||||||
| * | | Document the deprecation of ActionView::RecordIdentifier | Trevor Turk | 2013-02-28 | 1 | -0/+2 | |
| | | | ||||||
| * | | Document ActiveRecord::Fixtures becoming ActiveRecord::FixtureSet | Trevor Turk | 2013-02-28 | 1 | -0/+2 | |
| | | | ||||||
| * | | Document change in routes using match | Trevor Turk | 2013-02-28 | 1 | -0/+13 | |
| | | | ||||||
| * | | Document removal of assets:precompile:primary | Trevor Turk | 2013-02-28 | 1 | -0/+4 | |
| | | | ||||||
| * | | Document sass-rails asset_url deprecation | Trevor Turk | 2013-02-28 | 1 | -0/+4 | |
| | | | ||||||
| * | | Document caveat from 5b3bb61 which fixed handling SCRIPT_NAME from within ↵ | Trevor Turk | 2013-02-28 | 1 | -0/+3 | |
| | | | | | | | | | | | | mounted engine | |||||
| * | | Document rails-observers extraction | Trevor Turk | 2013-02-28 | 1 | -0/+4 | |
| | | | ||||||
| * | | Document the switch from memcache-client to dalli | Trevor Turk | 2013-02-28 | 1 | -0/+2 | |
| | | | ||||||
| * | | Improve docs for UpgradeSignatureToEncryptionCookieStore | Trevor Turk | 2013-02-28 | 1 | -1/+10 | |
| | | | ||||||
| * | | Document extraction of actionpack-xml_parser | Trevor Turk | 2013-02-28 | 1 | -0/+2 | |
| | | | ||||||
| * | | Document introduction of the ActionController::UnknownFormat exception | Trevor Turk | 2013-02-28 | 1 | -0/+2 | |
| | | | ||||||
* | | | Improve the CHANGELOG entry | Rafael Mendonça França | 2013-02-28 | 1 | -2/+3 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Merge pull request #9493 from kennyj/fix_wrong_exception | Rafael Mendonça França | 2013-02-28 | 3 | -0/+13 | |
|\ \ \ | | | | | | | | | | | | | | | | | Wrong exception is occured when raising no translatable exception Closes #8617 | |||||
| * | | | Wrong exception is occured when raising no translatable exception | kennyj | 2013-03-01 | 3 | -0/+13 | |
| | | | | ||||||
* | | | | Improve the CHANGELOG entry | Rafael Mendonça França | 2013-02-28 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | Merge pull request #9366 from killthekitten/fix-content_for-regression | Rafael Mendonça França | 2013-02-28 | 3 | -1/+7 | |
|\ \ \ \ | |_|/ / |/| | | | Fix for #9360 content_for regression | |||||
| * | | | Fix #9360 regression in content_for | Nikolay Shebanov | 2013-02-25 | 3 | -1/+7 | |
| | | | | ||||||
* | | | | Ensure plugins generated with plugin new can boot the dummy application | José Valim | 2013-02-28 | 6 | -53/+51 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #9484 from senny/9480_change_table_and_hstore | Carlos Antonio da Silva | 2013-02-28 | 6 | -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 Senn | 2013-02-28 | 5 | -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 Senn | 2013-02-28 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Minor changelog improvement [ci skip] | Carlos Antonio da Silva | 2013-02-28 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Remove redundant method | Andrew White | 2013-02-28 | 1 | -8/+0 | |
| | | | ||||||
* | | | Merge pull request #9469 from senny/9466_format_enforcing_routes | Andrew White | 2013-02-27 | 3 | -1/+35 | |
|\ \ \ | | | | | | | | | `format: true` does not override existing format constraints. | |||||
| * | | | `format: true` does not override existing format constraints. | Yves Senn | 2013-02-27 | 3 | -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.4 | Carlos Antonio da Silva | 2013-02-27 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | Keep in sync with 3-2-stable. | |||||
* | / | Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric" | Steve Klabnik | 2013-02-27 | 8 | -50/+18 | |
| |/ |/| | | | | | | | This reverts commit 408227d9c5ed7de26310d72a1a99c1ee02311c63, reversing changes made to dca0b57d03deffc933763482e615c3cf0b9a1d97. | |||||
* | | Improve docs for AbsC::Rendering | José Valim | 2013-02-27 | 1 | -3/+11 | |
| | | ||||||
* | | There's no need to access Railties through self.class | Santiago Pastorino | 2013-02-27 | 1 | -1/+2 | |
| | | | | | | | | Closes #9386 | |||||
* | | Merge pull request #9218 from Fivell/master | Carlos Antonio da Silva | 2013-02-27 | 3 | -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 ↵ | Igor | 2013-02-27 | 3 | -1/+24 | |
| | | | | | | | | | | | | exception | |||||
* | | | Merge pull request #9457 from senny/remove_duplicated_number_helper_tests | Carlos Antonio da Silva | 2013-02-27 | 1 | -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_test | Yves Senn | 2013-02-27 | 1 | -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 Senn | 2013-02-27 | 1 | -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/master | Carlos Antonio da Silva | 2013-02-27 | 1 | -1/+0 | |
|\ \ \ \ | |/ / / |/| | | | Removed template_root as a configuration option | |||||
| * | | | Removed template_root as a configuration option | Justin Bingham | 2013-02-21 | 1 | -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_warning | Steve Klabnik | 2013-02-26 | 1 | -1/+3 | |
|\ \ \ \ | | | | | | | | | | | remove private attribute? warning | |||||
| * | | | | remove private attribute? warning | Francesco Rodriguez | 2013-02-26 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #9439 from senny/9435_router_params_as_integers | Andrew White | 2013-02-26 | 3 | -1/+33 | |
|\ \ \ \ \ | | | | | | | | | | | | | convert non-string default params to strings in the router. | |||||
| * | | | | | allow non-String default params in the router. | Yves Senn | 2013-02-26 | 3 | -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_routes | Andrew White | 2013-02-26 | 3 | -12/+62 | |
|\ \ \ \ \ | | | | | | | | | | | | | the router allows String contraints. | |||||
| * | | | | | the router allows String contraints. | Yves Senn | 2013-02-26 | 3 | -12/+62 | |
|/ / / / / | | | | | | | | | | | | | | | | Closes #9432. | |||||
* | | | | | Merge pull request #8010 from subwindow/postgres_inet_default_fix | Aaron Patterson | 2013-02-26 | 3 | -9/+20 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix default output for postgres network address types | |||||
| * | | | | | Fix default output for postgres network address types | Erik Peterson | 2013-02-26 | 3 | -9/+20 | |
|/ / / / / | ||||||
* | | | | | Move AS CHANGELOG entry up. | Steve Klabnik | 2013-02-26 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | I merged b883706 but forgot to move the entry past beta1. | |||||
* | | | | | Merge pull request #9329 from chuckbjones/fix-cache-delete-rc | Steve Klabnik | 2013-02-26 | 3 | -2/+16 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix deletion of empty directories | |||||
| * | | | | | Fix deletion of empty directories: | Charles Jones | 2013-02-25 | 3 | -2/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. When comparing the directory to delete against the top level cache_path, use File.realpath to make sure we aren't comparing two unequal strings that point to the same path. This occurs, for example, when cache_path has a trailing slash, which it does in the default Rails configuration. Since the input to delete_empty_directories never has a trailing slash, the comparison will never be true and the top level cache directory (and above) may be deleted. However… 2. File.delete raises EPERM when trying to delete a directory, so no directories have ever been deleted. Changing the code to Dir.delete fixes that. | |||||
* | | | | | | We want i18n >= 0.6.2 but < 1.0 | Santiago Pastorino | 2013-02-26 | 1 | -1/+1 | |
| | | | | | |