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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \| \| \| \| \|	Small grammar change	Jon Moss	2017-03-13	1	-3/+1
* \| \| \| \| \| \| \|	Merge pull request #28404 from olimart/master	Jon Moss	2017-03-13	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix Typo [ci skip]	Olivier	2017-03-13	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Fix HTTPS grammar	Jon Moss	2017-03-13	1	-4/+4
* \| \| \| \| \| \| \|	Merge pull request #28381 from shime/docs-action-controller-base	Vipul A M	2017-03-13	21	-55/+55
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	[docs] fix ActionController documentation	Hrvoje Šimić	2017-03-12	21	-55/+55
* \| \| \| \| \| \| \| \|	Merge pull request #28385 from javan/actioncable/fix-npm-package	Guillermo Iguaran	2017-03-13	3	-1/+38
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Restore action_cable.js UMD module support. Fixes #28366	Javan Makhmali	2017-03-11	3	-1/+38
* \| \| \| \| \| \| \| \|	Merge pull request #28185 from renchap/system-testing-screenshot-output	Eileen M. Uchitelle	2017-03-13	1	-5/+34
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Dont always display inline screenshots in system testing (#28133)	Renaud Chaput	2017-03-11	1	-5/+34
* \| \| \| \| \| \| \| \| \|	Merge pull request #28017 from mtsmfm/suppress-dep-warn	Matthew Draper	2017-03-13	3	-0/+6
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Suppress deprecation warning `implementing to_yaml is deprecated`	Fumiaki MATSUSHIMA	2017-02-15	3	-0/+6
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaults	Akira Matsuda	2017-03-13	3	-1/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \|