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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28191 from eugeneius/string_assoc_order	Rafael França	2017-03-17	2	-2/+30
\|\
\| *	Allow order to be given expressions as hash keys	Eugene Kenny	2017-02-27	2	-2/+30
* \|	Merge pull request #28154 from aripollak/remove-comments-from-structure-sql	Rafael Mendonça França	2017-03-17	3	-3/+43
\|\ \
\| * \|	Only remove comments before the first statement	Ari Pollak	2017-02-24	2	-7/+12
\| * \|	Drop comments from structure.sql in postgresql	Ari Pollak	2017-02-24	3	-3/+38
* \| \|	Fix resolve usage in the release notes	Rafael Mendonça França	2017-03-17	1	-1/+1
* \| \|	Merge pull request #28096 from prathamesh-sonpatki/5-1-release-notes-first-draft	Rafael França	2017-03-17	1	-0/+267
\|\ \ \
\| * \| \|	Add blurbs about each new feature [ci skip]	Prathamesh Sonpatki	2017-03-13	1	-0/+158
\| * \| \|	Add PR links for major features [ci skip]	Prathamesh Sonpatki	2017-03-03	1	-0/+11
\| * \| \|	Add first draft of release notes for Rails 5.1 :tada:	Prathamesh Sonpatki	2017-03-03	1	-0/+98
* \| \| \|	uniq was deprecated and removed already	Rafael Mendonça França	2017-03-17	1	-1/+1
* \| \| \|	Add support for calling nested direct routes (#28462)	Andrew White	2017-03-17	4	-32/+48
* \| \| \|	Merge pull request #28341 from mtsmfm/pass-options-to-driven-by	Rafael França	2017-03-17	3	-4/+6
\|\ \ \ \
\| * \| \| \|	Pass options to `driven_by`	Fumiaki MATSUSHIMA	2017-03-13	3	-4/+6
* \| \| \| \|	Merge pull request #28318 from bogdanvlviv/remove-ability-update-locking_colu...	Rafael França	2017-03-17	5	-49/+4
\|\ \ \ \ \
\| * \| \| \| \|	Remove ability update locking_column value	bogdanvlviv	2017-03-16	5	-49/+4
* \| \| \| \| \|	Add :default option to belongs_to (#28453)	George Claghorn	2017-03-17	5	-1/+50
* \| \| \| \| \|	Bump Capybara and include Minitest::Assertions	eileencodes	2017-03-17	4	-4/+6
* \| \| \| \| \|	Cleanup documentation fixes (#28460)	Vipul A M	2017-03-17	2	-5/+5
* \| \| \| \| \|	Merge pull request #28421 from tangposmarvin/docs-assest-pipeline	Vipul A M	2017-03-17	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix asset_pipeline docs incorrect image dir info	marvin	2017-03-16	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #28444 from budnik/patch-2	Vipul A M	2017-03-17	1	-4/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Updates incorrect documentation [ci skip]	Dmitriy Budnik	2017-03-16	1	-4/+3
* \| \| \| \| \| \| \|	Merge pull request #28445 from denniszelada/feature-documentation-with_options	Vipul A M	2017-03-17	1	-0/+11
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add documentation to use with_options in the same class [ci skip]	Dennis Zelada	2017-03-16	1	-0/+11
* \| \| \| \| \| \| \|	Fix test warnings	Andrew White	2017-03-16	1	-5/+5
* \| \| \| \| \| \| \|	Move `to_time` to `DateTime` compatibility.rb file	Andrew White	2017-03-16	4	-6/+16
* \| \| \| \| \| \| \|	Merge pull request #28147 from kmcphillips/master-time-freeze	Andrew White	2017-03-16	6	-22/+206
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Handle #to_time and memoization taking into account memoization, frozen state...	Kevin McPhillips	2017-03-06	6	-22/+206
* \| \| \| \| \| \| \|	Merge pull request #28368 from y-yagi/add_test_for_secrets_command	Kasper Timm Hansen	2017-03-15	1	-0/+13
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add secrets edit test	yuuji.yaginuma	2017-03-12	1	-0/+13
* \| \| \| \| \| \| \| \|	Tweak 28412	Jon Moss	2017-03-15	1	-1/+1
* \| \| \| \| \| \| \| \|	Remove unnecessary params munging	Andrew White	2017-03-15	2	-2/+62
* \| \| \| \| \| \| \| \|	Revert #27850 following test breakage (#28427)	David Heinemeier Hansson	2017-03-15	3	-19/+7
* \| \| \| \| \| \| \| \|	Merge pull request #28426 from mtsmfm/fix-fragile-test	Rafael França	2017-03-15	1	-36/+34
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix fragile test (`AssociationProxyTest#test_save_on_parent_saves_children`)	Fumiaki MATSUSHIMA	2017-03-16	1	-36/+34
* \| \| \| \| \| \| \| \| \|	Merge pull request #28425 from rails/remove-duration-deprecation	Andrew White	2017-03-15	5	-38/+214
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Restore 5.minutes changed in #28204	Andrew White	2017-03-15	1	-1/+1
\| * \| \| \| \| \| \| \| \| \|	Use better duration aliases in tests	Andrew White	2017-03-15	1	-2/+2
\| * \| \| \| \| \| \| \| \| \|	Remove implicit coercion deprecation of durations	Andrew White	2017-03-15	3	-35/+211
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #28412 from benoittgt/add_doc_for_message_encryptor_new	Rafael França	2017-03-15	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add documentation about signature_key for MessageEncryptor.new [ci skip]	Benoit Tigeot	2017-03-15	1	-0/+5
* \| \| \| \| \| \| \| \| \|	Merge pull request #28423 from eugeneius/rm_txn	Richard Schneeman	2017-03-15	2	-2/+0
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Remove unused `@txn` variable	Eugene Kenny	2017-03-15	2	-2/+0
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #28409 from y-yagi/make_destroy_command_work_within_engines	Eileen M. Uchitelle	2017-03-15	2	-2/+57
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Make destroy command work within engines	yuuji.yaginuma	2017-03-14	2	-2/+57
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #28422 from y-yagi/rename_app_update_test_to_more_appropri...	Kasper Timm Hansen	2017-03-15	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Rename test of `app:update` to more appropriate name	yuuji.yaginuma	2017-03-15	1	-7/+7
\| \|/ / / / / / / / / /
* \| \| \| \| \| / / / / /	Don't cast to float unnecessarily	Andrew White	2017-03-15	1	-2/+2
\| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #28420 from claudiob/changelog-skip-coffee	Claudio B	2017-03-14	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \