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

	Commit message (Expand)	Author	Age	Files	Lines
*	Upgrade to Ruby 2.2.2	Jon Atack	2015-04-14	12	-15/+15
*	Merge pull request #19595 from claudiob/fix-docs-set-callback	Yves Senn	2015-03-31	1	-4/+6
\|\
\| *	Fix doc: set_callback also accepts an array of if:	claudiob	2015-03-31	1	-4/+6
* \|	Merge pull request #19523 from kuldeepaggarwal/fix-table-name-conflict	Yves Senn	2015-03-31	2	-2/+4
\|\ \ \| \|/ \|/\|
\| *	use Model.reset_column_information to clear table cache connection wide.	Kuldeep Aggarwal	2015-03-31	2	-2/+4
\|/
*	Merge pull request #19594 from radar/require-module-delegation	Guillermo Iguaran	2015-03-30	1	-0/+1
\|\
\| *	Require Module#delegate core ext in ActiveModel::Naming	Ryan Bigg	2015-03-31	1	-0/+1
* \|	Merge pull request #19592 from adimitri/activerecord-find-ambiguity	Rafael Mendonça França	2015-03-30	1	-3/+1
\|\ \
\| * \|	[ci skip] Combine complementary AR #find doc lines	Alexander Dimitriyadi	2015-03-30	1	-3/+1
\|/ /
* \|	Require the extensions to tests pass in isolation	Rafael Mendonça França	2015-03-30	1	-0/+1
* \|	Merge pull request #19021 from morgoth/activemodel-errors-refactoring	Rafael Mendonça França	2015-03-30	2	-24/+10
\|\ \
\| * \|	Simplify and alias ActiveModel::Errors methods where possible	Wojciech Wnętrzak	2015-02-20	2	-24/+10
* \| \|	Revert "Remove Array#inquiry"	Rafael Mendonça França	2015-03-30	4	-1/+27
* \| \|	Merge pull request #19034 from jvanbaarsen/explicit-job-base-class	Matthew Draper	2015-03-30	8	-6/+33
\|\ \ \
\| * \| \|	Add explicit base class for ActiveJob jobs	Jeroen van Baarsen	2015-03-23	8	-6/+33
* \| \| \|	Merge pull request #19587 from rails/rm-sprockets-3	Rafael Mendonça França	2015-03-29	5	-17/+16
\|\ \ \ \
\| * \| \| \|	Test using sprockets 3	Rafael Mendonça França	2015-03-29	5	-17/+16
\|/ / / /
* \| \| \|	Merge pull request #19581 from kirs/bin-deprecation-version	Rafael Mendonça França	2015-03-29	1	-1/+2
\|\ \ \ \
\| * \| \| \|	Replace `in Rails 4` with `in Rails %version%` in deprecation message	Kir Shatrov	2015-03-29	1	-1/+2
* \| \| \| \|	Merge pull request #19585 from sgrif/sg-deprecate-tokenizer	Rafael Mendonça França	2015-03-29	3	-12/+51
\|\ \ \ \ \
\| * \| \| \| \|	Deprecate the `:tokenizer` option to `validates_length_of`	Sean Griffin	2015-03-29	3	-12/+51
\|/ / / / /
* / / / /	Clarify the role of `ActiveRecord::Core.encode_with`	Sean Griffin	2015-03-29	1	-4/+8
\|/ / / /
* \| \| \|	Reduce memory usage when loading types in PG	Sean Griffin	2015-03-29	4	-10/+40
* \| \| \|	Merge pull request #19483 from yui-knk/fix/getting_started	Zachary Scott	2015-03-29	1	-1/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] Fix an object of `reference`	yui-knk	2015-03-24	1	-1/+1
* \| \| \| \|	Merge pull request #19575 from y-yagi/fix_batches_test	Zachary Scott	2015-03-29	1	-2/+3
\|\ \ \ \ \
\| * \| \| \| \|	use correct method in batches test	yuuji.yaginuma	2015-03-29	1	-2/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #19544 from shuhei/fix-parameters-const-missing	Xavier Noria	2015-03-28	2	-2/+9
\|\ \ \ \ \
\| * \| \| \| \|	Return super in ActionController::Parameters.const_missing	Shuhei Kagawa	2015-03-28	2	-2/+9
* \| \| \| \| \|	Remove circular require	Rafael Mendonça França	2015-03-27	2	-4/+0
* \| \| \| \| \|	Merge pull request #19562 from mechanicles/remove-old-link	Rafael Mendonça França	2015-03-27	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove old and not working link. [ci skip]	Santosh Wadghule	2015-03-28	1	-1/+1
* \| \| \| \| \| \|	Define a setup method instead of using setup as block	Rafael Mendonça França	2015-03-27	1	-1/+2
* \| \| \| \| \| \|	Remove Array#inquiry	Rafael Mendonça França	2015-03-27	4	-27/+1
* \| \| \| \| \| \|	Merge pull request #18939 from georgeclaghorn/variant-inquiry	Rafael Mendonça França	2015-03-27	10	-33/+171
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add ActiveSupport::ArrayInquirer and Array#inquiry	George Claghorn	2015-03-24	7	-27/+112
\| * \| \| \| \| \|	Provide friendlier access to request variants	George Claghorn	2015-03-24	4	-37/+90
* \| \| \| \| \| \|	Merge pull request #19554 from prathamesh-sonpatki/improve-changelog	Zachary Scott	2015-03-27	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Improve CHANGELOG for fix for respecting pluralize_table_names [ci skip]	Prathamesh Sonpatki	2015-03-27	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #19547 from jonatack/warn-on-loading-large-query-sets	Abdelkader Boudih	2015-03-27	2	-7/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[skip ci] Improve `warn_on_records_fetched` documentation	Jon Atack	2015-03-27	2	-7/+6
* \| \| \| \| \| \| \|	Merge pull request #19540 from y-yagi/fix_fixture_file_name	Yves Senn	2015-03-27	4	-1/+21
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	respect `pluralize_table_names` when generate fixture file. fixes #19519	yuuji.yaginuma	2015-03-27	4	-1/+21
* \| \| \| \| \| \| \| \|	Merge pull request #19535 from JuanitoFatas/doc/av-comment	Yves Senn	2015-03-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	[ci skip] Unify the code comment in ActionView::Renderer#render_template.	Juanito Fatas	2015-03-27	1	-1/+1
* \| \| \| \| \| \| \| \| \|	Merge pull request #19543 from mechanicles/fix-doc	Matthew Draper	2015-03-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Correct doc sentence [ci skip]	Santosh Wadghule	2015-03-27	1	-1/+1
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* / \| \| \| \| \| \| \| \|	Missing require 'active_support/deprecation'	Akira Matsuda	2015-03-27	3	-0/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #19541 from jonatack/warn-on-loading-large-query-sets	Richard Schneeman	2015-03-27	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	[skip ci] Update configuring.md with #18846	Jon Atack	2015-03-27	1	-0/+5
\|/ / / / / / / /