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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \|	Use strip_heredoc where possible	Sam Ruby	2013-04-11	1	-14/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Following up on an observation by @rafaelfranca https://github.com/rails/rails/pull/10170/files#r3753963 Reduce the number of gsub calls to the two cases where inputs are concatenated from various sources and with inconsistent indentation. Also zap extraneous spacing from the sass-rails line... presumably this is a holdover from a previous time where this aligned the version string with an adjacent line.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #10214 from mattetti/ar_postgres_bytea	Rafael Mendonça França	2013-04-15	2	-0/+88
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AR postgres binary bug fix
\| * \| \| \| \| \| \| \| \| \| \| \|	fix for the bytea/binary nil value bug	Matt Aimonetti	2013-04-14	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	added a test suite for the postgres binary type	Matt Aimonetti	2013-04-14	1	-0/+87
\| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this shows a problem with nil values
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #10220 from vipulnsward/interpolate_on_string	Rafael Mendonça França	2013-04-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	interpolate instead of string concat
\| * \| \| \| \| \| \| \| \| \| \|	interpolate instead of string concat	Vipul A M	2013-04-15	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #10212 from mariovisic/active_record_doc	Carlos Antonio da Silva	2013-04-15	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Add documentation for `collection.create!` on has_many records. [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Document collection.create! on has_many associations in ActiveRecord	Mario Visic	2013-04-15	1	-0/+4
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-04-13	6	-14/+14
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Corrected paramter to parameter	Carson McDonald	2013-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix :nodoc: mark on AR::AttributeMethods::Serialization [ci skip]	Francesco Rodriguez	2013-04-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix a typo	Viktar Basharymau	2013-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update to Ryan's new book per his suggestion	Jonathan Roes	2013-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://github.com/lifo/docrails/commit/edeb98c2745cbf29725eca87332cefb4f273986a#commitcomment-2995521
\| * \| \| \| \| \| \| \| \| \|	minor edit on StatementCache documentation [ci skip]	Francesco Rodriguez	2013-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix links containing stray colons	Benjamin Tan Wei Hao	2013-04-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix StatementCache docs format [ci skip]	Francesco Rodriguez	2013-04-11	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #10207 from epiclabs/use_define_singleton_method	Xavier Noria	2013-04-13	1	-4/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use define_singleton_method instead of class_eval
\| * \| \| \| \| \| \| \| \| \| \|	use define_singleton_method instead of class_eval	Francesco Rodriguez	2013-04-13	1	-4/+2
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #10206 from epiclabs/nodoc_for_missing_method	Xavier Noria	2013-04-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add :nodoc: mark to PerThreadRegistry#method_missing [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Add :nodoc: mark to PerThreadRegistry#method_missing [ci skip]	Francesco Rodriguez	2013-04-13	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #10204 from shmatov/update-git-links	Guillermo Iguaran	2013-04-13	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update github links
\| * \| \| \| \| \| \| \| \| \| \|	update git links	Roman Shmatov	2013-04-13	2	-3/+3
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	hides the per thread registry instance, and caches singleton methods	Xavier Noria	2013-04-13	4	-30/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Existing code was delegating to the instance with delegate macro calls, or invoking the instance method to reach the object and call its instance methods. But the point is to have a clean class-level interface where the thread local instance is hidden in the implementation. References #11c6973. References #10198.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #10201 from vipulnsward/remove_unused_var_in_guides	Carlos Antonio da Silva	2013-04-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove unused variable
\| * \| \| \| \| \| \| \| \| \| \|	remove unused variable	Vipul A M	2013-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	removes calls to AR::Runtime.instance	Xavier Noria	2013-04-13	3	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Registries have class-level accessors to write clean code, let's use them. This makes style uniform also with existing usage in ScopeRegistry and InstrumentationRegistry. If performance of the method_missing callback was ever considered to be a concern, then we should stop using it altogether and probably remove the callback. But while we have the feature we should use it.
* \| \| \| \| \| \| \| \| \| \| \|	simplifies the RDoc of AR::RuntimeRegistry	Xavier Noria	2013-04-13	1	-20/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous version was kind of duplicating the documentation of AS::PerThreadRegistry. Just say how to use it, the thread locals registry is know part of our vocabulary (though a pointer to Active Support is added for reference).
* \| \| \| \| \| \| \| \| \| \| \|	complete rewrite of the documentation of AS::PerThreadRegistry	Xavier Noria	2013-04-13	2	-22/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* It focuses on how to use it. * Removes some ambigueties in the original docs about whether the state is stored in the class. * Documents it provides class-level accessors via method_missing. * Documents that if the extended class has an initializer, it must accept no arguments.
* \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #10194 from ↵	Carlos Antonio da Silva	2013-04-12	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pabloh/extract_regexp_at_generators_testing_assertion" This reverts commit 81f243375b9d3cfd431c1ca904c5c1efc9a41ae8, reversing changes made to c7673b0981d961e5510c85d958c944876d543314.
* \| \| \| \| \| \| \| \| \| \| \|	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.