aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #35455 from yahonda/revert_9395Ryuta Kamizono2019-03-031-10/+2
|\ \ \ | |/ / |/| | Oracle 12.2+ supports 128 byte identifier length
| * | Oracle 12.2+ supports 128 byte identifier lengthYasuo Honda2019-03-031-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby $ ARCONN=oracle bin/test test/cases/migration/columns_test.rb -n test_rename_column_with_multi_column_index ... snip ... F Failure: ActiveRecord::Migration::ColumnsTest#test_rename_column_with_multi_column_index [/home/yahonda/git/rails/activerecord/test/cases/migration/columns_test.rb:113]: --- expected +++ actual @@ -1 +1 @@ -["i_test_models_hat_style_size"] +["index_test_models_on_hat_style_and_size"] ``` Kind of reverting #9395 Refer https://github.com/rsim/oracle-enhanced/pull/1703
* | | activesupport: Simplify class_attribute implementation (#35454)Dylan Thacker-Smith2019-03-031-15/+10
|/ / | | | | | | | | | | | | | | * activesupport(class_attribute): Use redefine_singleton_method * activesupport(class_attribute): Use keyword arguments * activesupport(class_attribute): Avoid unnecessary redefinition for default
* | Merge pull request #35446 from jhawthorn/actionmailer_format_assignmentAaron Patterson2019-03-015-2/+17
|\ \ | | | | | | Add test and change how format set in ActionMailer
| * | Add test and change how format set in ActionMailerJohn Hawthorn2019-03-015-2/+17
|/ / | | | | | | | | | | | | | | | | | | Previously this used self.formats= to set the format which render would use to find templates. This worked, but was untested, and looked a little confusing because it was doing the mutation within a loop. This commit replaces the assignment with passing formats: [format] into the render call, which makes it more obvious that that's the purpose of the format. It also adds a test to verify the formats being used.
* | Merge pull request #35429 from jhawthorn/template_format_nilAaron Patterson2019-03-019-19/+16
|\ \ | | | | | | Allow nil format on templates
| * | Remove query_format argument from resolverJohn Hawthorn2019-02-263-5/+5
| | |
| * | Create templates with format=nilJohn Hawthorn2019-02-266-9/+11
| | |
| * | Allow format to be nilJohn Hawthorn2019-02-261-5/+0
| | |
* | | Use the correct model in the testRafael Mendonça França2019-03-011-1/+1
| | | | | | | | | | | | | | | This was using a model without a default scope what made the test don't break anymore if the code is removed.
* | | Merge pull request #35441 from kamipo/allow_from_with_index_hintRyuta Kamizono2019-03-012-12/+27
|\ \ \ | | | | | | | | Relax table name detection in `from` to allow any extension like INDEX hint
| * | | Relax table name detection in `from` to allow any extension like INDEX hintRyuta Kamizono2019-03-012-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #35360 allows table name qualified if `from` has original table name. But that is still too strict. We have a valid use case that `from` with INDEX hint (e.g. `from("comments USE INDEX (PRIMARY)")`). So I've relaxed the table name detection in `from` to allow any extension like INDEX hint. Fixes #35359.
* | | | Merge pull request #35431 from kamipo/enable_sql_cache_on_findRyuta Kamizono2019-03-012-4/+23
|\ \ \ \ | |/ / / |/| | | Enable SQL statement cache for `find` on base class as with `find_by`
| * | | Enable SQL statement cache for `find` on base class as with `find_by`Ryuta Kamizono2019-03-012-4/+23
| | | | | | | | | | | | | | | | Related and follows d333d85254d27cd572e6ecce8ee850c107a4f340.
* | | | Merge pull request #33611 from willianveiga/feature/reselect-methodAndrew White2019-03-014-0/+58
|\ \ \ \ | | | | | | | | | | Add reselect method
| * | | | Avoid creating an extra relation instanceWillian Gustavo Veiga2018-10-241-2/+9
| | | | |
| * | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 19:04:00 +0000