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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #10194 from ↵	Carlos Antonio da Silva	2013-04-12	1	-1/+3
\|\ \| \| \| \| \| \| \| \|	pabloh/extract_regexp_at_generators_testing_assertion Extract method declaration regexp for assert_method into a constant
\| *	Extract method declaration regexp into a constant	Pablo Herrero	2013-04-12	1	-1/+3
\| \|
* \|	Merge pull request #10195 from jetthoughts/eager_load_on_rake_execution_tests	José Valim	2013-04-12	1	-0/+17
\|\ \ \| \| \| \| \| \|	Added tests for `eager_load` config option rake tasks
\| * \|	Added tests for `eager_load` config option to do not eager load for rake ↵	Paul Nikitochkin	2013-04-12	1	-0/+17
\|/ / \| \| \| \| \| \|	tasks if `eager_load` is `true`
* \|	Merge pull request #10192 from senny/align_expression_outputs	Carlos Antonio da Silva	2013-04-12	1	-7/+7
\|\ \ \| \| \| \| \| \|	align the result of expressions vertically [ci skip].
\| * \|	align the result of expressions vertically [ci skip].	Yves Senn	2013-04-12	1	-7/+7
\| \| \|
* \| \|	Merge pull request #9639 from BanzaiMan/chatham_islands_time	Guillermo Iguaran	2013-04-12	1	-1/+2
\|\ \ \ \| \|/ / \|/\| \|	Add Chatham Islands Time (UTC+1245) support.
\| * \|	Add Chatham Islands Time (UTC+1245) support.	Hiro Asari	2013-04-12	1	-1/+2
\|/ / \| \| \| \| \| \|	Also update the documentation on the number of supported time zones.
* \|	Merge pull request #10190 from senny/changelog_cleanup	Carlos Antonio da Silva	2013-04-12	5	-22/+25
\|\ \ \| \| \| \| \| \|	Use unified and clean formatting in CHANGELOGS. [ci skip]
\| * \|	use unified and clean formatting in CHANGELOGS. [ci skip]	Yves Senn	2013-04-12	5	-22/+25
\|/ /
* \|	replaces Pathname#(dirname\|realpath) with File.$1	Xavier Noria	2013-04-12	1	-7/+2
\| \| \| \| \| \| \| \|	Simpler, thanks to @rubys for the hint.
* \|	Merge pull request #10179 from vipulnsward/refactor_order_hash_test	Santiago Pastorino	2013-04-11	1	-5/+1
\|\ \ \| \| \| \| \| \|	refactor order hash test; remove unused method param
\| * \|	refactor order hash test	Vipul A M	2013-04-11	1	-5/+1
\| \| \|
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-04-11	69	-289/+421
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: guides/source/action_mailer_basics.md
\| * \| \|	add wip for the action view guide [ci skip]	Vijay Dev	2013-04-11	1	-0/+1
\| \| \| \|
\| * \| \|	Merge pull request #136 from bricestacey/master	Francesco Rodríguez	2013-04-11	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Unabbreviate AP to ActionPack [ci skip]
\| \| * \| \|	Unabbreviate AP to ActionPack	Brice Stacey	2013-04-10	1	-1/+1
\| \|/ / /
\| * \| \|	Updated Singular Resource shorthand to mention shorthand without controller ↵	Oliver Jakubiec	2013-04-10	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	name.
\| * \| \|	improve accuracy of simple_format documentation. span doesn't get sanitized.	RSL	2013-04-09	1	-2/+5
\| \| \| \|
\| * \| \|	Merge pull request #135 from dalton/master	dalton	2013-04-09	1	-13/+13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Change user_class to author_class in Engine guide
\| \| * \| \|	User is not part of the Blorgh domain, so user_class doesn't make sense. ↵	Adam Dalton	2013-04-08	1	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit changes it to author_class.
\| * \| \| \|	JoinPart is no longer an abstract class	Neeraj Singh	2013-04-08	1	-1/+1
\| \|/ / /
\| * \| \|	Merge pull request #134 from igas/master	Igor Kapkov	2013-04-08	1	-8/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add missing PATCH in Getting Started Guide
\| \| * \| \|	Getting Started Guide: add missing PATCH	Igor Kapkov	2013-04-07	1	-8/+9
\| \| \| \| \|
\| * \| \| \|	Here was a 404 error: Active Record Validations	Zoltan Debre	2013-04-07	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \|	Active Record Validations and Callbacks's URL and name is changed.
\| * \| \|	Added a table of html status symols	Iain Beeston	2013-04-07	1	-1/+56
\| \| \| \|
\| * \| \|	Improve some variable naming for the integration test in the testing guide. ↵	Dan Erikson	2013-04-06	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Corrected model test directory to be test/models instead of test/unit.	Dan Erikson	2013-04-06	1	-2/+2
\| \| \| \|
\| * \| \|	Typo fix	Carson McDonald	2013-04-05	1	-3/+3
\| \| \| \|
\| * \| \|	Grammar	Jonathan Roes	2013-04-05	1	-11/+11
\| \| \| \|
\| * \| \|	Remove deprecated attr_accessible mention	Andrea	2013-04-05	1	-4/+1
\| \| \| \|
\| * \| \|	Change deprecated validates_presence_of	Zoltan Debre	2013-04-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	In Validations section the example contained "validates_presence_of" which is deprecated. It should be "validates :name, presence: true"
\| * \| \|	Merge pull request #133 from chandresh/master	Chandresh Pant	2013-04-05	1	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fixed the unknown_action_create_for_posts.png image
\| \| * \| \|	correct image for unknown_action_create_for_posts.png	Chandresh Pant	2013-04-05	1	-0/+0
\| \|/ / /
\| * \| \|	update ActiveRecord::AttributeMethods::Serialization documentation [ci skip]	Francesco Rodriguez	2013-04-04	1	-0/+7
\| \| \| \|
\| * \| \|	mark ReversibleBlockHelper as :nodoc: [ci skip]	Francesco Rodriguez	2013-04-04	1	-1/+1
\| \| \| \|
\| * \| \|	fix Array#uniq_by! docs [ci skip]	Francesco Rodriguez	2013-04-04	1	-2/+2
\| \| \| \|
\| * \| \|	add documentation to Benchmark#ms [ci skip]	Francesco Rodriguez	2013-04-04	1	-0/+7
\| \| \| \|
\| * \| \|	fix broken format in Array#to_sentence [ci skip]	Francesco Rodriguez	2013-04-04	1	-3/+5
\| \| \| \|
\| * \| \|	fix broken format in ActionView::Helpers::AssetTagHelper [ci skip]	Francesco Rodriguez	2013-04-04	1	-4/+9
\| \| \| \|
\| * \| \|	mark ActionView::Helpers::Tags as :nodoc: [ci skip]	Francesco Rodriguez	2013-04-04	33	-68/+67
\| \| \| \|
\| * \| \|	Update Ryan Bigg's occupation and credentials.	Jonathan Roes	2013-04-04	1	-1/+1
\| \| \| \|
\| * \| \|	Add Action View Overview to guides listing.	Jonathan Roes	2013-04-04	1	-0/+4
\| \| \| \|
\| * \| \|	Basic Layouts overview w/ link to guide	Jonathan Roes	2013-04-04	1	-7/+2
\| \| \| \|
\| * \| \|	describe Action Mailer I18n subject lookup	Yves Senn	2013-04-04	1	-0/+22
\| \| \| \|
\| * \| \|	[layout/rendering guide] move sentence to new line to follow convention in ↵	Weston Platter	2013-04-04	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	other guides.
\| * \| \|	[layout/rendering guide] remove redundant wording	Weston Platter	2013-04-03	1	-3/+1
\| \| \| \|
\| * \| \|	fix broken format in ActionView::Helpers::NumberHelper [ci skip]	Francesco Rodriguez	2013-04-03	1	-0/+25
\| \| \| \|
\| * \| \|	Fixed Typo	Prathamesh Sonpatki	2013-04-03	1	-1/+1
\| \| \| \|
\| * \| \|	Changed rspec/model directory example to spec/models	Prathamesh Sonpatki	2013-04-03	1	-2/+2
\| \| \| \|