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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge pull request #6285 from ↵	Vijay Dev	2012-05-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	acapilleri/missplelling_error_in_abstract_mysql_adapter missplelling error in abstract_mysql_adapter
\| * \| \| \| \| \| \|	missplelling error in abstract_mysql_adapter	Angelo Capilleri	2012-05-12	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-12	19	-75/+222
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activesupport/lib/active_support/callbacks.rb
\| * \| \| \| \| \| \| \|	copy edits [ci skip]	Vijay Dev	2012-05-12	1	-4/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix incorrect example [ci skip]	Vijay Dev	2012-05-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	copy editing [ci skip]	Vijay Dev	2012-05-12	1	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove docs related to ruby 1.8 from Array#wrap	Vasiliy Ermolovich	2012-05-12	1	-3/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added examples to Integer#multiple_of?	Francesco Rodriguez	2012-05-11	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	removing trailing spaces	Francesco Rodriguez	2012-05-11	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Better document the difference between #clone and #dup.	Erich Menge	2012-05-11	1	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add #nodoc to initialize_dup and use :method: to document the #dup method. Relates to issue #6235
\| * \| \| \| \| \| \| \|	added docs to String#to_datetime	Francesco Rodriguez	2012-05-11	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added docs to String#to_date	Francesco Rodriguez	2012-05-11	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added examples to String#exclude?	Francesco Rodriguez	2012-05-11	1	-1/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove unnecessary 'examples' noise	Francesco Rodriguez	2012-05-11	3	-9/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #97 from ↵	Scott Johnson	2012-05-11	1	-0/+15
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	itchy/doc_make_engine_ApplicationController_inherit_from_main_app Update engines guide ApplicationController
\| \| * \| \| \| \| \| \| \|	update engines guide to show how to have an engine's ApplicationController ↵	Scott Johnson	2012-05-11	1	-0/+15
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	inherit from the main application's ApplicationController
\| * \| \| \| \| \| \| \|	fix String#last example	Francesco Rodriguez	2012-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix String#last example	Francesco Rodriguez	2012-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added docs to String#last	Francesco Rodriguez	2012-05-11	1	-0/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	improve String#first docs	Francesco Rodriguez	2012-05-11	1	-4/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix typo in String#first	Francesco Rodriguez	2012-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added docs to String#first	Francesco Rodriguez	2012-05-11	1	-0/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added docs to String#from	Francesco Rodriguez	2012-05-11	1	-0/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	improve String#to docs	Francesco Rodriguez	2012-05-11	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added docs to String#to	Francesco Rodriguez	2012-05-11	1	-0/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of https://github.com/lifo/docrails	Eric Carty-Fickes	2012-05-11	1	-0/+25
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	added docs to String#at	Francesco Rodriguez	2012-05-11	1	-0/+25
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Clarify expire_action with namespaced controllers	Eric Carty-Fickes	2012-05-11	1	-0/+36
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	better wording	Hrvoje Šimić	2012-05-11	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	missing 'with'	Hrvoje Šimić	2012-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move HTTP Token auth docs above the Token module	Elia Schito	2012-05-11	1	-42/+44
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update guides/source/configuring.textile	Egor Homakov	2012-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update guides/source/configuring.textile	Egor Homakov	2012-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix copypaste. [ci skip]	Edward Tsech	2012-05-11	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Modified template in sample is new.html.erb, not index.html.erb	Ben Wilhelm	2012-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	deleting empty lines in docs parts	Francesco Rodriguez	2012-05-10	1	-8/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove inappropriate comma	Nick Novitski	2012-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A qualifying clause beginning with words like "as", "if", or "although" should have a comma separating it from any following clauses in a sentence, but should not have a comma immediately after the beginning word, unless it is to separate a third, non-essential clause. Example 1: "Although I would quite like to go to lunch with you, I find myself instead writing a detailed commit message to justify a single-character documentation change." Example 2: "Despite, as you might well imagine, wishing I hadn't even noticed it in the first place, I still felt the error was worth correcting."
* \| \| \| \| \| \| \| \|	s/wether/whether [ci skip]	Vijay Dev	2012-05-12	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6277 from homakov/patch-6	José Valim	2012-05-12	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comment for active_support's option in application.rb
\| * \| \| \| \| \| \| \| \|	Update railties/lib/rails/generators/rails/app/templates/config/application.rb	Egor Homakov	2012-05-12	1	-0/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #6142 from spartan-developer/master"	José Valim	2012-05-12	4	-10/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.
* \| \| \| \| \| \| \| \| \|	Remove wrong rack/utils dependency from AS	Santiago Pastorino	2012-05-12	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #6274
* \| \| \| \| \| \| \| \| \|	Merge pull request #6281 from acapilleri/mispelling_errors_in_render_text_test	Vijay Dev	2012-05-12	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mispelling errors in render_text_test.rb
\| * \| \| \| \| \| \| \| \| \|	mispelling errors in render_text_test.rb and sqlite_specific_schema	angelo giovanni capilleri	2012-05-12	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6278 from GRoguelon/master	Vijay Dev	2012-05-12	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add commas missing in performance tests
\| * \| \| \| \| \| \| \| \| \| \|	Add commas missing in performance tests	Geoffrey Roguelon	2012-05-12	2	-2/+2
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #6280 from nashby/private-try	Jon Leighton	2012-05-12	3	-3/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Object#try can't call private methods
\| * \| \| \| \| \| \| \| \| \|	Object#try can't call private methods	Vasiliy Ermolovich	2012-05-12	3	-3/+17
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #6142 from spartan-developer/master	José Valim	2012-05-12	4	-12/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactored extracting :size => 'XxY' into an extract_size! method
\| * \| \| \| \| \| \| \| \| \|	refactored extracting :size => 'XxY' into an extract_size! method	Nicholas Yianilos	2012-05-03	4	-12/+10
\| \| \| \| \| \| \| \| \| \| \|