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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #20715 from simsalabim/feature/parse-rss-atom-as-xml	Sean Griffin	2015-10-20	3	-14/+22
*	Merge pull request #20737 from gouravtiwari/multibyte_chars_slice_fix	Sean Griffin	2015-10-20	3	-2/+23
\|\
\| *	Update #20737 to address feedback	Sean Griffin	2015-10-20	3	-2/+18
\| *	Fixed slice! behavior: return nil for out-of-bound parameters	Gourav Tiwari	2015-10-20	2	-1/+6
\|/
*	Merge pull request #20768 from vrybas/guides-clarify-belongs-to-required-by-d...	Sean Griffin	2015-10-20	1	-1/+3
\|\
\| *	Update #20768 to address feedback	Sean Griffin	2015-10-20	1	-3/+3
\| *	[Rails Guides] Clarify `belongs_to_required_by_default` option	Vladimir Rybas	2015-10-20	1	-1/+3
\|/
*	Merge pull request #20795 from benjiwheeler/validation_guide_ret_val	Sean Griffin	2015-10-20	1	-7/+15
\|\
\| *	activerecord guide: clarified roles of valid method and errors object [ci skip]	Ben Wheeler	2015-07-08	1	-7/+15
* \|	Merge pull request #20872 from maxjacobson/more-humane-rounding	Sean Griffin	2015-10-20	3	-2/+11
\|\ \
\| * \|	Update the changelog for #20872 to be a bit less confusing	Sean Griffin	2015-10-20	1	-2/+2
\| * \|	Round some numbers more humanely	Max Jacobson	2015-07-26	3	-2/+11
* \| \|	Merge pull request #20934 from maurogeorge/migration-transformations-doc	Sean Griffin	2015-10-20	1	-15/+51
\|\ \ \
\| * \| \|	Add missed Available transformations to migration Doc	Mauro George	2015-07-22	1	-15/+50
* \| \| \|	Merge pull request #20957 from akihiro17/find-by-issue	Sean Griffin	2015-10-20	3	-1/+13
\|\ \ \ \
\| * \| \| \|	Don't cache arguments in #find_by if they are an ActiveRecord::Relation	akihiro17	2015-10-06	3	-1/+13
* \| \| \| \|	Merge pull request #21302 from theunraveler/delegate_reserved_argument_names	Sean Griffin	2015-10-20	2	-5/+21
\|\ \ \ \ \
\| * \| \| \| \|	Fixing issue when delegating to methods named "block", "args", or "arg"	Jake Bell	2015-08-19	2	-5/+21
* \| \| \| \| \|	Fix test failures caused by d99db6b8b3e4	Sean Griffin	2015-10-20	1	-1/+1
* \| \| \| \| \|	Merge pull request #21756 from soutaro/qualify-column-in-calculation	Sean Griffin	2015-10-20	3	-1/+27
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Qualify column names in calculation	Soutaro Matsumoto	2015-10-20	3	-1/+27
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #18856 from al2o3cr/issue_17897	Sean Griffin	2015-10-20	2	-3/+11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix merge conflicts for #18856	Sean Griffin	2015-10-20	2	-3/+11
\|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Match table names exactly on MySQL	Matt Jones	2015-02-08	4	-18/+8
* \| \| \| \| \| \|	Don't add classes to the top level namespace	Sean Griffin	2015-10-20	1	-13/+17
* \| \| \| \| \| \|	Merge pull request #21883 from tarzan/cache-key-too-precise	Sean Griffin	2015-10-20	6	-8/+43
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	fixes #21815	Maarten Jacobs	2015-10-16	6	-8/+43
* \| \| \| \| \| \| \|	Do not cache prepared statements that are unlikely to have cache hits	Sean Griffin	2015-10-20	12	-20/+69
* \| \| \| \| \| \| \|	Merge pull request #21932 from kamipo/add_stored_procedure_test_in_mysql2	Sean Griffin	2015-10-20	8	-22/+70
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add stored procedure test in mysql2	Ryuta Kamizono	2015-10-15	6	-17/+65
\| * \| \| \| \| \| \| \|	Make `AbstractMysqlAdapter#version` public	Ryuta Kamizono	2015-10-15	2	-5/+5
* \| \| \| \| \| \| \| \|	Merge pull request #21962 from kamipo/fix_tinyblob	Sean Griffin	2015-10-20	8	-16/+36
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix to correctly schema dump the `tinyblob`	Ryuta Kamizono	2015-10-15	8	-16/+36
* \| \| \| \| \| \| \| \| \|	Upgrade all the gems	Rafael Mendonça França	2015-10-20	1	-36/+47
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-21955'	Rafael Mendonça França	2015-10-20	3	-1/+27
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Add CHANGELOG entry for fix of #21955 [ci skip]	Rafael Mendonça França	2015-10-20	1	-0/+6
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #21974 from jbranchaud/reorder-has-many-assocation-constra...	Rafael Mendonça França	2015-10-20	2	-5/+20
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Reorder application of has_many association constraints.	jbranchaud	2015-10-19	2	-1/+21
\| * \| \| \| \| \| \| \| \| \| \|	Changed the order of Association constraints from where->order->unscope to un...	kal	2015-10-20	3	-1/+6
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #21858 from Gaurav2728/protected_method_nodoc	Rafael Mendonça França	2015-10-20	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	nodoc for active support protected method [CI skip]	Gaurav Sharma	2015-10-04	1	-3/+3
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22003 from yui-knk/remove_needless_require_as	Yves Senn	2015-10-20	10	-13/+0
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Delete needless `require 'active_support/deprecation'`	yui-knk	2015-10-20	10	-13/+0
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22004 from yui-knk/fix_method_to_action	Yves Senn	2015-10-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Replace "destroy` method" with `destroy` action`	yui-knk	2015-10-20	1	-1/+1
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #21978 from ctreatma/console_helper_reload	Sean Griffin	2015-10-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix #21977: Removes memoization of helpers in Rails console	Charles Treatman	2015-10-16	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #21987 from yui-knk/refactor_where	Sean Griffin	2015-10-19	3	-10/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Green version of moving the handling of supported arguments to `where`	yui-knk	2015-10-18	3	-10/+7
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #22001 from cleverlemming/doc_patch_engines	Sean Griffin	2015-10-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \