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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge pull request #4637 from railsaholic/error_message_fix	Aaron Patterson	2012-01-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	quote fix ` to ' in the ArgumentError message
\| * \| \| \| \| \| \| \|	quote fix ` to ' in the ArgumentError message	Manoj	2012-01-24	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	message quote fix
* \| \| \| \| \| \| \|	Merge pull request #4636 from sachin87/code_improved	Xavier Noria	2012-01-24	1	-6/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	code improved with better condition
\| * \| \| \| \| \| \| \|	code improved	Sachin87	2012-01-24	1	-6/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #4628 from rafaelfranca/fix-build	José Valim	2012-01-24	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken build
\| * \| \| \| \| \| \| \|	Only show the type if column is present	Rafael Mendonça França	2012-01-23	1	-1/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #4596 from kennyj/fix_4344	José Valim	2012-01-24	2	-1/+57
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GH #4344. Callback defined in a module is not triggered when the module extends an object under Rails 3.2rc2
\| * \| \| \| \| \| \| \|	Fix GH #4344. A defined callback in extended module is called too.	kennyj	2012-01-24	2	-1/+57
\|/ / / / / / / /
* \| \| \| \| \| \| \|	initialized the @segment_keys instance variable	Aaron Patterson	2012-01-23	1	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Added custom regexps to ASTs that have literal nodes on either side of	Aaron Patterson	2012-01-23	2	-1/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	symbol nodes. Fixes #4585
* \| \| \| \| \| \| \|	moved the `get` testing method to a module	Aaron Patterson	2012-01-23	2	-11/+17
\|/ / / / / / /
* \| \| \| \| \| \|	updated the warning signature	Aaron Patterson	2012-01-23	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Deprecated multi args to http route methods	Aaron Patterson	2012-01-23	2	-1/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4558 from stephencelis/type-cast-unknown-should-fail	Aaron Patterson	2012-01-23	3	-8/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't type-cast unknown types to YAML.
\| * \| \| \| \| \| \|	Don't type-cast unknown types to YAML.	Stephen Celis	2012-01-20	3	-8/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4563 from amatsuda/ar_relation_pp	Aaron Patterson	2012-01-23	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	let AR::Relation pretty_printed like an Array
\| * \| \| \| \| \| \| \|	let AR::Relation pretty_printed like an Array	Akira Matsuda	2012-01-21	1	-0/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4576 from guilleiguaran/bump-required-rubygems-version	Aaron Patterson	2012-01-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rubygems required version to 1.8.11 (default version in 1.9.3-p0)
\| * \| \| \| \| \| \| \| \|	Bump rubygems required version to 1.8.11 (default version in 1.9.3-p0)	Guillermo Iguaran	2012-01-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #4581 from kennyj/remove_unused_argument	Aaron Patterson	2012-01-23	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused argument.
\| * \| \| \| \| \| \| \| \| \|	Remove unused argument.	kennyj	2012-01-22	1	-3/+3
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #4620 from carlosantoniodasilva/counter-cache-old-code	Aaron Patterson	2012-01-23	1	-6/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove not used if..else clause
\| * \| \| \| \| \| \| \| \| \|	Remove not used if..else clause	Carlos Antonio da Silva	2012-01-23	1	-6/+0
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to #4614.
* \| \| \| \| \| \| \| \| \|	Merge pull request #4617 from sachin87/remove_repetition	José Valim	2012-01-23	1	-4/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	alias_method added
\| * \| \| \| \| \| \| \| \| \|	alias_method added	Sachin87	2012-01-23	1	-4/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #4614 from arunagw/unused_var_remove	José Valim	2012-01-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unused var removed
\| * \| \| \| \| \| \| \| \| \|	Unused var removed	Arun Agrawal	2012-01-23	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #4613 from pda/cookie_jar_deleted_predicate	José Valim	2012-01-23	2	-0/+20
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CookieJar#deleted? predicate method
\| * \| \| \| \| \| \| \| \| \|	ActionDispatch::Cookies::CookieJar#deleted? predicate method.	Paul Annesley	2012-01-24	2	-0/+20
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Necessary in controller tests to determine if the CookieJar will delete the given cookie.
* \| \| \| \| \| \| \| \| \|	Merge pull request #4612 from rafaelfranca/av-refactor	José Valim	2012-01-23	6	-28/+53
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some improvements on ActionView::Helpers::Tags
\| * \| \| \| \| \| \| \| \| \|	Raise a better error if anyone wants to create your own ↵	Rafael Mendonça França	2012-01-23	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionView::Helpers::Tags::Base child and do not implement the render method
\| * \| \| \| \| \| \| \| \| \|	properly memoize {field_type,select_type} as class variable	Akira Matsuda	2012-01-23	2	-2/+14
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	no need to module_eval here anymore	Akira Matsuda	2012-01-23	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use ActiveSupport::Autoload to autoload the tags	Rafael Mendonça França	2012-01-23	1	-23/+25
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #4610 from lest/patch-2	José Valim	2012-01-22	3	-5/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use rack 1.4.1
\| * \| \| \| \| \| \| \| \| \|	use rack 1.4.1	Sergey Nartimov	2012-01-23	3	-5/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #4608 from indrekj/translated_date_order	José Valim	2012-01-22	2	-1/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise exception when date.order includes invalid elements
\| * \| \| \| \| \| \| \| \| \|	Raise exception when date.order includes invalid elements	Indrek Juhkam	2012-01-22	2	-1/+17
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Clean up http config	Jeremy Kemper	2012-01-22	2	-27/+16
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Clean up SSL client cert example	Jeremy Kemper	2012-01-22	1	-4/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Prefer to document with https:// example URLs and no port numbers	Jeremy Kemper	2012-01-22	3	-20/+20
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Describe Basic and Digest authentication. Document how to set auth_type to ↵	Jeremy Kemper	2012-01-22	1	-14/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	:digest.
* \| \| \| \| \| \| \| \| \|	One space separates sentences, not two	Jeremy Kemper	2012-01-22	3	-34/+34
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #4605 from lest/patch-1	José Valim	2012-01-22	1	-3/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove obsolete code as old actionmailer api was removed
\| * \| \| \| \| \| \| \| \|	remove obsolete code as old actionmailer api was removed	Sergey Nartimov	2012-01-22	1	-3/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵	José Valim	2012-01-22	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bash, zsh, etc, closes #4602 Conflicts: railties/test/generators/migration_generator_test.rb
* \| \| \| \| \| \| \| \| \|	Merge pull request #4574 from ihid/master	José Valim	2012-01-21	2	-0/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed regression - unable to use a range as choices for form.select.
\| * \| \| \| \| \| \| \| \| \|	Fix inconsistent ability to use a range as choices for select_tag.	Jeremy Walker	2012-01-21	2	-0/+17
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4599 from jarijokinen/patch-1	José Valim	2012-01-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo
\| * \| \| \| \| \| \| \| \| \| \|	Fix typo	Jari Jokinen	2012-01-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|