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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge pull request #4182 from bogdan/non_keyed_callbacks	José Valim	2011-12-25	1	-10/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	AS::Callbacks: improve __define_runner perfomance for non-keyed callbacks.
\| * \| \| \| \|	AS::Callbacks: improve __define_runner perfomance	Bogdan Gusiev	2011-12-25	1	-10/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Some fixes in rails guides generation	Vijay Dev	2011-12-25	2	-11/+9
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Passing edge information to the views fixes the lack of the edge badge and sets the appropriate welcome page on edgeguides.rubyonrails.org. * Changes in the welcome message to hyper link the rails tree based on the version. * Mention the Amazon url from where kindlegen can be downloaded.
* \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-25	9	-13/+25
\|\ \ \ \ \
\| * \| \| \| \|	Clarify what persisted? returns.	Uģis Ozols	2011-12-25	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Remove extra 'be'.	Uģis Ozols	2011-12-25	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Revert "Changelog release dates fixed according to rubygems.org"	Vijay Dev	2011-12-24	3	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ae60475a41cb0f5b3f7e071b75a0b5c5214c9f85. Reason: Changelogs are not meant to be edited in docrails.
\| * \| \| \| \|	Changelog release dates fixed according to rubygems.org	Josef Šimánek	2011-12-24	3	-7/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Final grammar checkup on 3.2 release notes.	Kristian Freeman	2011-12-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Grammar in 3.2 release notes.	Kristian Freeman	2011-12-23	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Finished implementation of MIT license linking.	Kristian Freeman	2011-12-23	6	-6/+18
\| \| \| \| \| \|
\| * \| \| \| \|	[docs] make it clear that the methods in a generator are executed sequentially	Brian Browning	2011-12-23	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	fix kindle apps link in edge guides index	Vijay Dev	2011-12-25	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4181 from mipearson/master	Vijay Dev	2011-12-25	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix my name in CHANGELOG.md
\| * \| \| \| \| \|	Mip Earson -> Michael Pearson in changelog.	Michael Pearson	2011-12-26	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	fixes credit in changelog entry	Xavier Noria	2011-12-25	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	registers guide generation for the Kindle and Kindle apps in the Changelog	Xavier Noria	2011-12-25	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	download guides for the Kindle and Kindle apps from the home page	Xavier Noria	2011-12-25	4	-6/+21
\| \| \| \| \| \|
* \| \| \| \| \|	guides generation for the Kindle looking good now [Mip Earson & Xavier Noria]	Xavier Noria	2011-12-25	1	-9/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4180 from lest/remove-encoding-related	José Valim	2011-12-25	25	-298/+168
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove checks for encodings availability
\| * \| \| \| \| \|	remove checks for encodings availability	Sergey Nartimov	2011-12-25	25	-298/+168
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #4177 from castlerock/ruby-debug19_with_console	José Valim	2011-12-25	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prompt message for gem ruby-debug19 for console error if ruby-debug19 not found
\| * \| \| \| \| \|	gem ruby-debug19 for console error if ruby-debug19 not found	Vishnu Atrai	2011-12-25	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	(draft) guides for the Kindle and Kindle apps [Mip Earson & Xavier Noria]	Xavier Noria	2011-12-24	16	-197/+483
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4173 from nashby/remove-time-marshaling-18	José Valim	2011-12-24	1	-27/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove Time._dump and Time._load patching for ruby 1.8
\| * \| \| \| \| \|	remove Time._dump and Time._load patching for ruby 1.8	Vasiliy Ermolovich	2011-12-25	1	-27/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Use 1.9 hash syntax instead.	José Valim	2011-12-24	3	-15/+15
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #4172 from nashby/refactor-tokenizer	José Valim	2011-12-24	1	-4/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't call an extra method if options[:tokenizer] is not present
\| * \| \| \| \| \|	don't call an extra method if options[:tokenizer] is not present	Vasiliy Ermolovich	2011-12-24	1	-4/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4170 from lest/remove-deprecated-synchronize	José Valim	2011-12-24	3	-71/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove deprecated Module#synchronize from ActiveSupport
\| * \| \| \| \| \| \|	remove deprecated Module#synchronize from ActiveSupport	Sergey Nartimov	2011-12-24	3	-71/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #4168 from lest/remove-define-attr-method	Jeremy Kemper	2011-12-24	2	-72/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove deprecated define_attr_method from ActiveModel::AttributeMethods
\| * \| \| \| \| \| \|	remove deprecated define_attr_method from ActiveModel::AttributeMethods	Sergey Nartimov	2011-12-24	2	-72/+0
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #4171 from castlerock/remove_deprecated_stuff	Vijay Dev	2011-12-24	2	-6/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	remove deprecated whiny nil relates
\| * \| \| \| \| \|	remove deprecated whiny nil related code	Vishnu Atrai	2011-12-25	2	-6/+0
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #4166 from nashby/range-min-max	Jeremy Kemper	2011-12-24	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use Range#min and Range#max to reduce extra statement
\| * \| \| \| \| \|	use Range#min and Range#max to reduce extra statement	Vasiliy Ermolovich	2011-12-24	1	-2/+1
\|/ / / / / /
* \| \| \| \| \|	assert_not_match -> assert_no_match.	José Valim	2011-12-24	2	-6/+6
\| \| \| \| \| \|
* \| \| \| \| \|	add latest changes to 3.2 release notes	Vijay Dev	2011-12-24	1	-0/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Intercept sends in Model::DeprecationProxy	Jon Leighton	2011-12-24	2	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4161 from lest/remove-uniq-by-usage	José Valim	2011-12-24	2	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use Array#uniq in AM instead of deprecated Array#uniq_by
\| * \| \| \| \| \|	use Array#uniq in AM instead of deprecated Array#uniq_by	Sergey Nartimov	2011-12-24	2	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4160 from lest/deprecate-encoding-aware	José Valim	2011-12-24	25	-164/+113
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	deprecate String#encoding_aware? and remove its usage
\| * \| \| \| \| \|	deprecate String#encoding_aware? and remove its usage	Sergey Nartimov	2011-12-24	25	-164/+113
\|/ / / / / /
* \| \| \| \| \|	Fix position of load hook so that Base has been defined and included Model ↵	Jon Leighton	2011-12-24	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before it runs
* \| \| \| \| \|	minor edits in caching guide	Vijay Dev	2011-12-24	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	A few doc changes	Vijay Dev	2011-12-24	3	-13/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Fix regexp intervals.	José Valim	2011-12-24	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Add some doc for ActiveRecord::Model	Jon Leighton	2011-12-24	2	-3/+38
\| \| \| \| \| \|
* \| \| \| \| \|	Add test to ensure AR::Model initialization works correctly	Jon Leighton	2011-12-24	1	-0/+5
\| \| \| \| \| \|