aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26425 from prathamesh-sonpatki/fix-nil-issueMatthew Draper2016-10-032-10/+19
|\
| * Fix issue with `cache_key` when the named timestamp column has value nilPrathamesh Sonpatki2016-09-072-10/+19
* | Add missing require for zlibLars Kanis2016-10-011-0/+1
* | Make PG deadlock error more deterministicMatthew Draper2016-10-011-9/+12
* | Merge pull request #26584 from Shopify/cached-query-nameRafael França2016-09-304-11/+18
|\ \
| * | Preserve cached queries name in AS notificationsJean Boussier2016-09-224-11/+18
* | | Don't skip in-memory insertion of associations when loaded in validateSean Griffin2016-09-294-16/+43
* | | Merge pull request #26653 from Neodelf/new_branch_nameJon Moss2016-09-281-1/+1
|\ \ \
| * | | [ci skip] Use right format textAndrey Molchanov2016-09-281-1/+1
* | | | Merge pull request #26629 from kamipo/fix_doc_formatJon Moss2016-09-261-3/+3
|\ \ \ \
| * | | | Fix doc format for `RecordFetchWarning` [ci skip]Ryuta Kamizono2016-09-271-3/+3
* | | | | Use xor to avoid allocations in `AR::Core#hash`Sean Griffin2016-09-261-1/+1
* | | | | [ci skip] Update PG adapter documentationAlex Kitchens2016-09-261-1/+1
|/ / / /
* | | | Merge pull request #26622 from alexcameron89/pg_result_docJon Moss2016-09-251-4/+4
|\ \ \ \
| * | | | [ci skip] Clarify Postgresql DocumentationAlex Kitchens2016-09-251-4/+4
* | | | | Fix code formatting in `#save` RDoc [ci skip]Adam Crownoble2016-09-251-2/+2
|/ / / /
* | | | Serialize JSON attribute value nil as SQL NULL, not JSON 'null'Trung Duc Tran2016-09-234-1/+41
* | | | Return true if attribute is not changed for update_attributePrathamesh Sonpatki2016-09-233-4/+12
| |/ / |/| |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-09-201-2/+2
|\ \ \
| * | | [ci skip] Fix wrong rdoc-ref links, the format is {}[] not []{}Prathamesh Sonpatki2016-09-141-2/+2
* | | | Always store errors details information with symbolsRafael Mendonça França2016-09-193-15/+32
* | | | Merge pull request #26447 from kamipo/reduce_array_allocationSantiago Pastorino2016-09-191-3/+1
|\ \ \ \
| * | | | Reduce array allocation when `where` with passed hashRyuta Kamizono2016-09-101-3/+1
* | | | | Merge pull request #26448 from kamipo/remove_collection_association_uniqKasper Timm Hansen2016-09-181-1/+0
|\ \ \ \ \
| * | | | | Remove unnecessry `alias uniq distinct` for collection associationRyuta Kamizono2016-09-101-1/+0
| |/ / / /
* | | | | Merge pull request #26446 from kamipo/rename_type_var_name_to_typeEileen M. Uchitelle2016-09-171-10/+8
|\ \ \ \ \
| * | | | | Rename variable name that returning `type_for` to `type` from `column`Ryuta Kamizono2016-09-111-10/+8
| |/ / / /
* | | | | Merge pull request #26497 from koppen/26496-touch_with_optimistic_lockingEileen M. Uchitelle2016-09-173-1/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Clear attribute changes after handling lockingJakob Skjerning2016-09-143-1/+9
* | | | | improve error message when include assertions failMichael Grosser2016-09-1634-141/+141
* | | | | Force correct namespace when using TransactionManagerArthur Neves2016-09-161-1/+1
* | | | | fix typo in `add_column` doc [ci skip]yuuji.yaginuma2016-09-161-1/+1
|/ / / /
* | | | Fix broken comments indentation caused by rubocop auto-correct [ci skip]Ryuta Kamizono2016-09-1431-1461/+1462
* | | | Address `warning: ambiguous first argument; put parentheses or a space even a...Yasuo Honda2016-09-131-2/+2
* | | | 5-0-backport: activerecord/mysql2: Avoid setting @connection to nil, just clo...Dylan Thacker-Smith2016-09-131-0/+5
* | | | Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_namesArthur Nogueira Neves2016-09-133-3/+5
|\ \ \ \
| * | | | remove duplicated fixture set namesyuuji.yaginuma2016-09-123-3/+5
* | | | | Merge pull request #26460 from kamipo/remove_useless_test_string_with_crazy_c...Sean Griffin2016-09-121-6/+2
|\ \ \ \ \
| * | | | | Remove useless `test_string_with_crazy_column`Ryuta Kamizono2016-09-111-6/+2
| |/ / / /
* | | | | Merge pull request #26434 from dylanahsmith/mysql2-no-nil-connectionArthur Nogueira Neves2016-09-123-15/+28
|\ \ \ \ \
| * | | | | activerecord/mysql2: Avoid setting @connection to nil, just close itDylan Thacker-Smith2016-09-083-15/+28
| | |_|_|/ | |/| | |
* | | | | Merge pull request #26459 from ysksn/add_test_for_activerecord_enumEileen M. Uchitelle2016-09-124-0/+43
|\ \ \ \ \
| * | | | | Add tests for ActiveRecord::Enum#enum when suffix specifiedYosuke Kabuto2016-09-124-0/+43
| | |/ / / | |/| | |
* | | | | Merge pull request #26458 from kamipo/remove_unused_require_threadSantiago Pastorino2016-09-111-1/+0
|\ \ \ \ \
| * | | | | Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb`Ryuta Kamizono2016-09-111-1/+0
| |/ / / /
* / / / / Remove duplicated `elsif` branchRyuta Kamizono2016-09-111-2/+0
|/ / / /
* | / / Remove outdated "#TODO: Fix for binds." comment [ci skip]Ryuta Kamizono2016-09-111-1/+0
| |/ / |/| |
* | | Merge pull request #26380 from kamipo/pass_set_inverse_instance_blockKasper Timm Hansen2016-09-081-2/+2
|\ \ \ | |/ / |/| |
| * | Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`Ryuta Kamizono2016-09-031-2/+2
* | | Revert " [ci skip] Remove duplicate example."Vipul A M2016-09-061-0/+5