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

	Commit message (Expand)	Author	Age	Files	Lines
*	remove explicit curlies for hash argument	Xavier Noria	2016-04-11	1	-2/+2
*	Merge pull request #24485 from prathamesh-sonpatki/protected_database_env_mes...	Richard Schneeman	2016-04-11	1	-2/+2
\|\
\| *	Cleanup message shown while running destructive action against protected data...	Prathamesh Sonpatki	2016-04-10	1	-2/+2
* \|	Merge pull request #24497 from vipulnsward/am-changelog-pass	Yves Senn	2016-04-11	1	-4/+3
\|\ \
\| * \|	Pass over AM changelog	Vipul A M	2016-04-10	1	-4/+3
* \| \|	issue FileUtils commands directly in Rake tasks	Xavier Noria	2016-04-11	4	-15/+12
* \| \|	revises fileutils dependencies in railties	Xavier Noria	2016-04-11	8	-4/+13
* \| \|	Merge pull request #24487 from tomkadwill/action-mailer-base-docs	Vipul A M	2016-04-10	1	-1/+1
\|\ \ \
\| * \| \|	Update ActionMailer Views documentation [ci skip]	Tom Kadwill	2016-04-10	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #24486 from y-yagi/do_not_create_unnecessary_directory	Rafael França	2016-04-10	2	-5/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	do not create unnecessary directory	yuuji.yaginuma	2016-04-10	2	-5/+2
\| \|/
* \|	Merge pull request #24488 from y-yagi/fix_file_path	Abdelkader Boudih	2016-04-10	1	-4/+4
\|\ \
\| * \|	fix typo in file path [ci skip]	yuuji.yaginuma	2016-04-10	1	-4/+4
\| \|/
* \|	Merge pull request #24484 from prathamesh-sonpatki/protecte_structure_load_too	Richard Schneeman	2016-04-10	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Check for protected environments before trying to load structure.sql file	Prathamesh Sonpatki	2016-04-10	1	-1/+1
\|/
*	Merge pull request #23702 from namusyaka/fix-json-behavior	Eileen M. Uchitelle	2016-04-09	3	-0/+15
\|\
\| *	Fix behavior of JSON encoding for Exception	namusyaka	2016-04-09	3	-0/+15
\|/
*	Merge pull request #24165 from y-yagi/generate_application_job_when_not_exist	Eileen M. Uchitelle	2016-04-09	4	-0/+39
\|\
\| *	generate ApplicationJob if it does not already exist	yuuji.yaginuma	2016-03-25	4	-0/+39
* \|	Merge pull request #24475 from jeremy/ar/mariadb-supports-datetime-precision	Jeremy Daer	2016-04-08	6	-24/+56
\|\ \
\| * \|	Support microsecond datetime precision on MariaDB 5.3+.	Jeremy Daer	2016-04-08	6	-24/+56
\|/ /
* \|	Merge pull request #24457 from jeremy/mailer/dont-deliver-later-after-message...	Jeremy Daer	2016-04-08	3	-2/+40
\|\ \
\| * \|	Disallow calling `#deliver_later` after local message modifications.	Jeremy Daer	2016-04-07	3	-2/+40
* \| \|	Merge pull request #24474 from djunzu/fix_welcome_page_docs	Yves Senn	2016-04-08	1	-2/+1
\|\ \ \
\| * \| \|	Remove reference to non existing link in the welcome page.	djunzu	2016-04-08	1	-2/+1
\|/ / /
* \| \|	Merge pull request #24471 from swrobel/patch-1	Rafael França	2016-04-08	1	-1/+2
\|\ \ \
\| * \| \|	Clarify fixtures examples [ci skip]	Stefan Wrobel	2016-04-08	1	-1/+2
\|/ / /
* \| \|	Merge pull request #24468 from RochesterinNYC/patch-2	Rafael França	2016-04-08	1	-1/+1
\|\ \ \
\| * \| \|	Clarify description of `include_all_helpers` config setting's default behavio...	James Wen	2016-04-08	1	-1/+1
\|/ / /
* \| \|	Merge pull request #24467 from javiervidal/20160409	Yves Senn	2016-04-08	1	-1/+1
\|\ \ \
\| * \| \|	Fix broken link in 'Ruby on Rails 3.1 Release Notes' [ci skip]	Javier Vidal	2016-04-08	1	-1/+1
\|/ / /
* \| \|	Use new hash syntax (#24464)	Jeroen Visser	2016-04-08	2	-4/+4
* \| \|	Merge pull request #24465 from y-yagi/remove_needless_entry	Vipul A M	2016-04-08	2	-9/+0
\|\ \ \
\| * \| \|	remove needless entry [ci skip]	yuuji.yaginuma	2016-04-08	2	-9/+0
* \| \| \|	Merge pull request #24461 from repinel/fix-etag-docs	Rafael França	2016-04-08	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fixes for the strong & weak ETags guide [ci skip]	Roque Pinel	2016-04-07	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #24458 from y-yagi/remove_blank_line_generated_in_appliati...	Rafael França	2016-04-07	1	-1/+1
\|\ \ \ \
\| * \| \| \|	remove blank line generated in application_mailer.rb	yuuji.yaginuma	2016-04-08	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #24335 from mabras/master	Rafael França	2016-04-07	1	-2/+0
\|\ \ \ \
\| * \| \| \|	remove unused require	Mohamad Abras	2016-03-29	1	-2/+0
* \| \| \| \|	Merge pull request #24453 from PareshGupta/validation-error-typo	Vipul A M	2016-04-07	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	fix length validation error typo	PareshGupta	2016-04-07	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #24422 from matthewd/extinguish-executor-exceptions	Matthew Draper	2016-04-07	5	-31/+200
\|\ \ \ \
\| * \| \| \|	Directly support stateful executor hooks	Matthew Draper	2016-04-05	5	-31/+200
* \| \| \| \|	Merge pull request #24399 from jch/protect-against-db-schema-load-in-production	Richard Schneeman	2016-04-06	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Prevent db:schema:load to protected environments	Jerry Cheung	2016-04-01	1	-1/+1
* \| \| \| \| \|	Merge pull request #24078 from kamipo/show_variables	Rafael França	2016-04-06	1	-2/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Simply use `select_value` in `show_variable`	Ryuta Kamizono	2016-03-06	1	-2/+1
* \| \| \| \| \| \|	Merge pull request #24374 from kamipo/move_quoting_methods_to_quoting_module	Rafael França	2016-04-06	4	-44/+38
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Make `QUOTED_TRUE` and `QUOTED_FALSE` to public because these are used in `My...	Ryuta Kamizono	2016-04-06	2	-6/+6