aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13990 from zzak/ap_dont_autoload_filter_parametersRafael Mendonça França2014-02-091-1/+0
|\ | | | | FilterParameters is referenced at the class level from the Request
| * FilterParameters is referenced at the class level from the RequestZachary Scott2014-02-091-1/+0
| | | | | | | | | | Since it's already required in the file, we don't need to use autoload too. This commit is symmetrical change to 0b10180 for Response.
* | Merge pull request #13985 from zzak/remove_old_todo_in_url_for_testCarlos Antonio da Silva2014-02-091-3/+0
|\ \ | | | | | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30
| * | Remove outdated TODO from url_for test, this test was fixed in 900a2d30Zachary Scott2014-02-091-3/+0
| |/
* | Remove end of line whitespace from bb87c16Zachary Scott2014-02-091-4/+4
| |
* | Merge pull request #13983 from hsbt/remove-warningGodfrey Chan2014-02-091-1/+1
|\ \ | | | | | | use File.exist? instead of File.exists?
| * | use File.exist? instead of File.exists?SHIBATA Hiroshi2014-02-091-1/+1
|/ /
* | use feature detection to decide which implementation to useAaron Patterson2014-02-081-1/+1
| | | | | | | | Decouple the code from the particular Ruby version.
* | Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafeAaron Patterson2014-02-085-4/+15
|\ \ | | | | | | Reaper has access to threadsafe active? call
| * | Reaper has access to threadsafe active? callKevin Casey2014-02-085-4/+15
| | |
* | | Merge pull request #13978 from Fortisque/kevin/validation_context_for_childrenAaron Patterson2014-02-084-1/+27
|\ \ \ | | | | | | | | context in validation goes through has many relationship
| * | | context in validation goes through has many relationshipKevin Casey2014-02-084-1/+27
| | | |
* | | | Merge pull request #13980 from ↵Aaron Patterson2014-02-081-2/+6
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | mellowi/skipping_linked_folder_tests_if_symlink_is_invalid Skips linked folder tests if symlink is invalid
| * | | Skips linked folder tests if symlink is invalidMikko Johansson2014-02-091-2/+6
| | | |
* | | | Merge pull request #13979 from mellowi/windows_disallowed_static_files_skippedAaron Patterson2014-02-081-2/+7
|\| | | | | | | | | | | Skips tests on Windows that create files with illegal characters
| * | | Skips tests on Windows that create files with illegal charactersMikko Johansson2014-02-091-2/+7
| | | |
* | | | Merge pull request #13977 from Octember/masterAaron Patterson2014-02-082-0/+20
|\ \ \ \ | |/ / / |/| | | Fixed an issue where reloading of removed dependencies would cause an un...
| * | | Fixed an issue where reloading of removed dependencies would cause an ↵Noah Lindner2014-02-082-0/+20
|/ / / | | | | | | | | | unexpected circular dependency error
* | | Merge pull request #13974 from ↵Rafael Mendonça França2014-02-083-0/+33
|\ \ \ | |_|/ |/| | | | | | | | laurocaetano/test_case_for_autosave_with_accepts_nested_attributes Add test case for autosave association with nested attributes.
| * | Add test case for autosave HasMany with accepts_nested_attributes.Lauro Caetano2014-02-083-0/+33
|/ / | | | | | | | | | | | | It should not save the parent record when the nested attributes are invalid. Test case to cover #8194.
* | Updated the cookie docs to use the safer JSON.{generate,parse}Godfrey Chan2014-02-081-5/+5
| | | | | | | | cc @senny
* | Rely on backticks instead of tt tags [ci skip]Robin Dupret2014-02-081-2/+2
| | | | | | | | | | Since the language in code blocks is inferred, if the code contains tt tags, the block will be parsed as XML for instance while it is Ruby.
* | docs, Cookie values are String based. Closes #12860. [ci skip]Yves Senn2014-02-081-7/+7
| |
* | Adjust test value so that timezone has no effectAndrew White2014-02-071-1/+1
|/ | | | | | If the test is run in a timezone that is behind UTC it fails because the time generated is ahead of 0000-01-01 00:00:00. Just increase the time subtracted so that timezone has no effect.
* Merge pull request #13952 from prathamesh-sonpatki/testingYves Senn2014-02-071-1/+1
|\ | | | | [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip]
| * [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip]Prathamesh Sonpatki2014-02-071-1/+1
| |
* | Merge pull request #13967 from fphilipe/fix-missing-action-view-constYves Senn2014-02-072-0/+6
|\ \ | | | | | | Require action_view to fix missing constant ENCODING_FLAG
| * | Require action_view to fix missing constantPhilipe Fatio2014-02-072-0/+6
| | | | | | | | | | | | | | | Previously, requiring action_view/view_paths did cause an uninitialized constant error for ENCODING_FLAG, which is defined in action_view.
* | | Merge pull request #13968 from kintamanimatt/fix-wordy-sentenceYves Senn2014-02-071-6/+5
|\ \ \ | |/ / |/| | Fix wordy sentence [ci-skip]
| * | Fix wordy sentenceMatthew Nicholas Bradley2014-02-071-6/+5
|/ /
* | Merge pull request #13962 from iwiznia/test_controller_skip_action_classYves Senn2014-02-071-0/+16
|\ \ | |/ |/| Test for skipping a controller filter set up with a class Part 3
| * Tests that skips a controller filters that was set up using a classIonatan Wiznia2014-02-061-0/+16
|/
* Merge branch 'dump-schema-after-migration-flag' of ↵Xavier Noria2014-02-068-1/+84
|\ | | | | | | | | | | | | git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag Conflicts: activerecord/CHANGELOG.md
| * Add config to disable schema dump after migrationEmil Soman2014-02-068-1/+84
| | | | | | | | | | | | | | | | | | * Add a config on Active Record named `dump_schema_after_migration` * Schema dump doesn't happen if the config is set to false * Set default value of the config to true * Set config in generated production environment file to false * Update configuration guide * Update CHANGELOG
* | docs, Associations also raise on name conflicts. [ci skip]Yves Senn2014-02-061-2/+3
| | | | | | | | Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470
* | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-065-17/+95
| | | | | | | | /cc @chancancode
* | update contribution doc grammar. [ci skip]dpmehta022014-02-061-5/+6
| | | | | | | | | | | | | | | | - Manually applied from #13951. - Discussion at #13947. - Removed trailing whitespace from https://github.com/dpmehta02/rails/commit/18044e86af93672dfc38befbe974261e87b3518d /cc @dpmehta02
* | Fix to_query with empty arrays tooRafael Mendonça França2014-02-062-1/+8
| |
* | Add CHANGELOG entryRafael Mendonça França2014-02-051-0/+14
| | | | | | | | Closes #13909
* | Refatoring the method to avoid shot-circuit returnRafael Mendonça França2014-02-052-4/+9
| |
* | Test with a blank valueRafael Mendonça França2014-02-051-2/+2
| |
* | Move test to the right fileRafael Mendonça França2014-02-052-11/+9
| |
* | Fixed "Hash#to_param confused by empty hash values #13892"Hincu Petru2014-02-052-0/+12
| |
* | Merge pull request #13953 from seanwalbran/fix-humanize-match-referenceRafael Mendonça França2014-02-052-1/+5
|\ \ | | | | | | fix interplay of humanize and html_escape
| * | fix interplay of humanize and html_escapeSean Walbran2014-02-052-1/+5
|/ /
* | Merge pull request #13938 from marcandre/sized_enumeratorRafael Mendonça França2014-02-057-30/+53
|\ \ | | | | | | Sized enumerator
| * | Return sized enumerator from Enumerable#index_byMarc-Andre Lafortune2014-02-053-7/+6
| | |
| * | Return sized enumerator from Batches#find_eachMarc-Andre Lafortune2014-02-056-4/+26
| | |
| * | Return sized enumerator from Batches#find_in_batchesMarc-Andre Lafortune2014-02-053-4/+25
| | |
| * | Strengthen test with different nb of rows and columnsMarc-Andre Lafortune2014-02-051-2/+4
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-25 19:40:19 +0000