aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix_unscope_where_column_with_orSean Griffin2017-07-18212-582/+1480
|\
| * Merge pull request #29785 from cswilliams/rescue_postgres_connection_errors_o...Sean Griffin2017-07-181-0/+1
| |\
| | * Catch postgres connection errors when trying to dealloc the statement poolChris Williams2017-07-131-0/+1
| * | Merge pull request #29815 from posthumanism/add-except-optionSean Griffin2017-07-183-15/+440
| |\ \
| | * | Add `except` option for ActiveJob::TestHelper methodsposthumanism2017-07-183-15/+440
| * | | Merge pull request #29834 from kamipo/fix_unscoping_default_scope_with_sti_as...Sean Griffin2017-07-186-3/+39
| |\ \ \
| | * | | Fix unscoping `default_scope` for `Preloader`Ryuta Kamizono2017-07-192-1/+13
| | * | | Fix unscoping `default_scope` in STI associationsRyuta Kamizono2017-07-195-2/+26
| * | | | Don't convert dates to strings when using prepared statements in mysqlSean Griffin2017-07-182-3/+19
| |/ / /
| * | | Merge pull request #29839 from kamipo/fix_typoRafael França2017-07-181-1/+1
| |\ \ \
| | * | | Fix typo s/rause/raise/Ryuta Kamizono2017-07-191-1/+1
| |/ / /
| * | | Remove deprecated code concerning non-attributes and `*_will_change!`Sean Griffin2017-07-184-24/+7
| * | | Remove deprecated code concerning dirty methods in after callbacksSean Griffin2017-07-182-83/+11
| * | | Remove incorrect commentSean Griffin2017-07-181-2/+0
| |/ /
| * | Merge pull request #29828 from kamipo/fix_using_custom_table_with_joinsRafael França2017-07-176-18/+29
| |\ \
| | * | Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-186-18/+29
| * | | Merge pull request #29830 from schneems/schneems/codetriage-badgeSean Griffin2017-07-171-0/+2
| |\ \ \
| | * | | [ci skip] CodeTriage badgeschneems2017-07-171-0/+2
| |/ / /
| * | | Merge pull request #26343 from ccutrer/runner_from_stdinSean Griffin2017-07-174-2/+20
| |\ \ \
| | * | | support `-` as an argument to `rails runner`Cody Cutrer2017-07-174-2/+20
| |/ / /
| * / / Rename helper to force_lazy_load_hooks.Kasper Timm Hansen2017-07-171-14/+14
| |/ /
| * | Merge pull request #29801 from kamipo/extract_null_relation_testSean Griffin2017-07-172-118/+82
| |\ \
| | * | Ensure calculation methods execute no queriesRyuta Kamizono2017-07-151-60/+14
| | * | Extract `NullRelationTest` from `RelationTest`Ryuta Kamizono2017-07-152-118/+128
| * | | Merge pull request #29799 from kamipo/remove_outdated_test_scoped_responds_to...Sean Griffin2017-07-171-8/+0
| |\ \ \
| | * | | Remove outdated `test_scoped_responds_to_delegated_methods`Ryuta Kamizono2017-07-151-8/+0
| * | | | Merge pull request #25564 from brewski/serializable_hash_fixSean Griffin2017-07-171-4/+2
| |\ \ \ \
| | * | | | Correctly handle frozen options for ActiveRecord::Serialization#serializable_...Brian Abreu2016-12-092-5/+3
| * | | | | Merge pull request #29757 from lugray/hash_with_indifferent_access_defaultSean Griffin2017-07-172-10/+56
| |\ \ \ \ \
| | * | | | | Fix HashWithIndifferentAccess#default when include?(nil)Lisa Ugray2017-07-172-10/+56
| * | | | | | Merge pull request #29796 from kamipo/fix_where_with_custom_tableSean Griffin2017-07-172-5/+5
| |\ \ \ \ \ \
| | * | | | | | Fix `where` with a custom tableRyuta Kamizono2017-07-182-5/+5
| * | | | | | | Merge pull request #29816 from kamipo/persistence_delete_should_not_be_affect...Sean Griffin2017-07-172-1/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | `Persistence#delete` should not be affected by scopingRyuta Kamizono2017-07-182-1/+12
| |/ / / / / /
| * | | | | | Merge pull request #29313 from Shopify/bootsnapRafael França2017-07-175-0/+15
| |\ \ \ \ \ \
| | * | | | | | Add bootsnap to default Gemfile:Burke Libbey2017-07-175-0/+15
| * | | | | | | Merge pull request #29788 from kamipo/remove_unused_mutex_mRafael França2017-07-174-11/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Make `generated_attribute_methods` to privateRyuta Kamizono2017-07-143-6/+6
| | * | | | | | | Remove unused `Mutex_m` in Active ModelRyuta Kamizono2017-07-142-6/+2
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #29793 from arthurnn/arthurnn/param_encoding_error_msgRafael França2017-07-172-2/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Scrub the invalid paramter value before using it in the errorArthur Neves2017-07-172-2/+3
| | |/ / / / /
| * | | | | | Merge pull request #27662 from nhorton/patch-1Sean Griffin2017-07-171-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fixing "Adding Member Routes" documentationNoah Horton2017-01-121-1/+1
| * | | | | | | Allow multiparameter assigned attributes to be used with `text_field`Sean Griffin2017-07-175-1/+25
| * | | | | | | Merge pull request #29758 from glaucocustodio/patch-1 [ci skip]Sean Griffin2017-07-172-2/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Add documentation for class_attribute optionsGlauco Custódio2017-07-172-2/+11
| * | | | | | | | Merge pull request #29825 from kamipo/remove_useless_arel_engineSean Griffin2017-07-174-19/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove useless `arel_engine`Ryuta Kamizono2017-07-174-19/+3
| * | | | | | | | | Post.joins(:users) should not be affected by `User.current_scope`Sean Griffin2017-07-173-4/+19
| * | | | | | | | | Merge pull request #28077 from Erol/make-reverse-merge-bang-order-consistentSean Griffin2017-07-174-5/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-01 21:26:49 +0000