aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Fix outdated comment for `Core::ClassMethods#===` [ci skip] (#30146)Ryuta Kamizono2017-08-121-2/+2
* Merge pull request #30126 from chopraanmol1/support_for_has_many_and_has_one_...Rafael França2017-08-114-12/+26
|\
| * Changed join_fk private method to join_foreign_key public methodchopraanmol12017-08-093-15/+11
| * Currently if relation object are passed to where condition for has one or has...chopraanmol12017-08-083-3/+21
* | Merge pull request #30103 from yahonda/has_one_associations_failuresRafael França2017-08-111-1/+1
|\ \
| * | Add `:authors` fixture to address two random failures at HasOneAssociationsTestYasuo Honda2017-08-061-1/+1
* | | Merge pull request #30159 from allcentury/dump-temp-file-permissionsRafael França2017-08-111-1/+1
|\ \ \
| * | | Use copy to preserve file permissionsAnthony Ross2017-08-091-1/+1
* | | | Merge pull request #29720 from gaurish/ar_find_error_message_improvementRafael França2017-08-114-7/+11
|\ \ \ \
| * | | | Return Not found Ids in ActiveRecord::NotFoundGaurish Sharma2017-07-294-7/+11
* | | | | Merge pull request #30193 from zverok/robust-postgres-duplicate-dbRafael França2017-08-111-1/+1
|\ \ \ \ \
| * | | | | Update database duplication checkzverok2017-08-111-1/+1
* | | | | | Specify `table.name` only when `scope.table` and `table` are different (#29058)Ryuta Kamizono2017-08-112-4/+13
* | | | | | Fix RDoc formatting: `+` doesn't work with `@`ohbarye2017-08-112-6/+6
|/ / / / /
* | | | | Merge pull request #30183 from kamipo/reaper_run_after_conn_pool_initializedMatthew Draper2017-08-111-2/+3
|\ \ \ \ \
| * | | | | Start `@reaper.run` after connection pool initializedRyuta Kamizono2017-08-111-2/+3
* | | | | | Merge pull request #30152 from bogdanvlviv/fix_random_ci_failureMatthew Draper2017-08-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fix random CI failure due to non-deterministic sorting orderbogdanvlviv2017-08-091-1/+1
| |/ / / / /
* / / / / / Fix random CI failure DirtyTest:bogdanvlviv2017-08-091-4/+3
|/ / / / /
* | | | | Merge pull request #30108 from yui-knk/require_concurrent_mapRafael França2017-08-081-0/+2
|\ \ \ \ \
| * | | | | Add missed `require`yui-knk2017-08-071-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #30142 from yukideluxe/add-missing-bit-reload-associations...Sean Griffin2017-08-081-4/+12
|\ \ \ \ \
| * | | | | add missing collection.reload documentation [ci skip]Julia López2017-08-081-4/+12
* | | | | | Merge pull request #30133 from kamipo/fix_random_ci_failureRafael França2017-08-081-1/+1
|\ \ \ \ \ \
| * | | | | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2017-08-081-1/+1
| | |/ / / / | |/| | | |
* | | | | | Document `ActiveRecord::AttributeMethods::Dirty`Sean Griffin2017-08-081-9/+9
| |/ / / / |/| | | |
* | | | | Merge pull request #30125 from yukideluxe/add-reload-to-associations-docsRafael França2017-08-081-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add reload_association to documentation [ci skip]Julia López2017-08-071-0/+8
| |/ / /
* / / / [ci skip] Postgres --> PostgreSQLRyuta Kamizono2017-08-083-3/+3
|/ / /
* | / Lint activerecord/CHANGELOG.mdJon Moss2017-08-061-4/+4
| |/ |/|
* | Merge pull request #29520 from kirs/serialize-vs-postgres-native-columnSean Griffin2017-08-043-0/+42
|\ \
| * | Do not let use `serialize` on native JSON/array columnKir Shatrov2017-08-043-0/+42
| |/
* | Use `Concurrent::Map` than `Mutex` and `Mutex_m` for statement cachesRyuta Kamizono2017-08-042-10/+6
* | Fix all rubocop violationsRafael Mendonça França2017-08-031-2/+2
* | Passing `klass` to `StatementCache.new`Ryuta Kamizono2017-08-046-32/+31
* | Merge pull request #30011 from guilherme/fix-migration-generator-special-casesSean Griffin2017-08-031-1/+1
|\ \
| * | Handling add/remove to/from migration edge casesGuilherme Reis Campos2017-08-031-1/+1
* | | Merge pull request #29914 from kamipo/relation_merger_should_not_fill_empty_v...Matthew Draper2017-08-023-19/+30
|\ \ \
| * | | `get_value` and `set_value` in `Relation` are no longer used externallyRyuta Kamizono2017-07-251-9/+10
| * | | `Relation::Merger` should not fill `values` with empty valuesRyuta Kamizono2017-07-252-10/+20
* | | | Merge pull request #29842 from kamipo/fix_find_by_with_rangeMatthew Draper2017-08-023-4/+12
|\ \ \ \
| * | | | Fix `find_by` with range conditionsRyuta Kamizono2017-07-203-4/+12
* | | | | Merge pull request #29271 from rails/unlock-minitestKasper Timm Hansen2017-08-0215-64/+83
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-01684-1127/+2560
| |\ \ \ \ \
| * | | | | | Move `reset_pk_sequence!` test to `AdapterTestWithoutTransaction`yuuji.yaginuma2017-07-171-20/+20
| * | | | | | Reset column information after schema changedyuuji.yaginuma2017-07-161-0/+2
| * | | | | | Merge pull request #29380 from y-yagi/insert_environment_value_to_table_befor...Kasper Timm Hansen2017-07-151-0/+4
| |\ \ \ \ \ \
| | * | | | | | Insert environment value to `InternalMetadata` after recreating the tableyuuji.yaginuma2017-06-091-0/+4
| * | | | | | | Stupid empty line added after merge.Kasper Timm Hansen2017-07-151-1/+0
| * | | | | | | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-07-15152-1011/+1789
| |\ \ \ \ \ \ \