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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25834 from alpaca-tc/fixes_multiparameter_attributes_on_t...	Rafael França	2016-07-20	3	-1/+19
\|\
\| *	Fixes multiparameter attributes conversion with time_zone_aware_attributes an...	alpaca-tc	2016-07-19	3	-1/+19
* \|	Merge pull request #25822 from mechanicles/clear-local-cache-on-invalid-param...	Rafael França	2016-07-20	1	-0/+12
\|\ \
\| * \|	Add missing test for clearing up local cache on invalid parameters err.	Santosh Wadghule	2016-07-17	1	-0/+12
* \| \|	Merge pull request #25869 from kamipo/specificiation_id_was_renamed_to_spec_name	Rafael França	2016-07-20	1	-1/+1
\|\ \ \
\| * \| \|	`specificiation_id` was renamed to `spec_name`	Ryuta Kamizono	2016-07-18	1	-1/+1
* \| \| \|	Merge pull request #25868 from kamipo/fix_payload_class_name_to_spec_name	Rafael França	2016-07-20	5	-13/+10
\|\ \ \ \
\| * \| \| \|	Fix `payload[:class_name]` to `payload[:spec_name]`	Ryuta Kamizono	2016-07-17	5	-13/+10
* \| \| \| \|	Add a new rule to rubocop	Rafael Mendonça França	2016-07-20	1	-10/+13
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #25780 from Ropeney/patch-1	Matthew Draper	2016-07-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Update ActionCable Rebroadcasting a Message documentation	Joseph Mullins	2016-07-12	1	-1/+1
* \| \| \| \|	Merge pull request #25886 from kamipo/pass_type_casted_binds_to_log_subscriber	Xavier Noria	2016-07-19	6	-25/+29
\|\ \ \ \ \
\| * \| \| \| \|	Pass `type_casted_binds` to log subscriber for logging bind values properly	Ryuta Kamizono	2016-07-19	6	-25/+29
* \| \| \| \| \|	Merge pull request #25883 from claudiob/fix-gotcha	Claudio B	2016-07-18	1	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix docs in collection_radio_buttons	claudiob	2016-07-18	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #25881 from kamipo/logging_type_casted_binds	Sean Griffin	2016-07-18	1	-1/+5
\|\ \ \ \ \
\| * \| \| \| \|	Logging type casted binds	Ryuta Kamizono	2016-07-19	1	-1/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #25878 from alexcameron89/associations_doc	Jon Moss	2016-07-18	1	-13/+13
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Fix grammar in AR::Associations	Alex Kitchens	2016-07-18	1	-13/+13
\|/ / / / /
* \| \| \| \|	deprecates the error_on_ignored_order_or_limit instance reader	Xavier Noria	2016-07-18	2	-2/+14
* \| \| \| \|	adds coverage for the deprecation of error_on_ignored_order	Xavier Noria	2016-07-18	1	-0/+8
* \| \| \| \|	Merge pull request #25866 from prathamesh-sonpatki/rm-deprecated-mattr-accessor	Xavier Noria	2016-07-18	2	-5/+12
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Fix documentation of `error_on_ignored_order` option	Prathamesh Sonpatki	2016-07-18	1	-4/+4
\| * \| \| \|	Remove mattr_accessor for deprecated config `error_on_ignored_order_or_limit`.	Prathamesh Sonpatki	2016-07-18	1	-1/+8
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #25867 from kamipo/no_need_public_send	Matthew Draper	2016-07-17	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	No need `public_send`	Ryuta Kamizono	2016-07-17	1	-2/+2
\|/ / /
* \| \|	Store the old logger before calling super	Rafael Mendonça França	2016-07-17	1	-1/+1
* \| \|	Check if the logger exists before trying to use it	Rafael Mendonça França	2016-07-17	1	-1/+1
* \| \|	Make sure the time method is unstubed	Rafael Mendonça França	2016-07-17	1	-29/+41
* \| \|	Sort the mime types before comparing	Rafael Mendonça França	2016-07-17	1	-2/+2
* \| \|	Make sure the tests setup are made correctly	Rafael Mendonça França	2016-07-17	1	-9/+9
* \| \|	Merge pull request #20818 from jeremywadsack/use_transactional_fixtures_all_d...	Rafael França	2016-07-17	4	-0/+95
\|\ \ \
\| * \| \|	Create connection.active_record notification and use that to ensure that lazy-	Jeremy Wadsack	2016-07-12	4	-0/+95
* \| \| \|	Merge pull request #25811 from oss92/to_sentence_fallback_string	Rafael França	2016-07-17	3	-3/+20
\|\ \ \ \
\| * \| \| \|	Added :fallback_string option to Array#to_sentence	oss92	2016-07-13	3	-3/+20
* \| \| \| \|	Enable a few more rubocop rules	Rafael Mendonça França	2016-07-17	1	-0/+13
* \| \| \| \|	Merge pull request #25650 from prathamesh-sonpatki/add-note-about-changelog-a...	Rafael França	2016-07-17	1	-0/+3
\|\ \ \ \ \
\| * \| \| \| \|	Add a note about adding CHANGELOG entries at the top of the file [ci skip]	Prathamesh Sonpatki	2016-07-02	1	-0/+3
* \| \| \| \| \|	Merge pull request #25864 from vipulnsward/fix-ap-test	Rafael França	2016-07-17	1	-0/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix failing requirement of duplicable in ParameterFilter	Vipul A M	2016-07-16	1	-0/+2
* \| \| \| \| \| \|	Merge pull request #25850 from ojab/layout_doc_fix	Rafael Mendonça França	2016-07-17	1	-1/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Mention that layout can call a Proc [ci skip]	ojab	2016-07-15	1	-1/+4
* \| \| \| \| \| \|	Merge pull request #25861 from vipulnsward/fix-grammer	Rafael França	2016-07-17	1	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix CHANGELOG grammar [ci skip]	Vipul A M	2016-07-16	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #25860 from prathamesh-sonpatki/add-cg-for-rails-initializers	Rafael França	2016-07-17	3	-3/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]	Prathamesh Sonpatki	2016-07-17	3	-3/+16
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #25815 from greysteil/add-newline-between-structure-versions	Rafael França	2016-07-16	2	-2/+9
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add newline between each migration in `structure.sql`	Grey Baker	2016-07-14	2	-2/+9
* \| \| \| \| \| \| \|	Merge pull request #25775 from junaruga/hotfix/actionpack-depending-on-active...	Eileen M. Uchitelle	2016-07-16	1	-1/+0
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove unused activerecord requirement in actionpack.	Jun Aruga	2016-07-11	1	-1/+0