aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29413 from kamipo/fix_association_with_scope_including_joinsRafael França2017-07-045-70/+46
|\
| * Fix eager loading association with scope including joinsRyuta Kamizono2017-07-042-11/+21
| * Fix preloading association with scope including joinsRyuta Kamizono2017-07-043-49/+25
| * Remove unused `association_key` and `table` methods in `Preloader::Association`Ryuta Kamizono2017-07-041-10/+0
* | Merge pull request #29667 from kamipo/add_missing_attr_name_to_sRafael França2017-07-041-2/+3
|\ \
| * | Add missing `attr_name.to_s` in `AttributeMutationTracker`Ryuta Kamizono2017-07-041-2/+3
| |/
* | Merge pull request #29653 from kamipo/fix_test_copying_migrations_preserving_...Rafael França2017-07-041-4/+6
|\ \
| * | Fix `test_copying_migrations_preserving_magic_comments`Ryuta Kamizono2017-07-021-4/+6
* | | Remove database specific JSON typesRyuta Kamizono2017-07-053-14/+0
| |/ |/|
* | Merge branch 'master' into require_relative_2017Xavier Noria2017-07-0225-98/+154
|\ \
| * | Fix removed version 5.2 to 6.0 in the deprecation messageRyuta Kamizono2017-07-021-1/+1
| * | Apply record state based on parent transaction stateeileencodes2017-07-012-3/+16
| * | Deprecate and replace `set_state` methodeileencodes2017-07-011-6/+27
| |/
| * Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02237-237/+0
| * Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02237-0/+237
| |\
| | * Enforce frozen string in RubocopKir Shatrov2017-07-01237-0/+237
| * | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-0214-27/+26
| |\ \
| | * | Make ActiveRecord frozen string literal friendly.Pat Allan2017-06-2014-27/+26
| * | | Merge pull request #29631 from kamipo/should_be_clear_association_idsMatthew Draper2017-07-011-2/+11
| |\ \ \
| | * | | Should be clear `@association_ids` when joined newly associated recordRyuta Kamizono2017-06-301-2/+11
| * | | | Merge pull request #29634 from kamipo/dont_cache_queries_for_schema_statementsMatthew Draper2017-07-0110-55/+70
| |\ \ \ \
| | * | | | Don't cache queries for schema statementsRyuta Kamizono2017-06-3010-55/+70
| | | |_|/ | | |/| |
| * | | | Merge pull request #28808 from fschwahn/fix-polymorphic-automic-inverseMatthew Draper2017-07-011-4/+3
| |\ \ \ \
| | * | | | Remove :polymorphic from INVALID_AUTOMATIC_INVERSE_OPTIONSFabian Schwahn2017-04-201-4/+3
| * | | | | Merge pull request #29536 from nickrivadeneira/fix-yamlMatthew Draper2017-07-011-1/+1
| |\ \ \ \ \
| | * | | | | Ensure `false` is preserved in attr serializationNick Rivadeneira2017-06-221-1/+1
* | | | | | | [Active Record] require => require_relativeAkira Matsuda2017-07-0134-133/+133
|/ / / / / /
* | | / / / Delete stale comment for `AR::Associations::Builder::CollectionAssociation`fatkodima2017-07-011-2/+0
| |_|/ / / |/| | | |
* | | | | Merge pull request #29623 from kamipo/should_use_same_connection_in_query_cacheRafael França2017-06-292-4/+4
|\ \ \ \ \
| * | | | | Should use the same connection in using query cacheRyuta Kamizono2017-06-292-4/+4
* | | | | | Fix the next version of Rails from 5.3 to 6.0Ryuta Kamizono2017-06-291-2/+2
| |_|_|/ / |/| | | |
* | | | | Deprecate delegating to `arel` in `Relation`Ryuta Kamizono2017-06-291-0/+2
* | | | | Merge pull request #29616 from kamipo/remove_unused_aliased_table_nameRafael França2017-06-291-8/+0
|\ \ \ \ \
| * | | | | Remove unused `aliased_table_name` in `Association`Ryuta Kamizono2017-06-291-8/+0
* | | | | | Merge pull request #29569 from kamipo/fix_to_scoping_is_correctly_restoredRafael França2017-06-292-4/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix to scoping is correctly restoredRyuta Kamizono2017-06-292-4/+5
* | | | | | Merge pull request #28932 from kamipo/remove_method_missing_in_relation_deleg...Rafael França2017-06-281-10/+0
|\ \ \ \ \ \
| * | | | | | Remove `method_missing` in `Relation::Delegation`Ryuta Kamizono2017-04-301-10/+0
* | | | | | | Merge pull request #29612 from kamipo/use_quote_method_rather_than_single_quoteRafael França2017-06-285-13/+12
|\ \ \ \ \ \ \
| * | | | | | | Use `quote` method rather than single quotes to identifiers in SQLRyuta Kamizono2017-06-295-13/+12
* | | | | | | | Merge pull request #29129 from kamipo/prevent_extra_through_scopeRafael França2017-06-281-2/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Prevent extra `through_scope`Ryuta Kamizono2017-05-181-2/+4
* | | | | | | | Merge pull request #29301 from kamipo/receiver_in_scope_should_be_relationRafael França2017-06-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | The receiver in a scope should be a `relation`Ryuta Kamizono2017-06-011-1/+1
* | | | | | | | | Merge pull request #29076 from kamipo/use_timestamp_attributes_for_update_in_...Rafael França2017-06-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use `timestamp_attributes_for_update_in_model` rather than `timestamp_attribu...Ryuta Kamizono2017-05-141-1/+1
* | | | | | | | | | Merge pull request #28928 from kamipo/remove_habtm_initializeRafael França2017-06-281-4/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Remove `HasAndBelongsToManyReflection#initialize`Ryuta Kamizono2017-04-291-4/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #29405 from kamipo/locked_should_not_build_arelRafael França2017-06-285-9/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove delegating to arel in a relationRyuta Kamizono2017-06-294-8/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 06:59:50 +0000