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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scope	Rafael Mendonça França	2013-09-16	4	-6/+25
\|\
\| *	Collapse where constraints to one where constraint	Paul Nikitochkin	2013-09-13	4	-6/+25
* \|	Merge pull request #12245 from kennyj/remove_no_using_code_20130916	José Valim	2013-09-16	1	-4/+0
\|\ \
\| * \|	Removes unused code related to DatabaseTasks.	kennyj	2013-09-16	1	-4/+0
\|/ /
* \|	Merge pull request #12239 from JuanitoFatas/form_helpers	Steve Klabnik	2013-09-15	1	-1/+1
\|\ \
\| * \|	[ci skip] Consistency wording of 9.6 in form_helpers.md	Juanito Fatas	2013-09-15	1	-1/+1
\|/ /
* \|	Merge pull request #12231 from harshadsabne/master	Steve Klabnik	2013-09-14	1	-6/+6
\|\ \
\| * \|	[ci skip] Update plugins.md	Harshad Sabne	2013-09-14	1	-6/+6
* \| \|	Merge pull request #12225 from adomokos/no_need_for_active_support_concern	Steve Klabnik	2013-09-13	1	-2/+0
\|\ \ \
\| * \| \|	Removing ActiveSupport::Concern, it's not needed	Attila Domokos	2013-09-13	1	-2/+0
\|/ / /
* \| \|	Merge pull request #12223 from adomokos/fixing_typo	Rafael Mendonça França	2013-09-13	1	-1/+1
\|\ \ \
\| * \| \|	Fixing comment typo in ActionController::Base	Attila Domokos	2013-09-13	1	-1/+1
\|/ / /
* \| \|	Don't require using application_name before options	Piotr Sarnacki	2013-09-13	5	-23/+23
* \| \|	Merge pull request #12222 from rcillo/fix-custom-flash	Rafael Mendonça França	2013-09-13	3	-1/+20
\|\ \ \
\| * \| \|	Custom flash should be defined only for the class that defines it and it's su...	Ricardo de Cillo	2013-09-13	3	-1/+20
* \| \| \|	Merge pull request #12215 from harshadsabne/master	Rafael Mendonça França	2013-09-13	1	-5/+5
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Update 3_2_release_notes.md	Harshad Sabne	2013-09-13	1	-5/+5
* \| \| \|	Merge pull request #12216 from suginoy/a-an	Rafael Mendonça França	2013-09-13	9	-11/+11
\|\ \ \ \
\| * \| \| \|	Fix typos: the indefinite articles(a -> an)	SUGINO Yasuhiro	2013-09-13	9	-11/+11
* \| \| \| \|	Missing destroy command	Akira Matsuda & Yukiko Kawamoto	2013-09-13	1	-0/+4
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #12129 from Empact/deprecate-array-bang-delegation	Rafael Mendonça França	2013-09-12	5	-147/+265
\|\ \ \ \
\| * \| \| \|	Deprecate the delegation of Array bang methods in ActiveRecord::Delegation	Ben Woosley	2013-09-04	3	-3/+117
\| * \| \| \|	Pull the RelationMutationTests from cases/relation_test to cases/relation/mut...	Ben Woosley	2013-09-03	2	-135/+139
\| \|/ / /
* \| \| \|	Merge pull request #12137 from lann/fix_association_first_last	Rafael Mendonça França	2013-09-12	3	-6/+11
\|\ \ \ \
\| * \| \| \|	Make CollectionAssociation first/last with integer fetch with query	Lann Martin	2013-09-09	3	-6/+11
* \| \| \| \|	Add CHANGELOG entry for #11698	Rafael Mendonça França	2013-09-12	1	-0/+4
* \| \| \| \|	Merge pull request #11698 from dmathieu/sqlite_tasks_without_rails	Rafael Mendonça França	2013-09-12	3	-2/+4
\|\ \ \ \ \
\| * \| \| \| \|	let the sqlite task run without rails	Damien Mathieu	2013-08-07	3	-2/+4
* \| \| \| \| \|	Merge pull request #12156 from rywall/from-copy-binds	Rafael Mendonça França	2013-09-12	3	-0/+12
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Allow Relation#from to accept other relations with bind values.	Ryan Wallace	2013-09-08	3	-0/+12
* \| \| \| \| \| \|	Add CHANGELOG entry for #12149	Rafael Mendonça França	2013-09-12	1	-0/+6
* \| \| \| \| \| \|	Merge pull request #12159 from nashby/issue-12149	Rafael Mendonça França	2013-09-12	2	-1/+10
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	do not break params filtering on nil values	Vasiliy Ermolovich	2013-09-07	2	-1/+10
* \| \| \| \| \| \| \|	Use the Rails binary when generating task	Rafael Mendonça França	2013-09-12	1	-2/+2
* \| \| \| \| \| \| \|	Merge pull request #12170 from siong1987/task	Rafael Mendonça França	2013-09-12	1	-1/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	[ci skip] Documentation on how to create custom rake tasks.	Teng Siong Ong	2013-09-10	1	-1/+3
* \| \| \| \| \| \| \| \|	Merge pull request #12210 from vipulnsward/remove_extra_loop	Rafael Mendonça França	2013-09-12	1	-5/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Remove unnecessary loop	Vipul A M	2013-09-13	1	-5/+2
* \| \| \| \| \| \| \| \| \|	Merge pull request #12209 from waynn/patch-4	Rafael Mendonça França	2013-09-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	"generates" applies to "collection radio" so it should be singular	Waynn Lue	2013-09-12	1	-2/+2
\|/ / / / / / / / / /
* / / / / / / / / /	Add CHANGELOG entry for #10879	Rafael Mendonça França	2013-09-12	1	-0/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #12112 from adamniedzielski/fix-form-for-namespace-and-as	Rafael Mendonça França	2013-09-12	3	-1/+21
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	form_for - fix :namespace and :as options clash	Adam Niedzielski	2013-09-09	3	-1/+21
* \| \| \| \| \| \| \| \| \|	Merge pull request #12198 from anupamc/master	Rafael Mendonça França	2013-09-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Removed semicolon and added space	Anupam Choudhury	2013-09-13	1	-2/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #12175 from JuanitoFatas/doc-patch	Rafael Mendonça França	2013-09-12	1	-5/+16
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Fix links in section 5.3 of i18n.md	Juanito Fatas	2013-09-10	1	-5/+5
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Add missing setting locale code snippet.	Juanito Fatas	2013-09-10	1	-0/+11
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #12208 from mjhoy/patch-1"	Rafael Mendonça França	2013-09-12	1	-0/+4
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-09-13	11	-129/+293
\|\ \ \ \ \ \ \ \ \ \