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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add CHANGELOG entry for --skip-coffee [ci skip]	claudiob	2017-03-14	1	-0/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #28410 from fphilipe/remove-obsolete-warning-in-guides	Ryuta Kamizono	2017-03-14	1	-3/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove obsolete warning about regular expression	Philipe Fatio	2017-03-14	1	-3/+0
\|/ / / / / /
* \| \| \| \| \|	Revert "Merge pull request #28369 from mylake/reduce-postgresql-adapter-memor...	Matthew Draper	2017-03-14	1	-2/+2
* \| \| \| \| \|	Merge pull request #28407 from claudiob/changelog-skip-pipeline	Richard Schneeman	2017-03-13	1	-0/+17
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add CHANGELOG for #26226 [ci skip]	claudiob	2017-03-13	1	-0/+17
* \| \| \| \| \| \|	Merge pull request #28369 from mylake/reduce-postgresql-adapter-memory-bloat	Rafael França	2017-03-13	1	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Use “distinct” to filter redundant types from pg_typeto reduce memory blo...	mylake	2017-03-10	1	-2/+2
* \| \| \| \| \| \| \|	Merge pull request #28356 from jasl/patch-1	Rafael França	2017-03-13	1	-9/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove non-exists method delegation and correct doc	jasl	2017-03-11	1	-9/+1
* \| \| \| \| \| \| \| \|	Merge pull request #28068 from kamipo/refactor_data_sources	Rafael França	2017-03-13	8	-205/+156
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Prefer `USING (column_list)` for joining information_schema	Ryuta Kamizono	2017-02-25	1	-3/+1
\| * \| \| \| \| \| \| \| \|	Extract `data_source_sql` to refactor data source statements	Ryuta Kamizono	2017-02-20	8	-202/+155
* \| \| \| \| \| \| \| \| \|	Move "fixes" to a new line	Jon Moss	2017-03-13	1	-1/+3
* \| \| \| \| \| \| \| \| \|	Lint activesupport/CHANGELOG.md	Jon Moss	2017-03-13	1	-8/+10
* \| \| \| \| \| \| \| \| \|	Small grammar change + new line for "fixes"	Jon Moss	2017-03-13	1	-2/+4