Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #29815 from posthumanism/add-except-option | Sean Griffin | 2017-07-18 | 3 | -15/+440 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add `except` option for ActiveJob::TestHelper methods | posthumanism | 2017-07-18 | 3 | -15/+440 | |
* | | | | | | Merge pull request #29834 from kamipo/fix_unscoping_default_scope_with_sti_as... | Sean Griffin | 2017-07-18 | 6 | -3/+39 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix unscoping `default_scope` for `Preloader` | Ryuta Kamizono | 2017-07-19 | 2 | -1/+13 | |
| * | | | | | | Fix unscoping `default_scope` in STI associations | Ryuta Kamizono | 2017-07-19 | 5 | -2/+26 | |
* | | | | | | | Don't convert dates to strings when using prepared statements in mysql | Sean Griffin | 2017-07-18 | 2 | -3/+19 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #29839 from kamipo/fix_typo | Rafael França | 2017-07-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix typo s/rause/raise/ | Ryuta Kamizono | 2017-07-19 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Remove deprecated code concerning non-attributes and `*_will_change!` | Sean Griffin | 2017-07-18 | 4 | -24/+7 | |
* | | | | | | Remove deprecated code concerning dirty methods in after callbacks | Sean Griffin | 2017-07-18 | 2 | -83/+11 | |
* | | | | | | Remove incorrect comment | Sean Griffin | 2017-07-18 | 1 | -2/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #29828 from kamipo/fix_using_custom_table_with_joins | Rafael França | 2017-07-17 | 6 | -18/+29 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix `JoinDependency` with using a custom table | Ryuta Kamizono | 2017-07-18 | 6 | -18/+29 | |
* | | | | | | Merge pull request #29830 from schneems/schneems/codetriage-badge | Sean Griffin | 2017-07-17 | 1 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] CodeTriage badge | schneems | 2017-07-17 | 1 | -0/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #26343 from ccutrer/runner_from_stdin | Sean Griffin | 2017-07-17 | 4 | -2/+20 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | support `-` as an argument to `rails runner` | Cody Cutrer | 2017-07-17 | 4 | -2/+20 | |
|/ / / / / / | ||||||
* / / / / / | Rename helper to force_lazy_load_hooks. | Kasper Timm Hansen | 2017-07-17 | 1 | -14/+14 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #29801 from kamipo/extract_null_relation_test | Sean Griffin | 2017-07-17 | 2 | -118/+82 | |
|\ \ \ \ \ | ||||||
| * | | | | | Ensure calculation methods execute no queries | Ryuta Kamizono | 2017-07-15 | 1 | -60/+14 | |
| * | | | | | Extract `NullRelationTest` from `RelationTest` | Ryuta Kamizono | 2017-07-15 | 2 | -118/+128 | |
* | | | | | | Merge pull request #29799 from kamipo/remove_outdated_test_scoped_responds_to... | Sean Griffin | 2017-07-17 | 1 | -8/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove outdated `test_scoped_responds_to_delegated_methods` | Ryuta Kamizono | 2017-07-15 | 1 | -8/+0 | |
* | | | | | | | Merge pull request #25564 from brewski/serializable_hash_fix | Sean Griffin | 2017-07-17 | 1 | -4/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Correctly handle frozen options for ActiveRecord::Serialization#serializable_... | Brian Abreu | 2016-12-09 | 2 | -5/+3 | |
* | | | | | | | | Merge pull request #29757 from lugray/hash_with_indifferent_access_default | Sean Griffin | 2017-07-17 | 2 | -10/+56 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix HashWithIndifferentAccess#default when include?(nil) | Lisa Ugray | 2017-07-17 | 2 | -10/+56 | |
* | | | | | | | | | Merge pull request #29796 from kamipo/fix_where_with_custom_table | Sean Griffin | 2017-07-17 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix `where` with a custom table | Ryuta Kamizono | 2017-07-18 | 2 | -5/+5 | |
* | | | | | | | | | | Merge pull request #29816 from kamipo/persistence_delete_should_not_be_affect... | Sean Griffin | 2017-07-17 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | `Persistence#delete` should not be affected by scoping | Ryuta Kamizono | 2017-07-18 | 2 | -1/+12 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #29313 from Shopify/bootsnap | Rafael França | 2017-07-17 | 5 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add bootsnap to default Gemfile: | Burke Libbey | 2017-07-17 | 5 | -0/+15 | |
* | | | | | | | | | | Merge pull request #29788 from kamipo/remove_unused_mutex_m | Rafael França | 2017-07-17 | 4 | -11/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Make `generated_attribute_methods` to private | Ryuta Kamizono | 2017-07-14 | 3 | -6/+6 | |
| * | | | | | | | | | | Remove unused `Mutex_m` in Active Model | Ryuta Kamizono | 2017-07-14 | 2 | -6/+2 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #29793 from arthurnn/arthurnn/param_encoding_error_msg | Rafael França | 2017-07-17 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Scrub the invalid paramter value before using it in the error | Arthur Neves | 2017-07-17 | 2 | -2/+3 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #27662 from nhorton/patch-1 | Sean Griffin | 2017-07-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fixing "Adding Member Routes" documentation | Noah Horton | 2017-01-12 | 1 | -1/+1 | |
* | | | | | | | | | | Allow multiparameter assigned attributes to be used with `text_field` | Sean Griffin | 2017-07-17 | 5 | -1/+25 | |
* | | | | | | | | | | Merge pull request #29758 from glaucocustodio/patch-1 [ci skip] | Sean Griffin | 2017-07-17 | 2 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add documentation for class_attribute options | Glauco Custódio | 2017-07-17 | 2 | -2/+11 | |
* | | | | | | | | | | | Merge pull request #29825 from kamipo/remove_useless_arel_engine | Sean Griffin | 2017-07-17 | 4 | -19/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove useless `arel_engine` | Ryuta Kamizono | 2017-07-17 | 4 | -19/+3 | |
* | | | | | | | | | | | | Post.joins(:users) should not be affected by `User.current_scope` | Sean Griffin | 2017-07-17 | 3 | -4/+19 | |
* | | | | | | | | | | | | Merge pull request #28077 from Erol/make-reverse-merge-bang-order-consistent | Sean Griffin | 2017-07-17 | 4 | -5/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' into make-reverse-merge-bang-order-consistent | Sean Griffin | 2017-07-17 | 1531 | -11616/+18098 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #29810 from kamipo/add_first_parameter_indentation | Matthew Draper | 2017-07-17 | 6 | -30/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Enable `Layout/FirstParameterIndentation` cop | Ryuta Kamizono | 2017-07-17 | 6 | -30/+34 |