Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13998 from gaurish/doc-rails-threadsafe | Robin Dupret | 2014-02-09 | 1 | -1/+1 |
|\ | | | | | `Rails.threadsafe!` mode is deprecated, Update Docs [ci skip] | ||||
| * | `Rails.threadsafe!` mode is deprecated | Gaurish Sharma | 2014-02-10 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #13997 from dmitry/test_coverage_improvement | Rafael Mendonça França | 2014-02-09 | 5 | -12/+46 |
|\ \ | | | | | | | Test coverage improvement | ||||
| * | | add test coverage for activemodel Dirty#reset_changes | Dmitry Polushkin | 2014-02-09 | 1 | -0/+19 |
| | | | |||||
| * | | add actionmailer test coverage for undefined delivery method | Dmitry Polushkin | 2014-02-09 | 2 | -10/+21 |
| | | | |||||
| * | | add activerecord test coverage for `sanitize_sql_array` | Dmitry Polushkin | 2014-02-09 | 1 | -0/+5 |
| | | | | | | | | | | | | check it is handles empty statement | ||||
| * | | move alias method `sanitize_conditions` to a correct place | Dmitry Polushkin | 2014-02-09 | 1 | -2/+1 |
| | | | |||||
* | | | Set the :shallow_path as each scope is generated | Andrew White | 2014-02-09 | 3 | -1/+95 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set :shallow_path when shallow is called it can result in incorrect paths if the resource is inside a namespace because namespace itself sets the :shallow_path option to the namespace path. We fix this by removing the :shallow_path option from shallow as that should only be turning shallow routes on and not otherwise affecting the scope. To do this we need to treat the :shallow option to resources differently to other scope options and move it to before the nested block is called. This change also has the positive side effect of making the behavior of the :shallow option consistent with the shallow method. Fixes #12498. | ||||
* | | Simplify doc [ci skip] | Vijay Dev | 2014-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | The `as` option was already explained in a previous example and doesn't need to be repeated. Explain only the `locals` option which the example is meant for. | ||||
* | | Merge pull request #13630 from seapy/master | Vijay Dev | 2014-02-09 | 1 | -2/+2 |
|\ \ | | | | | | | Fixed typo [ci skip] | ||||
| * | | Fixed typo [ci skip] | seapy | 2014-01-08 | 1 | -2/+2 |
| | | | | | | | | | | | | singular is more suited to | ||||
* | | | Merge pull request #13994 from elysdir/master | Vijay Dev | 2014-02-09 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Clarifying confusing phrasing | ||||
| * | | | 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 |