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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #34609 from kamipo/delete_all_on_collection_proxy	Ryuta Kamizono	2018-12-04	5	-6/+23
\|\
\| *	Ensure that `delete_all` on collection proxy returns affected count	Ryuta Kamizono	2018-12-04	5	-6/+23
* \|	Merge pull request #34607 from gmcgibbon/clear_scope_on_delete	Ryuta Kamizono	2018-12-04	4	-4/+72
\|\ \ \| \|/ \|/\|
\| *	Reset scope after collection delete	Gannon McGibbon	2018-12-04	4	-4/+72
\|/
*	Merge pull request #34596 from bogdanvlviv/imporve-parallel-testing-guide	Gannon McGibbon	2018-12-03	1	-10/+9
\|\
\| *	Improve parallel testing guide [ci skip]	bogdanvlviv	2018-12-03	1	-10/+9
* \|	Merge pull request #34602 from guizmaii/master	Rafael França	2018-12-03	1	-1/+2
\|\ \
\| * \|	Pass the `connection` to the `@instrumenter.instrument` method call	jules Ivanic	2018-12-03	1	-1/+2
* \| \|	Merge pull request #34601 from evexoio/34600-test_should_return_nil_as_average	Ryuta Kamizono	2018-12-03	1	-2/+6
\|\ \ \
\| * \| \|	Fix NumericData.average test on ruby 2.6	Abdallah Samman	2018-12-03	1	-2/+6
\| \|/ /
* / /	Address "warning: shadowing outer local variable - parts"	Ryuta Kamizono	2018-12-03	4	-7/+8
\|/ /
* \|	Merge pull request #34597 from utilum/assigned_but_unused_variable_bird	Yuji Yaginuma	2018-12-03	1	-1/+1
\|\ \
\| * \|	Assigned but unused variable - bird	utilum	2018-12-03	1	-1/+1
* \| \|	Merge pull request #34598 from rmacklin/add-missing-authorship-to-changelog-e...	Rafael França	2018-12-02	1	-0/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add missing authorship to ActionCable changelog entry	Richard Macklin	2018-12-02	1	-0/+2
\|/ /
* \|	Merge pull request #34585 from marceloperini/marceloperini/33795	Yuji Yaginuma	2018-12-03	1	-0/+1
\|\ \
\| * \|	add require 'database/setup' in activestorage/test/service/s3_service_test.rb	Marcelo Perini Veloso	2018-12-01	1	-0/+1
\| \|/
* \|	Merge pull request #34595 from albertoalmagro/remove-unnecessary-variable	Ryuta Kamizono	2018-12-03	1	-11/+2
\|\ \
\| * \|	Remove unnecessary variable route	Alberto Almagro	2018-12-02	1	-11/+2
* \| \|	Merge pull request #34590 from rmacklin/use-websocket-adapter-in-getState	Javan Makhmali	2018-12-02	5	-4/+37
\|\ \ \
\| * \| \|	Replace reference to WebSocket global with ActionCable.adapters.WebSocket	Richard Macklin	2018-12-01	5	-4/+37
\| \|/ /
* \| \|	Merge pull request #34588 from rmacklin/fix-yarn-lockfiles	Javan Makhmali	2018-12-02	3	-2308/+2404
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove obsolete yarn.lock files and check in root yarn.lock file	Richard Macklin	2018-12-02	3	-2308/+2404
\|/ /
* /	Remove circular dependency warnings in ActionCable javascript and publish sou...	rmacklin	2018-12-01	16	-290/+325
\|/
*	Merge pull request #34583 from gregmolnar/guides_fix	Ryuta Kamizono	2018-12-01	1	-1/+1
\|\
\| *	fix example code syntax [ci skip]	Greg Molnar	2018-12-01	1	-1/+1
\|/
*	Merge pull request #34579 from gmcgibbon/yield_in_with_delivery_job	Ryuta Kamizono	2018-12-01	1	-0/+1
\|\
\| *	Add yield to with_delivery_job test helper	Gannon McGibbon	2018-11-30	1	-0/+1
* \|	`metadata` is not passed to service	yuuji.yaginuma	2018-12-01	1	-2/+1
* \|	Merge pull request #34577 from gmcgibbon/id_as_non_pk_docs	Ryuta Kamizono	2018-12-01	2	-5/+8
\|\ \
\| * \|	Clarify no support for non PK id columns	Gannon McGibbon	2018-11-30	2	-5/+8
\| \|/
* \|	Merge pull request #33882 from mberlanda/mberlanda/as-inheritable-options-int...	Rafael França	2018-11-30	2	-29/+59
\|\ \
\| * \|	chore: implement config_for as ActiveSupport::OrderedOptions	Mauro Berlanda	2018-10-19	2	-29/+59
* \| \|	Merge pull request #34576 from ys/test-upload-extra-keys	Rafael França	2018-11-30	1	-0/+19
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add a test with extra keys to active_storage Service#upload	Yannick Schutz	2018-11-30	1	-0/+19
* \| \|	Merge pull request #34505 from eileencodes/add-readonly-mode	Eileen M. Uchitelle	2018-11-30	10	-1/+286
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add ability to prevent writes to a database	Eileen Uchitelle	2018-11-30	10	-1/+286
\|/ /
* \|	Merge pull request #34572 from kamipo/fix_scoping_with_query_method	Ryuta Kamizono	2018-11-30	3	-2/+8
\|\ \
\| * \|	Fix the scoping with query methods in the scope block	Ryuta Kamizono	2018-11-30	3	-2/+8
* \| \|	Use the full link URL instead of bit.ly [ci skip]	Ryuta Kamizono	2018-11-30	1	-1/+2
* \| \|	Don't expose internal `clock_gettime_supported?` class method	Ryuta Kamizono	2018-11-30	1	-1/+2
* \| \|	Merge pull request #34569 from gmcgibbon/allow_attribute_aliases_in_update	Rafael França	2018-11-29	3	-3/+17
\|\ \ \
\| * \| \|	Allow aliased attributes in update	Gannon McGibbon	2018-11-29	3	-3/+17
* \| \| \|	Merge pull request #34553 from mjtko/fix/issue-14802	Rafael França	2018-11-29	4	-3/+30
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Do nothing when the same block is included again.	Mark J. Titorenko	2018-11-29	4	-3/+30
* \| \| \|	Merge pull request #34564 from toncid/patch-2	Arun Agrawal	2018-11-29	1	-0/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] Add a Delayed Job project link.	Tonči Damjanić	2018-11-29	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #34562 from ruralocity/active-record-query-docs-improvement	Rafael França	2018-11-28	1	-7/+9
\|\ \ \ \
\| * \| \| \|	Improve ActiveRecord::Querying documentation [ci skip]	Aaron Sumner	2018-11-28	1	-7/+9
* \| \| \| \|	Merge pull request #34554 from sj26/group-exception-logs	Rafael França	2018-11-28	1	-5/+8
\|\ \ \ \ \