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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #6605 from amatsuda/ar_merge_association_test	Jon Leighton	2012-06-03	1	-0/+8
\|\
\| *	a test case that ensures AR::Relation#merge can merge associations	Akira Matsuda	2012-06-03	1	-0/+8
\|/
*	starting with the Rails 4.0 release notes	Vijay Dev	2012-06-02	1	-0/+591
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-06-02	6	-36/+59
\|\
\| *	copy edit AS guide [ci skip]	Vijay Dev	2012-06-02	1	-7/+5
\| *	copy edit routing guide [ci skip]	Vijay Dev	2012-06-02	1	-1/+3
\| *	fix up the example app for getting started guide [ci skip]	Vijay Dev	2012-06-02	6	-10/+8
\| *	better explanations for acts_like?, try and deep_dup	Hrvoje Šimić	2012-06-02	1	-6/+20
\| *	change welcome_helper.rb to home_helper.rb	spyhole	2012-06-01	1	-0/+0
\| *	Update guides/code/getting_started/test/functional/home_controller_test.rb	spyhole	2012-06-02	1	-1/+1
\| *	the file name should be changed to home_helper.rb	spyhole	2012-06-02	1	-1/+1
\| *	Update guides/code/getting_started/app/controllers/home_controller.rb	spyhole	2012-06-02	1	-1/+1
\| *	Update guides/code/getting_started/config/routes.rb	spyhole	2012-06-02	1	-1/+1
\| *	routes are viewable in browser (update guides)	schneems	2012-06-01	1	-2/+2
\| *	update ActiveModel::Dirty documentation	Francesco Rodriguez	2012-05-31	1	-24/+35
\| *	Fix typo [ci skip]	Erich Menge	2012-05-30	1	-1/+1
* \|	Revert some ActiveSupport::Callbacks changes.	Rafael Mendonça França	2012-06-01	1	-3/+16
* \|	Allow to use mounted helpers in ActionView::TestCase	Piotr Sarnacki	2012-06-01	4	-1/+24
* \|	minor comment revision	Xavier Noria	2012-06-01	1	-1/+1
* \|	Merge pull request #6588 from nbibler/polymorphic_to_model	José Valim	2012-06-01	2	-2/+34
* \|	Sync CHANGLOG with the 3-2-stable branch	Rafael Mendonça França	2012-06-01	5	-4/+91
* \|	Include routes.mounted_helpers into integration tests	Piotr Sarnacki	2012-06-01	4	-3/+27
* \|	Merge pull request #6586 from amatsuda/generator_blank_line	Rafael Mendonça França	2012-06-01	2	-2/+2
\|\ \
\| * \|	remove unneeded blank line from !namespeced? controller generators	Akira Matsuda	2012-06-01	2	-2/+2
\|/ /
* \|	Merge pull request #6583 from amatsuda/rake_dsl_19	Piotr Sarnacki	2012-06-01	1	-1/+1
\|\ \
\| * \|	Revert "Only include Rake::DSL if it's defined."	Akira Matsuda	2012-06-01	1	-1/+1
* \| \|	Merge pull request #6584 from amatsuda/ar_explain_inspect_readability	Xavier Noria	2012-06-01	1	-1/+7
\|\ \ \
\| * \| \|	improve readability of AR explain result	Akira Matsuda	2012-06-01	1	-1/+7
\|/ / /
* \| \|	Merge pull request #6579 from amatsuda/null_relation_modulize	José Valim	2012-05-31	3	-11/+15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	unused method arguments	Akira Matsuda	2012-06-01	1	-7/+6
\| * \|	modulize AR::NullRelation	Akira Matsuda	2012-06-01	3	-4/+9
\|/ /
* \|	Rake::DSL should always be available	Jeremy Kemper	2012-05-31	1	-1/+1
* \|	Merge branch 'master-sec'	Aaron Patterson	2012-05-31	5	-4/+65
\|\ \
\| * \|	Strip [nil] from parameters hash.	Aaron Patterson	2012-05-30	2	-1/+28
\| * \|	predicate builder should not recurse for determining where columns.	Aaron Patterson	2012-05-30	3	-3/+37
* \| \|	Explicitly require rake so its DSL is available	Jeremy Kemper	2012-05-31	1	-0/+1
* \| \|	Rake is in 1.9 stdlib, no need for gem dep	Jeremy Kemper	2012-05-31	1	-4/+2
* \| \|	Psych is always available on 1.9	Jeremy Kemper	2012-05-31	2	-29/+23
* \| \|	Merge pull request #6571 from jeremyf/extract-force-ssl-filter-logic-to-separ...	Rafael Mendonça França	2012-05-31	3	-7/+50
\|\ \ \
\| * \| \|	Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl	Jeremy Friesen	2012-05-31	3	-7/+50
* \| \| \|	Reduce warning messages when running Active Support tests	Andrew White	2012-05-31	2	-2/+8
* \| \| \|	Merge pull request #6566 from arunagw/add-javascripts-to-rake-stats-task	Rafael Mendonça França	2012-05-31	2	-2/+10
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add code statistics for Javascript and	Arun Agrawal	2012-05-31	2	-2/+10
* \| \| \|	Fix changelog example for count method with block [ci skip]	Carlos Antonio da Silva	2012-05-31	1	-1/+1
* \| \| \|	Fix wrong example for count method with block [ci skip]	Carlos Antonio da Silva	2012-05-31	1	-1/+1
* \| \| \|	Simplify link_to using content_tag	Carlos Antonio da Silva	2012-05-31	2	-12/+26
* \| \| \|	Make link_to arguments explicit	Carlos Antonio da Silva	2012-05-31	1	-8/+4
* \| \| \|	Make button_to arguments explicit and refactor a bit	Carlos Antonio da Silva	2012-05-31	1	-10/+6
* \| \| \|	Simplify logic to initialize valid conditions in RouteSet	Carlos Antonio da Silva	2012-05-31	1	-7/+3
\|/ / /
* \| \|	Work around undiagnosed bug that's draining a relation's bind_values	Jeremy Kemper	2012-05-31	1	-0/+1