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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #33257 from utilum/ruby-warnings	Ryuta Kamizono	2018-06-30	3	-5/+8
\|\
\| *	Fix Ruby warnings tickled by the test suite	utilum	2018-06-30	3	-5/+8
* \|	Merge pull request #33263 from bogdanvlviv/follow-up-33258	Ryuta Kamizono	2018-06-30	2	-4/+10
\|\ \
\| * \|	Clarify activejob/lib/active_job/test_helper.rb	bogdanvlviv	2018-06-29	2	-4/+10
* \| \|	Merge pull request #33262 from gsmnv/patch-1	Ryuta Kamizono	2018-06-30	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Remove erroneous remove_column option from example	George Semenov	2018-06-29	1	-1/+1
\| \|/
* \|	Merge pull request #33264 from huacnlee/fix-redis-incr-ttl-check	Ryuta Kamizono	2018-06-30	2	-6/+22
\|\ \ \| \|/ \|/\|
\| *	Fix Cache :redis_store increment/decrement ttl check and add more tests.	Jason Lee	2018-06-30	2	-6/+22
\|/
*	Merge pull request #33260 from bogdanvlviv/fix-docs-of-assert_no_emails	Rafael França	2018-06-29	1	-1/+1
\|\
\| *	Fix docs of `assert_no_emails` [ci skip]	bogdanvlviv	2018-06-29	1	-1/+1
\|/
*	Merge pull request #33258 from bogdanvlviv/allow-callassert_enqueued_with-wit...	Rafael França	2018-06-29	5	-16/+160
\|\
\| *	Allow call `assert_enqueued_with` and `assert_enqueued_email_with` with no block	bogdanvlviv	2018-06-29	5	-16/+160
\|/
*	Merge pull request #33238 from dikond/explicit_action_mailer_deliver_later_qu...	Rafael França	2018-06-29	1	-0/+2
\|\
\| *	Note deliver_later_queue_name gotcha in ActionMailer guide [ci skip]	dikond	2018-06-27	1	-0/+2
* \|	Merge pull request #33255 from StanBoyet/patch-1	Rafael França	2018-06-29	1	-0/+2
\|\ \
\| * \|	Incompatibility of Direct Uploads & Mirror Service	Stanislas Boyet	2018-06-29	1	-0/+2
\|/ /
* \|	Merge pull request #33254 from huacnlee/add-expires-in-option-support-for-red...	Rafael França	2018-06-29	3	-2/+57
\|\ \
\| * \|	Add :expires_in option support for RedisCacheStore increment/decrement method.	Jason Lee	2018-06-29	3	-2/+57
* \| \|	Merge pull request #33250 from utilum/pdftoppm_exists	Matthew Draper	2018-06-29	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Tweak Previewer::PopplerPDFPreviewer#pdftoppm_exists?	utilum	2018-06-29	1	-1/+1
* \| \|	Merge pull request #33246 from anthonycrumley/improve-form-with-wording	Rafael França	2018-06-28	1	-4/+5
\|\ \ \
\| * \| \|	Improve wording for form_with in Getting Started Guide	Anthony Crumley	2018-06-28	1	-4/+5
\| \|/ /
* / /	Revert "Merge pull request #33243 from evopark/fix/action-mailer-test-helper-...	Rafael Mendonça França	2018-06-28	1	-1/+1
\|/ /
* \|	Merge pull request #26764 from choncou/improve_has_secure_password	Rafael Mendonça França	2018-06-28	4	-56/+72
\|\ \
\| * \|	Remove method for regenerating a token, and update `#authenticate`.	Unathi Chonco	2016-10-12	3	-61/+25
\| * \|	This addition will now allow configuring an attribute name for the	Unathi Chonco	2016-10-12	4	-41/+93
* \| \|	Merge pull request #33244 from utilum/guides_menu_breakdown	Rafael França	2018-06-28	1	-9/+13
\|\ \ \
\| * \| \|	Break guides menu 'Digging Deeper' section in two	utilum	2018-06-28	1	-9/+13
* \| \| \|	Merge pull request #33243 from evopark/fix/action-mailer-test-helper-no-block	Rafael França	2018-06-28	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix ActionMailer assert_enqueued_email_with	Marcus Ilgner	2018-06-28	1	-1/+1
\|/ / /
* \| \|	Merge pull request #33217 from eugeneius/test_duration_preserve_parts	Ryuta Kamizono	2018-06-28	1	-0/+12
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add tests for duration multiplication and division	Eugene Kenny	2018-06-25	1	-0/+12
* \| \|	Merge pull request #33234 from alpaca-tc/autoload_activejob_arguments	Ryuta Kamizono	2018-06-27	3	-3/+1
\|\ \ \
\| * \| \|	Autoload ActiveJob::Arguments	alpaca-tc	2018-06-27	1	-0/+1
\| * \| \|	ActiveJob::Arguments is no longer used in file	alpaca-tc	2018-06-27	2	-3/+0
\|/ / /
* \| \|	Merge pull request #33230 from bogdanvlviv/add-changelog-entry-for-3110caec	Prem Sichanugrist	2018-06-27	1	-0/+4
\|\ \ \
\| * \| \|	Add changelog entry for 3110cae [ci skip]	bogdanvlviv	2018-06-27	1	-0/+4
\|/ / /
* \| \|	Merge pull request #33223 from rails/homogeneous-allocation	Aaron Patterson	2018-06-26	5	-2/+49
\|\ \ \
\| * \| \|	Fix documentation based on feedback	Aaron Patterson	2018-06-26	2	-3/+7
\| * \| \|	define attribute methods in `init_from_db`	Aaron Patterson	2018-06-26	1	-0/+2
\| * \| \|	Merge branch 'master' into homogeneous-allocation	Aaron Patterson	2018-06-26	10	-40/+27
\| \|\ \ \
\| * \| \| \|	Speed up homogeneous AR lists / reduce allocations	Aaron Patterson	2018-06-25	5	-2/+43
* \| \| \| \|	Merge pull request #33225 from utilum/railties_testopts	Rafael França	2018-06-26	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Enable TESTOPTS in railties tests	utilum	2018-06-26	1	-1/+1
* \| \| \| \|	Merge pull request #33227 from rails/remove-allocate	Aaron Patterson	2018-06-26	2	-18/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Call initialize after allocate	Aaron Patterson	2018-06-26	2	-18/+0
\|/ / / /
* \| \| \|	Remove `ActiveSupport::Concern` from `ActiveRecord::Aggregations`	Ryuta Kamizono	2018-06-26	1	-2/+0
* \| \| \|	Merge pull request #33224 from mikepmunroe/mm-no-touching-api-update	Ryuta Kamizono	2018-06-26	1	-0/+7
\|\ \ \ \
\| * \| \| \|	Add example for no_touching? in active_record/no_touching for api docs [ci skip]	Michael Munroe	2018-06-25	1	-0/+7
\|/ / / /
* / / /	Generate a new key for each service test	George Claghorn	2018-06-25	6	-20/+20
\|/ / /