Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #17397 from ↵ | Rafael Mendonça França | 2014-10-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-type-boolean-error-msg-ci-skip Fix typo in error message when non-boolean value is assigned to boolean column | |||||
| * | | | | | | Fix typo in error message when non-boolean value is assigned to boolean column | Prathamesh Sonpatki | 2014-10-26 | 1 | -1/+1 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'rishijain-update_docs_1' | Zachary Scott | 2014-10-26 | 2 | -3/+6 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Making the actionmailer docs more explicit to understand [ci skip] | Rishi Jain | 2014-10-26 | 2 | -3/+6 | |
|/ / / / / | ||||||
* | | | | | Prefix internal method with _ | Rafael Mendonça França | 2014-10-25 | 8 | -18/+18 | |
| | | | | | | | | | | | | | | | | | | | | This will avoid naming clash with user defined methods | |||||
* | | | | | Add CHANGELOG entry for #17064 | Rafael Mendonça França | 2014-10-25 | 1 | -0/+6 | |
| | | | | | ||||||
* | | | | | Use new hash syntax | Rafael Mendonça França | 2014-10-25 | 2 | -3/+4 | |
| | | | | | ||||||
* | | | | | :scissors: | Rafael Mendonça França | 2014-10-25 | 2 | -3/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #17064 from frenkel/fix_select_tag_include_blank | Rafael Mendonça França | 2014-10-25 | 2 | -2/+14 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use include_blank value as option label | |||||
| * | | | | | Use include_blank value as option label | Frank Groeneveld | 2014-10-17 | 2 | -2/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Update select_tag to reflect documentation and behave the same as form builder select. If the value of include_blank is not boolean true, use that value as the option label. | |||||
* | | | | | | Merge pull request #17392 from ↵ | Rafael Mendonça França | 2014-10-25 | 1 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-docstring-for-sanitized-helpers-ci-skip Clarify comments about sanitized_allowed_tags | |||||
| * | | | | | | Clarify comments about sanitized_allowed_tags | Prathamesh Sonpatki | 2014-10-25 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clarify that arguments are expected in array format. - Extension of https://github.com/rails/rails/pull/17390. - https://github.com/rails/rails/pull/17390 was targeted against 4-1-stable branch. This commit updates master. - [ci skip] | |||||
* | | | | | | | Merge pull request #17391 from prathamesh-sonpatki/fix-oid-description-ci-skip | Eileen M. Uchitelle | 2014-10-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix description of OID in TypeMapInitializer | |||||
| * | | | | | | Fix description of OID in TypeMapInitializer | Prathamesh Sonpatki | 2014-10-25 | 1 | -1/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | give a better error message for misspelled helpers | Xavier Noria | 2014-10-25 | 3 | -1/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See comment in this patch for the rationale. References #16468 | |||||
* | | | | | | fixes circularity check in dependencies | Xavier Noria | 2014-10-25 | 4 | -1/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for circular loading should depend on a stack of files being loaded at the moment, rather than the collection of loaded files. This showed up indirectly in #16468, where a misspelled helper would incorrectly result in a circularity error message. References #16468 | |||||
* | | | | | | instance_eval is evil | Akira Matsuda | 2014-10-25 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Reduce object allocation | Akira Matsuda | 2014-10-25 | 1 | -1/+5 | |
| | | | | | | ||||||
* | | | | | | Reduce object allocation | Akira Matsuda | 2014-10-25 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Avoid creating range objects (take II) | Akira Matsuda | 2014-10-25 | 1 | -1/+5 | |
| | | | | | | ||||||
* | | | | | | The code was not up-to-date | Akira Matsuda | 2014-10-25 | 1 | -9/+7 | |
| | | | | | | ||||||
* | | | | | | Avoid creating unneeded Hash instance and calling slow Hash#fetch | Akira Matsuda | 2014-10-25 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #17385 from nakadai/patch-1 | Zachary Scott | 2014-10-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix typo in "Active Record Basics" guide. [ci skip] | |||||
| * | | | | | | Fix typo in "Active Record Basics" guide. [ci skip] | nakadai | 2014-10-24 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Revert a change made to the example in 1ac4525 | Godfrey Chan | 2014-10-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @carlosantoniodasilva pointed out that when `@person` is nil then this would blow up when you ended up calling `#first`on `nil`. > "there’s no way to break a try chain when you enter it :D" [ci skip] | |||||
* | | | | | | Include return value in examples added in #17378 [ci skip] | Zachary Scott | 2014-10-24 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Improved try documentation [ci skip] | Eugene Gilburg | 2014-10-24 | 1 | -8/+25 | |
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - better `if` example - Added chaining example to the try method description - Documented the `respond_to?` check to the try method description - Clearer wording to explain that argument error is raised on argument mismatch to responding method, rather than to non-responding method (which is handled without exception by `try`) - `.any?` is more precise than `! .blank?` - Don't need to use `try` on `children` as (for regular associations) they will always be a collection or array that responds to `first` - Fix typos/grammar | |||||
* | | | | | Merge pull request #17381 from jonatack/patch-8 | Santiago Pastorino | 2014-10-24 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | AR Migrations Guide#Foreign Keys: fix wrong table | |||||
| * | | | | | AR Migrations Guide#Foreign Keys: fix wrong table | Jon Atack | 2014-10-24 | 1 | -1/+1 | |
|/ / / / / | | | | | | | | | | | [skip ci] | |||||
* | | | | | Merge pull request #17377 from aripollak/dry-try-bang | Godfrey Chan | 2014-10-23 | 1 | -10/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | DRY up try/try! | |||||
| * | | | | | DRY up try/try! | Ari Pollak | 2014-10-23 | 1 | -10/+6 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #17369 from rails/secure_compare | Guillermo Iguaran | 2014-10-23 | 4 | -14/+33 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Secure compare | |||||
| * | | | | Use AS secure_compare for CSRF token comparison | Guillermo Iguaran | 2014-10-23 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Use AS secure_compare in AS::MessageVerifier | Guillermo Iguaran | 2014-10-23 | 1 | -12/+2 | |
| | | | | | ||||||
| * | | | | Add AS::SecurityUtils.secure_compare for constant time string comparison | Guillermo Iguaran | 2014-10-23 | 2 | -0/+29 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'mrgilman-reword-uncountable-documentation' | Zachary Scott | 2014-10-23 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Reword documentation for `uncountable` [ci skip] | Melanie Gilman | 2014-10-23 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #17355 from vipulnsward/aj-string-fixes | Yves Senn | 2014-10-23 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix error string raised from AJ enqueue_at for ClassQueueAdapter | |||||
| * | | | - Fix error string raised from `enqueue_at` | Vipul A M | 2014-10-22 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #17343 from vipulnsward/inline-aj-callbacks | Yves Senn | 2014-10-23 | 1 | -16/+13 | |
|\ \ \ \ | | | | | | | | | | | Inline AJ around_perform and around_enqueue in CallbackJob used for tests | |||||
| * | | | | - Inline AJ around_perform and around_enqueue in CallbackJob used for tests. | Vipul A M | 2014-10-21 | 1 | -16/+13 | |
| |/ / / | ||||||
* | | | | Update CHANGELOG and release notes for e98f2a7 | Godfrey Chan | 2014-10-22 | 2 | -2/+6 | |
| | | | | ||||||
* | | | | Merge pull request #17361 from aripollak/try-bang-parity | Godfrey Chan | 2014-10-22 | 2 | -5/+9 | |
|\ \ \ \ | | | | | | | | | | | Bring try! into parity with try. | |||||
| * | | | | Bring try! into parity with try. | Ari Pollak | 2014-10-22 | 2 | -5/+9 | |
|/ / / / | | | | | | | | | | | | | Based on commit 5e51bdda. | |||||
* | | | | Merge pull request #17353 from swapdisc/activejob-queue-test-typo | Rafael Mendonça França | 2014-10-22 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | :nail_care: fix typos in activejob queuing test | |||||
| * | | | | :nail_care: fix typos in activejob queuing test | Joe Lewis | 2014-10-22 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #17346 from accessd/fix-small-typo-in-test | Rafael Mendonça França | 2014-10-21 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | fix small typo in routing test | |||||
| * | | | | fix small typo in routing test | Accessd | 2014-10-21 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #17313 from accessd/fix-url-generation-error-message | Rafael Mendonça França | 2014-10-21 | 2 | -1/+11 | |
|\ \ \ \ | | | | | | | | | | | Fix url generation error message | |||||
| * | | | | fix url generation error message | Accessd | 2014-10-21 | 2 | -1/+11 | |
| | | | | |