aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | Fix deletion of empty directories:Charles Jones2013-02-253-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.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. [ci skip]
| * | | | | Add routing guide doc on root with namespaces.Brendon Murphy2013-02-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I read #9419 and realized I didn't know you could have namespaced roots, checked around, and a few friends didn't either. Figured this makes it guide worthy.
* | | | | | 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_to
| * | | | | | Fix touching an invalid parent record for belongs_toOlek Janiszewski2013-02-263-2/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the parent of a `belongs_to` record fails to be saved due to validation errors, `touch` will be called on a new record, which causes an exception (see https://github.com/rails/rails/pull/9320). Example: class Owner < ActiveRecord::Base validates_presence_of :name end class Pet < ActiveRecord::Base belongs_to :owner, touch: true end pet = Pet.new(owner: Owner.new) # Before, this line would raise ActiveRecord::ActiveRecordError # "can not touch on a new record object" pet.save
* | | | | | Move the CHANGELOG entry to the proper placeRafael Mendonça França2013-02-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #9434 from zires/devRafael Mendonça França2013-02-263-1/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Journey::Path::Pattern#new raise more meaningful exception message.
| * | | | | Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful ↵zires2013-02-273-1/+7
| | |/ / / | |/| | | | | | | | | | | | | exception message.
* | | | | Merge pull request #9442 from czarneckid/adjust-generator-languageXavier Noria2013-02-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use less hyperbole in the language re: allowed parameters
| * | | | | 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 #9441
| * | | | | 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 ↵Gagan Awhad2013-02-221-1/+19
| | | | | | | | | | | | | | | | | | | | Support Core Extensions guide
| * | | | Link is not relevant anymorebobbus2013-02-221-5/+0
| | | | | | | | | | | | | | | Cannot find the screencast on the internet, guess it was removed
| * | | | Typo fix.Carson McDonald2013-02-211-1/+1
| | | | |
| * | | | Update the "upgrading" guide for people coming from 3.0 and 3.1. The latest ↵Arne Brasseur2013-02-201-4/+4
| | | | | | | | | | | | | | | | | | | | versions for 3.1 and 3.2 are now 3.2.12 and 3.1.11 respectively.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | The code in 2.3.2 assumed that render has an alert option like redirect_to to create a flash alert message, but it doesn't.
| * | | | Update guides/source/active_record_querying.mdHanfei Shen2013-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | Fix missing `ORDER BY id ASC` for Client.first(2); Uppercase the little y in the SQL equivalent of the Client.last(2).
| * | | | clarify singular and plural routesNoam Gagliardi2013-02-181-1/+1
| | | | | | | | | | | | | | | Found the wording on line 158 somewhat confusing. Added short example to clarify.
* | | | | Merge pull request #9441 from rubys/masterGuillermo Iguaran2013-02-261-2/+9
|\ \ \ \ \ | | | | | | | | | | | | This is a small thing, motivated by https://github.com/rails/rails/issues/9419
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 21:22:02 +0000