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

	Commit message (Expand)	Author	Age	Files	Lines
*	adds .gitattributes to enable Ruby-awareness	Xavier Noria	2016-03-16	1	-0/+2
*	no need to clear an unusued collection	Xavier Noria	2016-03-16	1	-1/+1
*	removes unreachable code	Xavier Noria	2016-03-16	1	-2/+0
*	tests the raising/throwing discards the watching stack	Xavier Noria	2016-03-16	3	-4/+8
*	s/removes/discards/	Xavier Noria	2016-03-16	1	-2/+2
*	adds coverage for raising while autoloading	Xavier Noria	2016-03-16	2	-0/+12
*	adds coverage for throwing while autoloading	Xavier Noria	2016-03-15	2	-0/+14
*	Share dev caching implementation between task and server.	Kasper Timm Hansen	2016-03-15	3	-25/+46
*	Merge pull request #24204 from sand33pn/master	Vipul A M	2016-03-15	1	-1/+1
\|\
\| *	Update action_controller_overview.md	Sandeep Navghane	2016-03-15	1	-1/+1
\|/
*	Merge pull request #24198 from delftswa2016/remove-log-related-stuff	Xavier Noria	2016-03-15	3	-51/+0
\|\
\| *	Remove log-related stuff from ActiveSupport::Dependencies	Aaron Ang	2016-03-15	3	-51/+0
\|/
*	Merge pull request #24188 from wiehann/railsguide-fix	Jon Moss	2016-03-14	1	-1/+1
\|\
\| *	Correct command for generating secret_key_base [ci skip]	Wiehann	2016-03-14	1	-1/+1
* \|	Merge pull request #24187 from akihiro17/fix-find-doc	Arthur Nogueira Neves	2016-03-14	1	-2/+2
\|\ \ \| \|/ \|/\|
\| *	[ci skip] Fix the FinderMethods#find document	akihiro17	2016-03-14	1	-2/+2
\|/
*	Merge pull request #24184 from y-yagi/add_queue_classic_to_list	प्रथमेश Sonpatki	2016-03-14	1	-3/+4
\|\
\| *	add `queue_classic` to list of provide `provider_job_id` [ci skip]	yuuji.yaginuma	2016-03-14	1	-3/+4
\|/
*	Merge pull request #24175 from y-yagi/add_headers_to_payload	Jon Moss	2016-03-12	1	-0/+4
\|\
\| *	add headers to payload list [ci skip]	yuuji.yaginuma	2016-03-13	1	-0/+4
* \|	Merge pull request #24174 from y-yagi/silence_deprecation_message	Arthur Nogueira Neves	2016-03-12	1	-1/+3
\|\ \
\| * \|	silence deprecation message for dynamic controller and actions on Action View...	yuuji.yaginuma	2016-03-13	1	-1/+3
\| \|/
* \|	Merge pull request #24171 from bdewater/strong_parameters_anaf_doc	Andrew White	2016-03-12	1	-2/+3
\|\ \
\| * \|	Add explanation about accepts_nested_attributes_for keys in the strong parame...	Bart de Water	2016-03-12	1	-2/+3
\| \|/
* \|	Merge pull request #24166 from kamipo/fix_warning_method_redefined	Andrew White	2016-03-12	1	-3/+0
\|\ \ \| \|/ \|/\|
\| *	Fix `warning: method redefined; discarding old female`	Ryuta Kamizono	2016-03-12	1	-3/+0
\|/
*	Merge pull request #24163 from prathamesh-sonpatki/fix-gemfile-lock	Rafael França	2016-03-12	1	-1/+1
\|\
\| *	Fix Gemfile.lock	Prathamesh Sonpatki	2016-03-12	1	-1/+1
\|/
*	Merge pull request #24161 from Sen-Zhang/restore_application_mailer	Rafael França	2016-03-11	3	-0/+16
\|\
\| *	improve some code	Sen-Zhang	2016-03-11	1	-2/+4
\| *	generate application_mailer.rb if it is missing	Sen-Zhang	2016-03-11	3	-0/+14
\|/
*	AC: skip PG adapter tests if the db isn't available	Jeremy Daer	2016-03-11	1	-0/+7
*	Merge pull request #23797 from kamipo/case_sensitive_comparison_for_non_strin...	Rafael França	2016-03-11	3	-3/+13
\|\
\| *	The BINARY Operator is only needed for string columns	Ryuta Kamizono	2016-02-22	3	-3/+13
* \|	Break up a circular require between AP/AV	Sean Griffin	2016-03-11	4	-5/+6
* \|	Merge pull request #24155 from chrisarcand/clarify-has-many-dependent-option	Jon Moss	2016-03-11	1	-9/+7
\|\ \
\| * \|	Clarify has_many :dependent option docs [ci skip]	Chris Arcand	2016-03-11	1	-9/+7
* \| \|	Ping the resque version while we can't investigate the failure	Rafael Mendonça França	2016-03-11	1	-1/+1
* \| \|	Use the most highest priority exception handler when cause is set	Sean Griffin	2016-03-11	3	-2/+49
* \| \|	Fix test failures caused by #23958	Sean Griffin	2016-03-11	1	-1/+1
* \| \|	Merge pull request #22854 from jcoyne/missing_template	Sean Griffin	2016-03-11	3	-1/+23
\|\ \ \
\| * \| \|	Render default template if block doesn't render	Justin Coyne	2016-02-25	3	-1/+23
* \| \| \|	Merge pull request #24150 from exviva/unmarshal-infinite-retry	Xavier Noria	2016-03-11	3	-1/+20
\|\ \ \ \
\| * \| \| \|	Prevent `Marshal.load` from looping infinitely	Olek Janiszewski	2016-03-11	3	-1/+20
* \| \| \| \|	Merge pull request #24143 from perceptec/fix-thread-mattr-accessor-refs	Matthew Draper	2016-03-12	2	-2/+8
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Fix `thread_mattr_accessor` thread-local variable naming	Michael Ryan	2016-03-11	2	-2/+8
\| \|/ / /
* \| \| \|	Merge pull request #24054 from kamipo/extract_default_primary_key	Rafael França	2016-03-11	5	-22/+22
\|\ \ \ \
\| * \| \| \|	Extract `default_primary_key?` to refactor `column_spec_for_primary_key`	Ryuta Kamizono	2016-03-11	5	-22/+22
\| \|/ / /
* \| \| \|	Merge pull request #24087 from kamipo/dump_bigint_instead_of_integer_limit_8	Rafael França	2016-03-11	4	-13/+13
\|\ \ \ \
\| * \| \| \|	Dump `bigint` instead of `integer` with `limit: 8` for schema dumper	Ryuta Kamizono	2016-03-11	4	-13/+13
\| \|/ / /