aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-099-12/+13
|\ | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md
| * Fixed a grammatical error in Booleans section of API documentation guideZachary Scott2014-02-091-1/+1
| | | | | | | | from e1e17a5
| * adds a section about booleans in the API guidelines [ci skip]Xavier Noria2014-02-091-0/+47
| |
| * Use full-length version of multiple from c7abc51Zachary Scott2014-02-091-1/+1
| |
| * docs, link MySQL manual for multi column indexes. [ci ckip].Yves Senn2014-02-091-1/+3
| | | | | | | | Closes #9131.
| * Specify what #starts_with? we're talking about. Also added a note whatZachary Scott2014-02-091-1/+2
| | | | | | | | kind of exception we should expect for this internal comment.
| * Fix grammar of internal comment and modify it's locationZachary Scott2014-02-091-1/+2
| |
| * Fixed spelling error: `extracetd` => `extracted`Calvin Tam2014-02-071-1/+1
| |
| * Remove old comments about suppressing warnings.Vipul A M2014-01-251-1/+1
| |
| * `framwork` => `framework`Vipul A M2014-01-241-1/+1
| |
| * `easiy` => `easy`Vipul A M2014-01-241-1/+1
| |
| * `requies` => `requires`Vipul A M2014-01-241-1/+1
| |
| * Remove duplicate configuration option for ActiveSupport [ci skip]Zachary Scott2014-01-161-1/+0
| | | | | | | | Fixes rails/rails#13732
| * add punctuationWaynn Lue2014-01-131-2/+2
| |
| * e-mail => email, and subject/verb agreementWaynn Lue2014-01-131-1/+1
| |
| * change to "check out"Waynn Lue2014-01-081-1/+1
| |
* | Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursionAaron Patterson2014-02-092-1/+19
|\ \ | | | | | | Fix response flatten infinite recursion
| * | Prevent [response].flatten from recursing infinitely.Dan Kang2014-02-082-1/+10
| | | | | | | | | | | | | | | | | | Returning `self` from within the array returned by `to_ary` caused this. Instead, we can just substitute another object. It provides the `each` behavior required by the rack spec.
| * | Add missing test for response destructuring.Myron Marston2014-02-081-0/+9
| | |
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 04:57:57 +0000