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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|/ / /
* \| \|	Merge pull request #33221 from rails/lazy-aggregate	Aaron Patterson	2018-06-25	2	-1/+5
\|\ \ \
\| * \| \|	Lazily add `Aggregations` to `composed_of` models	Aaron Patterson	2018-06-25	2	-1/+5
* \| \| \|	Allow passing multiple exceptions to retry_on/discard_on	George Claghorn	2018-06-25	3	-7/+32
\|/ / /
* \| \|	`references(:developers_projects_join)` isn't needed if using `where` with ha...	Ryuta Kamizono	2018-06-26	1	-16/+2
* \| \|	Use `reflection.alias_candidate` in `table_alias_for`	Ryuta Kamizono	2018-06-26	1	-1/+1
\|/ /
* \|	Revert "Avoid Node.js v10.4.0 for now"	yuuji.yaginuma	2018-06-25	1	-1/+1
* \|	Merge pull request #33191 from bogdanvlviv/change-rails_welcome-image-on-loca...	George Claghorn	2018-06-24	1	-1/+1
\|\ \
\| * \|	Changes Rails Welcome image on localhost:3000	bogdanvlviv	2018-06-22	1	-1/+1
* \| \|	Add an assertion that `credentials:edit` works when `RAILS_MASTER_KEY` env is...	yuuji.yaginuma	2018-06-24	1	-1/+1
* \| \|	Merge pull request #33205 from ishanray/patch-1	Ryuta Kamizono	2018-06-24	1	-1/+1
\|\ \ \
\| * \| \|	Update service.rb	ishanray	2018-06-24	1	-1/+1
\|/ / /
* \| \|	Fix formatting of `primary_key` [ci skip]	yuuji.yaginuma	2018-06-24	1	-2/+2
* \| \|	Merge pull request #33204 from utilum/bump_raabro	Yuji Yaginuma	2018-06-24	1	-1/+1
\|\ \ \
\| * \| \|	Update raabro to latest version	utilum	2018-06-23	1	-1/+1
\|/ / /
* \| \|	OS X -> macOS [Closes #30313]	Xavier Noria	2018-06-23	4	-6/+6
* \| \|	Merge pull request #33198 from henrik/patch-1	George Claghorn	2018-06-22	1	-1/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Active Storage: Explicit form field in basic example	Henrik Nyh	2018-06-22	1	-1/+5
\|/ /
* \|	Merge pull request #33184 from bogdanvlviv/document-year_format-option-of-dat...	Prem Sichanugrist	2018-06-22	1	-0/+4
\|\ \
\| * \|	Add to docs mention about `:year_format` option of date select	bogdanvlviv	2018-06-22	1	-0/+4
\|/ /
* \|	Add missing test case for `find` with a large number	Ryuta Kamizono	2018-06-22	1	-0/+6
* \|	Permit configuring the default service URL expiry	George Claghorn	2018-06-21	9	-10/+17
* \|	Merge pull request #33176 from utilum/bump_fugit	Yuji Yaginuma	2018-06-21	1	-2/+2
\|\ \
\| * \|	Update fugit to latest version	utilum	2018-06-21	1	-2/+2
\|/ /