Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #22008 from rails/revert-19898-common-secrets | Sean Griffin | 2015-10-20 | 1 | -16/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert " Added an example to show how common secrets can be shared across mul... | Sean Griffin | 2015-10-20 | 1 | -16/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #19851 from repinel/numericality-validation2 | Sean Griffin | 2015-10-20 | 2 | -13/+47 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Conditionally convert the raw_value received by the numeric validator. | Roque Pinel | 2015-07-11 | 2 | -13/+47 | |
* | | | | | | | Merge pull request #19889 from cedrics/long-uri-encoded-keys | Sean Griffin | 2015-10-20 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | when checking for too long cache keys used the uri encoded fname | Cedric Sohrauer | 2015-04-24 | 2 | -3/+9 | |
* | | | | | | | | Merge pull request #19898 from prathamesh-sonpatki/common-secrets | Sean Griffin | 2015-10-20 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Added example of sharing secrets in multiple environments in secrets.yml | Prathamesh Sonpatki | 2015-05-26 | 1 | -0/+16 | |
* | | | | | | | | | Merge pull request #19938 from vngrs/join_dependency_instantiate_bug | Sean Griffin | 2015-10-20 | 6 | -6/+29 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix merge conflicts for #19938 | Sean Griffin | 2015-10-20 | 6 | -6/+29 | |
|/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix for activerecord join dependency instantiate bug | Mehmet Emin İNAÇ | 2015-05-04 | 6 | -6/+29 | |
* | | | | | | | | | | Merge pull request #19992 from greysteil/handle-invalid-utf8-in-html-escape | Sean Griffin | 2015-10-20 | 3 | -4/+19 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Handle invalid UTF-8 strings when HTML escaping | Grey Baker | 2015-06-08 | 3 | -4/+19 | |
* | | | | | | | | | | | Fix minor typo from #20038 | Sean Griffin | 2015-10-20 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge pull request #20482 from nashby/collection-label-for | Sean Griffin | 2015-10-20 | 0 | -0/+0 | |
* | | | | | | | | | | | Collection check boxes propagates input's id to the label's for attribute. | Vasiliy Ermolovich | 2015-10-20 | 3 | -0/+18 | |
* | | | | | | | | | | | Merge pull request #20038 from imanel/numeric_prepend | Sean Griffin | 2015-10-20 | 3 | -44/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Unify behavior of all Numeric extensions and use Module.prepend instead of al... | Bernard Potocki | 2015-05-28 | 3 | -44/+22 | |
* | | | | | | | | | | | | Merge pull request #20653 from repinel/allow-arel-select-count | Sean Griffin | 2015-10-20 | 2 | -1/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Allow select with Arel and count as well as calculations with Arel | Roque Pinel | 2015-06-30 | 2 | -1/+55 | |
* | | | | | | | | | | | | | Merge pull request #21762 from jmccartie/jm/uuid | Sean Griffin | 2015-10-20 | 4 | -1/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Set active_record config for always creating uuids in generators | Jon McCartie | 2015-10-20 | 4 | -1/+26 | |
* | | | | | | | | | | | | | | Merge pull request #20715 from simsalabim/feature/parse-rss-atom-as-xml | Sean Griffin | 2015-10-20 | 3 | -14/+22 | |
* | | | | | | | | | | | | | | Merge pull request #20737 from gouravtiwari/multibyte_chars_slice_fix | Sean Griffin | 2015-10-20 | 3 | -2/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Update #20737 to address feedback | Sean Griffin | 2015-10-20 | 3 | -2/+18 | |
| * | | | | | | | | | | | | | | Fixed slice! behavior: return nil for out-of-bound parameters | Gourav Tiwari | 2015-10-20 | 2 | -1/+6 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #20768 from vrybas/guides-clarify-belongs-to-required-by-d... | Sean Griffin | 2015-10-20 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Update #20768 to address feedback | Sean Griffin | 2015-10-20 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | [Rails Guides] Clarify `belongs_to_required_by_default` option | Vladimir Rybas | 2015-10-20 | 1 | -1/+3 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #20795 from benjiwheeler/validation_guide_ret_val | Sean Griffin | 2015-10-20 | 1 | -7/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | activerecord guide: clarified roles of valid method and errors object [ci skip] | Ben Wheeler | 2015-07-08 | 1 | -7/+15 | |
* | | | | | | | | | | | | | | | Merge pull request #20872 from maxjacobson/more-humane-rounding | Sean Griffin | 2015-10-20 | 3 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Update the changelog for #20872 to be a bit less confusing | Sean Griffin | 2015-10-20 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | Round some numbers more humanely | Max Jacobson | 2015-07-26 | 3 | -2/+11 | |
* | | | | | | | | | | | | | | | | Merge pull request #20934 from maurogeorge/migration-transformations-doc | Sean Griffin | 2015-10-20 | 1 | -15/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Add missed Available transformations to migration Doc | Mauro George | 2015-07-22 | 1 | -15/+50 | |
* | | | | | | | | | | | | | | | | | Merge pull request #20957 from akihiro17/find-by-issue | Sean Griffin | 2015-10-20 | 3 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Don't cache arguments in #find_by if they are an ActiveRecord::Relation | akihiro17 | 2015-10-06 | 3 | -1/+13 | |
* | | | | | | | | | | | | | | | | | Merge pull request #21302 from theunraveler/delegate_reserved_argument_names | Sean Griffin | 2015-10-20 | 2 | -5/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Fixing issue when delegating to methods named "block", "args", or "arg" | Jake Bell | 2015-08-19 | 2 | -5/+21 | |
* | | | | | | | | | | | | | | | | | | Fix test failures caused by d99db6b8b3e4 | Sean Griffin | 2015-10-20 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #21756 from soutaro/qualify-column-in-calculation | Sean Griffin | 2015-10-20 | 3 | -1/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Qualify column names in calculation | Soutaro Matsumoto | 2015-10-20 | 3 | -1/+27 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #18856 from al2o3cr/issue_17897 | Sean Griffin | 2015-10-20 | 2 | -3/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Fix merge conflicts for #18856 | Sean Griffin | 2015-10-20 | 2 | -3/+11 | |
|/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Match table names exactly on MySQL | Matt Jones | 2015-02-08 | 4 | -18/+8 | |
* | | | | | | | | | | | | | | | | | | | Don't add classes to the top level namespace | Sean Griffin | 2015-10-20 | 1 | -13/+17 | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #21883 from tarzan/cache-key-too-precise | Sean Griffin | 2015-10-20 | 6 | -8/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | fixes #21815 | Maarten Jacobs | 2015-10-16 | 6 | -8/+43 | |
* | | | | | | | | | | | | | | | | | | | | Do not cache prepared statements that are unlikely to have cache hits | Sean Griffin | 2015-10-20 | 12 | -20/+69 |