aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into feature/reselect-methodWillian Gustavo Veiga2018-10-2253-363/+427
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into feature/reselect-methodWillian Gustavo Veiga2018-10-1749-347/+518
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into feature/reselect-methodWillian Gustavo Veiga2018-10-11137-1275/+2336
| |\ \ \ \ \ \
| * | | | | | | Mention reselect new method in the "Active Record Query Interface" guideWillian Gustavo Veiga2018-10-041-0/+26
| | | | | | | |
| * | | | | | | Add changelog entryWillian Gustavo Veiga2018-10-021-0/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into feature/reselect-methodWillian Gustavo Veiga2018-10-02719-3931/+10739
| |\ \ \ \ \ \ \
| * | | | | | | | Add reselect methodWillian Gustavo Veiga2018-08-132-0/+19
| | | | | | | | |
* | | | | | | | | Remove unused requiresRyuta Kamizono2019-03-011-2/+0
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `require "bcrypt"` is unsed since #15431. `require "models/topic"` is unused since 893c647da37189543b2c2d55b07d414b1ba8b0d0.
* | | | | | | | Avoid `Topic.dup` to prevent weird test failureRyuta Kamizono2019-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternative of 65c4b1b50df3fa59198de2d45d1f54b61ecc7864. https://buildkite.com/rails/rails/builds/59147#117e9445-23e8-455a-b486-ea0ae9636405/120-129
* | | | | | | | Reset dirty `topics` table for `SerializedAttributeTest`Ryuta Kamizono2019-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some untransactional tests (e.g. `CallbacksOnMultipleActionsTest`) makes `topics` table dirty. We should reset dirty `topics` table before `SerializedAttributeTest` is run. https://travis-ci.org/rails/rails/jobs/499719624#L1209-L1215
* | | | | | | | Removes unnecessary dot in regexpXavier Noria2019-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A string S matches ([.]|\b)html if an only if matches \bhtml: * If S matches [.]html, then it matches \bhtml. * If S matches \bhtml, then it matches \bhtml. Reciprocally: * If S matches \bhtml, then it matches ([.]|\b)html. The character class can be removed, and since we are on it we remove the group too so that it is clear to a reader of the code that there is no grouping going on. References #35166.
* | | | | | | | Merge pull request #35435 from meinac/fix_recently_added_wrong_docKasper Timm Hansen2019-02-281-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | [ci skip] The `find` method coerces the given arguments to integer if the `primary key` is integer
| * | | | | | | [ci skip] The `find` method coerces the given arguments to integer if the ↵Mehmet Emin INAC2019-02-281-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | `primary key` is integer
* | | | | | | Merge pull request #35432 from meinac/minor_doc_fixKasper Timm Hansen2019-02-281-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Fix the documentation of ActiveRecord::FinderMethods#find
| * | | | | | | [ci skip] Fix the documentation of ActiveRecord::FinderMethods#findMehmet Emin INAC2019-02-281-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's mentioned everywhere as `ActiveRecord::RecordNotFound` so to be coherent with the rest of the documentation I've applied it here. Also doc was saying if the parameter is integer it coerces it which is other way around.
* | | | | | | Use dedicated `Topic` model for `SerializedAttributeTest`Ryuta Kamizono2019-02-282-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes both #34555 and #34738. Revert "Merge pull request #34900 from gmcgibbon/fix_test_find_only_some_columns" This reverts commit ff807f823b869d3491935a096183ee2bebd58e7b, reversing changes made to 9f1a07af0499080c9fd8815705a03a4c7e8fb506. Revert "Merge pull request #34560 from gmcgibbon/fix_decorate_leak_on_serial_attr_test" This reverts commit bd62389307e138ee0f274a9d62697567a3334ea0, reversing changes made to ec66c6a2fa4ee200259341a18ecd96310f388ba3. Revert "Fix unstable `test_serialized_attribute_works_under_concurrent_initial_access` test" This reverts commit 65c4b1b50df3fa59198de2d45d1f54b61ecc7864.
* | | | | | | Merge pull request #35428 from zachwalton/review/honorable-mentionKasper Timm Hansen2019-02-271-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add note about idle connection reaper to 5.2 release notes
| * | | | | | | add note about idle connection reaper to 5.2 release notesZach Walton2019-02-271-0/+4
|/ / / / / / /
* | | | | | | Refactor `generated_relation_methods` to remove duplicated code on ↵Ryuta Kamizono2019-02-281-31/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `ClassSpecificRelation`
* | | | | | | Allow returning nil for `default_scope`Ryuta Kamizono2019-02-282-5/+5
| | | | | | |
* | | | | | | Fix indentation [ci skip]Ryuta Kamizono2019-02-271-2/+2
| | | | | | |
* | | | | | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2019-02-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/499061043#L1187-L1193
* | | | | | | Fix test that was broken by adding a default scope to an existing modelRafael Mendonça França2019-02-263-2/+10
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #35397 from bogdanvlviv/run-memcachestoretest-on-buildkiteMatthew Draper2019-02-273-14/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Run activesupport's memcache store tests on Buildkite
| * | | | | | Run activesupport's memcache store tests on Buildkitebogdanvlviv2019-02-263-14/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | Related to 287920ca7d06c8f51198ec750d65ba703835b257
* | | | | | Fix preload with nested associationsRafael Mendonça França2019-02-263-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the middle association doesn't have any records and the inner association is not an empty scope the owner will be `nil` so we can't try to reset the inverse association.
* | | | | | :scissors:Ryuta Kamizono2019-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Add negative scopes for all enum values (#35381)David Heinemeier Hansson2019-02-263-0/+25
| | | | | | | | | | | | | | | | | | Add negative scopes for all enum values
* | | | | | Merge pull request #35422 from ricardotk002/fix-indentation-ad-routingRafael França2019-02-261-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix code examples' indentation in ActionDispatch::Routing
| * | | | | | Fix code examples' indentation in ActionDispatch::Routing [ci skip]Ricardo Díaz2019-02-261-4/+4
| | | | | | |
* | | | | | | Merge pull request #35411 from rails/pass-locals-to-templateAaron Patterson2019-02-268-56/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Pass locals in to the template object on construction
| * | | | | | Remove unused method / fix documentationAaron Patterson2019-02-261-6/+1
| | | | | | |
| * | | | | | Update actionview/lib/action_view/template/resolver.rbJohn Hawthorn2019-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: tenderlove <tenderlove@github.com>
| * | | | | | `original_encoding` isn't used, so deprecate it and remove the ivarAaron Patterson2019-02-252-5/+5
| | | | | | |
| * | | | | | Expand key word args for ActionView::TemplateAaron Patterson2019-02-252-4/+4
| | | | | | |
| * | | | | | Don't mutate `virtual_path`, remove `decorate`Aaron Patterson2019-02-252-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `virtual_path` is calculated in the constructor when the Template object is allocated. We don't actually need to set it in the `decorate` method. That means we can remove the decorate method all together.
| * | | | | | Pass locals in to the template object on constructionAaron Patterson2019-02-257-27/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that locals are passed in to the template objects when they are constructed, then removes the `locals=` mutator on the template object. This means we don't need to mutate Template objects with locals in the `decorate` method.
* | | | | | | Don't cache `find_by` statements on STI subclassesRyuta Kamizono2019-02-273-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caching `find_by` statements on STI subclasses is unsafe, since `type IN (?,?,?,?)` part is dynamic, and we don't have SQL statements cache invalidation when a STI subclass is created or removed for now.
* | | | | | | Test that no datetime precision isn't truncated on assignmentRyuta Kamizono2019-02-272-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, max precision (= 6) isn't regarded as unlimited precision for now.
* | | | | | | Merge pull request #35412 from abhchand/correctly-load-blob-associationGeorge Claghorn2019-02-263-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ensure that the `_blob` association is properly loaded when attaching `::One`
| * | | | | | | [ActiveStorage] Ensure that the `_blob` association is properly loaded when ↵Abhishek Chandrasekhar2019-02-263-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attaching `::One` Consider a model with `One` and `Many` attachments configured: class User < ActiveRecord::Base has_one_attached :avatar has_many_attached :highlights end === One Attachment After attaching `One` attachment (`:avatar`), we can see that the associated `_blob` record (`:avatar_blob`) still returns as `nil`. user.avatar.attach(blob) user.avatar_attachment.present? => true user.avatar_blob.present? => false # Incorrect! This is a false negative. It happens because after the attachment and blob are built: 1. The record already has its `_blob` association loaded, as `nil` 2. the `::Attachment` is associated with the record but the `::Blob` only gets associated with the `::Attachment`, not the record itself In reality, the blob does in fact exist. We can verify this as follows: user.avatar.attach(blob) user.avatar_attachment.blob.present? => true # Blob does exist! The fix in this change is to simply assign the `::Blob` when assigning the `::Attachment`. After this fix is applied, we correctly observe: user.avatar.attach(blob) user.avatar_attachment.present? => true user.avatar_blob.present? => true # Woohoo! === Many Attachments We don't see this issue with `Many` attachments because the `_blob` association is already loaded as part of attaching more/newer blobs. user.highlights.attach(blob) user.highlights_attachments.any? => true user.highlights_blobs.any? => true
* | | | | | | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2019-02-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://buildkite.com/rails/rails/builds/59106#596284a1-4692-4640-8a50-c4286e173bbb/115-126
* | | | | | | | Merge pull request #35361 from ↵Ryuta Kamizono2019-02-274-3/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jvillarejo/fix_wrong_size_query_with_distinct_select Fix different `count` calculation when using `size` with DISTINCT `select`
| * | | | | | | | fixes different `count` calculation when using `size` manual `select` with ↵jvillarejo2019-02-264-3/+39
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DISTINCT When using `select` with `'DISTINCT( ... )'` if you use method `size` on a non loaded relation it overrides the column selected by passing `:all` so it returns different value than count. This fixes #35214
* | | | | | | | Merge pull request #35414 from abhaynikam/35406-followup-rename-template-formatRafael França2019-02-251-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | [ci skip] Renamed formats -> format in test after #35406
| * | | | | | | [ci skip] Renamed formats -> format in test after #35406Abhay Nikam2019-02-261-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #35408 from rails/template-has-one-variantAaron Patterson2019-02-253-13/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Template has one variant
| * | | | | | | Change `variants` to `variant`Aaron Patterson2019-02-252-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Templates only have one variant, so we should not store it in an array. This commit converts `variants` to `variant` and deprecates the plural accessor
| * | | | | | | Remove potential `variants` mutation in `decorate`Aaron Patterson2019-02-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if the template is constructed with a `nil` variant, the array it constructs will never be `empty?`: https://github.com/rails/rails/blob/56b030605b4d968077a4ddb96b4ab619e75fb999/actionview/lib/action_view/template.rb#L152 We get an array that is `[nil]`, which is not empty, so this conditional is never true.
| * | | | | | | Convert `variant` to a keyword argAaron Patterson2019-02-251-2/+2
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-14 05:48:00 +0000