Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Clarifying confusing phrasing | Jed Hartman | 2014-02-09 | 1 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-02-09 | 9 | -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 guide | Zachary Scott | 2014-02-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | from e1e17a5 | |||||
| * | | | | | adds a section about booleans in the API guidelines [ci skip] | Xavier Noria | 2014-02-09 | 1 | -0/+47 | |
| | | | | | | ||||||
| * | | | | | Use full-length version of multiple from c7abc51 | Zachary Scott | 2014-02-09 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | docs, link MySQL manual for multi column indexes. [ci ckip]. | Yves Senn | 2014-02-09 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #9131. | |||||
| * | | | | | Specify what #starts_with? we're talking about. Also added a note what | Zachary Scott | 2014-02-09 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | kind of exception we should expect for this internal comment. | |||||
| * | | | | | Fix grammar of internal comment and modify it's location | Zachary Scott | 2014-02-09 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Fixed spelling error: `extracetd` => `extracted` | Calvin Tam | 2014-02-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Remove old comments about suppressing warnings. | Vipul A M | 2014-01-25 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | `framwork` => `framework` | Vipul A M | 2014-01-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | `easiy` => `easy` | Vipul A M | 2014-01-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | `requies` => `requires` | Vipul A M | 2014-01-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Remove duplicate configuration option for ActiveSupport [ci skip] | Zachary Scott | 2014-01-16 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes rails/rails#13732 | |||||
| * | | | | | add punctuation | Waynn Lue | 2014-01-13 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | e-mail => email, and subject/verb agreement | Waynn Lue | 2014-01-13 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | change to "check out" | Waynn Lue | 2014-01-08 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursion | Aaron Patterson | 2014-02-09 | 2 | -1/+19 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix response flatten infinite recursion | |||||
| * | | | | | | Prevent [response].flatten from recursing infinitely. | Dan Kang | 2014-02-08 | 2 | -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 Marston | 2014-02-08 | 1 | -0/+9 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #13990 from zzak/ap_dont_autoload_filter_parameters | Rafael Mendonça França | 2014-02-09 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | FilterParameters is referenced at the class level from the Request | |||||
| * | | | | | | | FilterParameters is referenced at the class level from the Request | Zachary Scott | 2014-02-09 | 1 | -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_test | Carlos Antonio da Silva | 2014-02-09 | 1 | -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 900a2d30 | Zachary Scott | 2014-02-09 | 1 | -3/+0 | |
| |/ / / / / / / | ||||||
* | | | | / / / | Remove end of line whitespace from bb87c16 | Zachary Scott | 2014-02-09 | 1 | -4/+4 | |
| |_|_|_|/ / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #13983 from hsbt/remove-warning | Godfrey Chan | 2014-02-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | use File.exist? instead of File.exists? | |||||
| * | | | | | | | use File.exist? instead of File.exists? | SHIBATA Hiroshi | 2014-02-09 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | use feature detection to decide which implementation to use | Aaron Patterson | 2014-02-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple the code from the particular Ruby version. | |||||
* | | | | | | | Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafe | Aaron Patterson | 2014-02-08 | 5 | -4/+15 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Reaper has access to threadsafe active? call | |||||
| * | | | | | | | Reaper has access to threadsafe active? call | Kevin Casey | 2014-02-08 | 5 | -4/+15 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #13978 from Fortisque/kevin/validation_context_for_children | Aaron Patterson | 2014-02-08 | 4 | -1/+27 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | context in validation goes through has many relationship | |||||
| * | | | | | | | | context in validation goes through has many relationship | Kevin Casey | 2014-02-08 | 4 | -1/+27 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #13980 from ↵ | Aaron Patterson | 2014-02-08 | 1 | -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 invalid | Mikko Johansson | 2014-02-09 | 1 | -2/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #13979 from mellowi/windows_disallowed_static_files_skipped | Aaron Patterson | 2014-02-08 | 1 | -2/+7 | |
|\| | | | | | | | | |_|_|/ / / / / |/| | | | | | | | Skips tests on Windows that create files with illegal characters | |||||
| * | | | | | | | Skips tests on Windows that create files with illegal characters | Mikko Johansson | 2014-02-09 | 1 | -2/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #13977 from Octember/master | Aaron Patterson | 2014-02-08 | 2 | -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 Lindner | 2014-02-08 | 2 | -0/+20 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | unexpected circular dependency error | |||||
* | | | | | | | Merge pull request #13974 from ↵ | Rafael Mendonça França | 2014-02-08 | 3 | -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 Caetano | 2014-02-08 | 3 | -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 Chan | 2014-02-08 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | cc @senny | |||||
* | | | | | | Rely on backticks instead of tt tags [ci skip] | Robin Dupret | 2014-02-08 | 1 | -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 Senn | 2014-02-08 | 1 | -7/+7 | |
| | | | | | | ||||||
* | | | | | | Adjust test value so that timezone has no effect | Andrew White | 2014-02-07 | 1 | -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/testing | Yves Senn | 2014-02-07 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip] | |||||
| * | | | | | [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip] | Prathamesh Sonpatki | 2014-02-07 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #13967 from fphilipe/fix-missing-action-view-const | Yves Senn | 2014-02-07 | 2 | -0/+6 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Require action_view to fix missing constant ENCODING_FLAG | |||||
| * | | | | | | Require action_view to fix missing constant | Philipe Fatio | 2014-02-07 | 2 | -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-sentence | Yves Senn | 2014-02-07 | 1 | -6/+5 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix wordy sentence [ci-skip] | |||||
| * | | | | | | Fix wordy sentence | Matthew Nicholas Bradley | 2014-02-07 | 1 | -6/+5 | |
|/ / / / / / |