Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #22034 from hemalijain/patch-2 | Rafael Mendonça França | 2015-10-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ci skip] removed extra comma | hemali jain | 2015-10-23 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | `config.generators` should be docummented since it is public API | Rafael Mendonça França | 2015-10-22 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #22029 from yui-knk/fixup_content_type_regexp | Rafael Mendonça França | 2015-10-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use sufficient a regexp anchor to check `@response.content_type.to_s` | yui-knk | 2015-10-22 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #21918 from bogdan/refactor-preloader | Sean Griffin | 2015-10-22 | 1 | -42/+30 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Refactored association preloader for performance | Bogdan Gusiev | 2015-10-22 | 1 | -42/+30 | |
* | | | | | | | | | | | Merge pull request #19327 from rousisk/master | Sean Griffin | 2015-10-22 | 3 | -3/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Change Integer#year to return a Fixnum instead of a Float to improve consistency | Konstantinos Rousis | 2015-10-22 | 3 | -3/+19 | |
* | | | | | | | | | | | Merge pull request #22028 from yui-knk/suppress_deprecated_warning_test | Kasper Timm Hansen | 2015-10-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Suppress warnings (warnings about AD::IntegrationTest HTTP request) | yui-knk | 2015-10-22 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #21950 from rafaelsales/issues/21922-fix-ar-group-by-attri... | Andrew White | 2015-10-22 | 4 | -11/+17 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Refactor Calculations#execute_grouped_calculation and clean AR test case | Rafael Sales | 2015-10-22 | 2 | -11/+4 | |
| * | | | | | | | | | | Fix generated projection fields in group by query | Rafael Sales | 2015-10-22 | 3 | -1/+14 | |
* | | | | | | | | | | | Merge pull request #22011 from kamipo/remove_unused_args_again | Andrew White | 2015-10-22 | 4 | -24/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove `#tables` extra args again | Ryuta Kamizono | 2015-10-22 | 4 | -24/+14 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #22019 from timoschilling/patch-2 | Sean Griffin | 2015-10-21 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remove unnecessary forwardable require | Timo Schilling | 2015-10-21 | 1 | -1/+0 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #22018 from jbranchaud/move-getter-to-attr-reader | Andrew White | 2015-10-21 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Extract native getter to attr_reader. | jbranchaud | 2015-10-21 | 1 | -5/+1 | |
* | | | | | | | | | | | Merge pull request #20026 from rails/remove-possible-singleton-method | Andrew White | 2015-10-21 | 3 | -4/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add Module#remove_possible_singleton_method | Andrew White | 2015-10-21 | 3 | -4/+32 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | move documentation of column options to `add_column`. Closes #20400. | Yves Senn | 2015-10-21 | 2 | -79/+81 | |
* | | | | | | | | | | Merge pull request #22013 from NelsonScott/patch-1 | Yves Senn | 2015-10-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | typo | Scott Nelson | 2015-10-20 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Really fix test failures caused by #19851 | Sean Griffin | 2015-10-20 | 1 | -5/+6 | |
* | | | | | | | | | Fix test failures caused by #19851 | Sean Griffin | 2015-10-20 | 1 | -5/+5 | |
* | | | | | | | | | 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 |