rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \|	Merge pull request #35446 from jhawthorn/actionmailer_format_assignment	Aaron Patterson	2019-03-01	5	-2/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test and change how format set in ActionMailer
\| * \| \| \| \| \| \| \| \|	Add test and change how format set in ActionMailer	John Hawthorn	2019-03-01	5	-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_nil	Aaron Patterson	2019-03-01	9	-19/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow nil format on templates
\| * \| \| \| \| \| \| \| \|	Remove query_format argument from resolver	John Hawthorn	2019-02-26	3	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Create templates with format=nil	John Hawthorn	2019-02-26	6	-9/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow format to be nil	John Hawthorn	2019-02-26	1	-5/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Use the correct model in the test	Rafael Mendonça França	2019-03-01	1	-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_hint	Ryuta Kamizono	2019-03-01	2	-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 hint	Ryuta Kamizono	2019-03-01	2	-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_find	Ryuta Kamizono	2019-03-01	2	-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 Kamizono	2019-03-01	2	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related and follows d333d85254d27cd572e6ecce8ee850c107a4f340.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #33611 from willianveiga/feature/reselect-method	Andrew White	2019-03-01	4	-0/+58
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add reselect method
\| * \| \| \| \| \| \| \| \| \| \|	Avoid creating an extra relation instance	Willian Gustavo Veiga	2018-10-24	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into feature/reselect-method	Willian Gustavo Veiga	2018-10-22	53	-363/+427
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into feature/reselect-method	Willian Gustavo Veiga	2018-10-17	49	-347/+518
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into feature/reselect-method	Willian Gustavo Veiga	2018-10-11	137	-1275/+2336
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention reselect new method in the "Active Record Query Interface" guide	Willian Gustavo Veiga	2018-10-04	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry	Willian Gustavo Veiga	2018-10-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into feature/reselect-method	Willian Gustavo Veiga	2018-10-02	719	-3931/+10739
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add reselect method	Willian Gustavo Veiga	2018-08-13	2	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused requires	Ryuta Kamizono	2019-03-01	1	-2/+0
\| \|_\|_\|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`require "bcrypt"` is unsed since #15431. `require "models/topic"` is unused since 893c647da37189543b2c2d55b07d414b1ba8b0d0.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid `Topic.dup` to prevent weird test failure	Ryuta Kamizono	2019-03-01	1	-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 Kamizono	2019-03-01	1	-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 regexp	Xavier Noria	2019-02-28	1	-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_doc	Kasper Timm Hansen	2019-02-28	1	-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 INAC	2019-02-28	1	-1/+1
\|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`primary key` is integer
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #35432 from meinac/minor_doc_fix	Kasper Timm Hansen	2019-02-28	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix the documentation of ActiveRecord::FinderMethods#find
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix the documentation of ActiveRecord::FinderMethods#find	Mehmet Emin INAC	2019-02-28	1	-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 Kamizono	2019-02-28	2	-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-mention	Kasper Timm Hansen	2019-02-27	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about idle connection reaper to 5.2 release notes
\| * \| \| \| \| \| \| \| \| \| \| \| \|	add note about idle connection reaper to 5.2 release notes	Zach Walton	2019-02-27	1	-0/+4
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Refactor `generated_relation_methods` to remove duplicated code on ↵	Ryuta Kamizono	2019-02-28	1	-31/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`ClassSpecificRelation`
* \| \| \| \| \| \| \| \| \| \| \| \|	Allow returning nil for `default_scope`	Ryuta Kamizono	2019-02-28	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix indentation [ci skip]	Ryuta Kamizono	2019-02-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix random CI failure due to non-deterministic sorting order	Ryuta Kamizono	2019-02-27	1	-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 model	Rafael Mendonça França	2019-02-26	3	-2/+10
\| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #35397 from bogdanvlviv/run-memcachestoretest-on-buildkite	Matthew Draper	2019-02-27	3	-14/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run activesupport's memcache store tests on Buildkite
\| * \| \| \| \| \| \| \| \| \| \| \|	Run activesupport's memcache store tests on Buildkite	bogdanvlviv	2019-02-26	3	-14/+15
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to 287920ca7d06c8f51198ec750d65ba703835b257
* \| \| \| \| \| \| \| \| \| \| \|	Fix preload with nested associations	Rafael Mendonça França	2019-02-26	3	-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 Kamizono	2019-02-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \| \|	Add negative scopes for all enum values (#35381)	David Heinemeier Hansson	2019-02-26	3	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add negative scopes for all enum values
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #35422 from ricardotk002/fix-indentation-ad-routing	Rafael França	2019-02-26	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix code examples' indentation in ActionDispatch::Routing
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix code examples' indentation in ActionDispatch::Routing [ci skip]	Ricardo Díaz	2019-02-26	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #35411 from rails/pass-locals-to-template	Aaron Patterson	2019-02-26	8	-56/+47
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Pass locals in to the template object on construction
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused method / fix documentation	Aaron Patterson	2019-02-26	1	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Update actionview/lib/action_view/template/resolver.rb	John Hawthorn	2019-02-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: tenderlove <tenderlove@github.com>
\| * \| \| \| \| \| \| \| \| \| \|	`original_encoding` isn't used, so deprecate it and remove the ivar	Aaron Patterson	2019-02-25	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Expand key word args for ActionView::Template	Aaron Patterson	2019-02-25	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Don't mutate `virtual_path`, remove `decorate`	Aaron Patterson	2019-02-25	2	-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 construction	Aaron Patterson	2019-02-25	7	-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.