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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	added the backtrace so errors can be found	Aaron Patterson	2012-01-20	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	add a broadcasting logger so we can split logs	Aaron Patterson	2012-01-20	2	-0/+80
\|/ / / / / / /
* \| \| \| \| \| \|	Fix another race condition.	Jon Leighton	2012-01-20	3	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up.
* \| \| \| \| \| \|	Merge pull request #4528 from j-manu/log-tailer-fix	Aaron Patterson	2012-01-20	1	-3/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for log tailer when the log file doesn't exist.
\| * \| \| \| \| \| \|	Fix for log tailer when the log file doesn't exist.	Manu J	2012-01-20	1	-3/+7
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4556 from brainopia/remove_old_cruft	Aaron Patterson	2012-01-20	6	-11/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unused assigns from ActionView::Template::Error
\| * \| \| \| \| \| \|	Removed unused assigns from ActionView::Template::Error	brainopia	2012-01-20	6	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They existed since initial rails commit by DHH but lost use a long time ago
* \| \| \| \| \| \| \|	Merge pull request #4557 from rafaelfranca/av-number_helper-refactor	José Valim	2012-01-20	2	-2/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No need to check html_safe? twice at number_to_percentage
\| * \| \| \| \| \| \| \|	No need to check html_safe? twice	Rafael Mendonça França	2012-01-20	2	-2/+3
\| \|/ / / / / / /
* / / / / / / /	Revert "just use an alias. The target method is public, so make this one ↵	Aaron Patterson	2012-01-20	1	-1/+4
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	public" This reverts commit be7d2248e9505983d1aacf0b33c657e6e3ddd9db.
* \| \| \| \| \| \|	Merge pull request #4555 from kennyj/mail_bump	José Valim	2012-01-20	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump mail 2.4.1
\| * \| \| \| \| \| \|	Bump mail	kennyj	2012-01-20	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #4554 from rodrigoflores/master	José Valim	2012-01-20	3	-2/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the :format option to number_to_percentage
\| * \| \| \| \| \| \|	Added format to percentage	Rodrigo Flores	2012-01-20	3	-2/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4545 from trotter/fix-documentation-bug	Vijay Dev	2012-01-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Fix documentation bug in Rails::Engine
\| * \| \| \| \| \| \|	Fix documentation bug in Rails::Engine	Trotter Cashion	2012-01-19	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	push ivar initialization down to a common method	Aaron Patterson	2012-01-19	1	-16/+20
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	adding tests for previous_changes hash	Aaron Patterson	2012-01-19	1	-0/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	just use an alias. The target method is public, so make this one public	Aaron Patterson	2012-01-19	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	too.
* \| \| \| \| \| \| \|	remove unused captures	Aaron Patterson	2012-01-19	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	avoid useless is_a checks	Aaron Patterson	2012-01-19	1	-8/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	move tagged logging to a module, stop proxying every method call	Aaron Patterson	2012-01-19	1	-36/+32
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4546 from carlosantoniodasilva/response-body-performed	José Valim	2012-01-19	3	-8/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use performed? instead of checking for response_body
\| * \| \| \| \| \| \| \|	Use performed? instead of checking for response_body	Carlos Antonio da Silva	2012-01-19	3	-8/+5
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Check for performed? instead of response_body * Change performed? to return a boolean * Refactor AC::Metal#response_body= to reuse variable
* \| \| \| \| \| \| \|	do not do reverse lookups on incoming requests for webrick. fixes #4542	Aaron Patterson	2012-01-19	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	update release notes [ci skip]	Vijay Dev	2012-01-20	1	-2/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Do not deprecate performed.	José Valim	2012-01-19	3	-2/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	add uglifier version info in the 'what to update' section	Vijay Dev	2012-01-19	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fix duplicate ids for the headers [ci skip]	Vijay Dev	2012-01-19	1	-7/+7
\|/ / / / / / /
* \| \| \| \| \| \|	document AR::Base#with_lock in release notes [ci skip]	Vijay Dev	2012-01-19	1	-0/+27
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	update the getting_started guide code [ci skip]	Vijay Dev	2012-01-19	9	-24/+57
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4531 from exviva/pessimistic_with_lock	Aaron Patterson	2012-01-19	4	-1/+81
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ActiveRecord::Base#with_lock
\| * \| \| \| \| \| \|	Add ActiveRecord::Base#with_lock	Olek Janiszewski	2012-01-18	4	-1/+81
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a `with_lock` method to ActiveRecord objects, which starts a transaction, locks the object (pessimistically) and yields to the block. The method takes one (optional) parameter and passes it to `lock!`. Before: class Order < ActiveRecord::Base def cancel! transaction do lock! # ... cancelling logic end end end After: class Order < ActiveRecord::Base def cancel! with_lock do # ... cancelling logic end end end
* \| \| \| \| \| \|	Merge pull request #4538 from kennyj/should_use_uri_parse	Aaron Patterson	2012-01-19	4	-11/+7
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Convert URI.parser.parse to URI.parse, and remove ruby 1.8.x code.
\| * \| \| \| \| \|	Convert URI.parser.parse to URI.parse, and remove ruby 1.8.x code.	kennyj	2012-01-19	4	-11/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-01-19	2	-1/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	revising release notes [ci skip]	Vijay Dev	2012-01-19	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix small typo in mail_to docs in url_helper.rb	Simon Baird	2012-01-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update release note: timestamps is non-null as default	Fujimura Daisuke	2012-01-19	1	-0/+2
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	select doesn't take multiple arguments - fixes #4539 [ci skip]	Vijay Dev	2012-01-19	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, fixed the bit about returning AM::MissingAttributeError. This seems to be fixed earlier in 3-2-stable only.
* \| \| \| \| \| \|	Merge pull request #4532 from rafaelfranca/av-button_to-refactor	José Valim	2012-01-19	4	-20/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor button_to helper to use token_tag method
\| * \| \| \| \| \| \|	Extract method_tag	Rafael Mendonça França	2012-01-19	2	-2/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor button_to helper to use token_tag method	Rafael Mendonça França	2012-01-19	4	-18/+34
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4534 from lest/patch-1	Piotr Sarnacki	2012-01-18	1	-29/+8
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| / / / / \| \| \|/ / / / \| \|/\| \| \| \|	refactor RAILS_CACHE deprecation
\| * \| \| \| \|	refactor RAILS_CACHE deprecation	Sergey Nartimov	2012-01-19	1	-29/+8
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that was introduced in 6f8159c4217dc8433a2027ced0c61e7ce94551d3
* \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-01-19	1	-1/+7
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	revise wording [ci skip]	Vijay Dev	2012-01-19	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Adding Action Mailer section to 3.2 release notes	Guillermo Iguaran	2012-01-18	1	-0/+6
\| \| \| \| \|
\| * \| \| \|	Update Release Notes: sprockets-rails section should be inside of ActionPack ↵	Guillermo Iguaran	2012-01-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	section
* \| \| \| \|	Merge pull request #4527 from rafaelfranca/av-logger	José Valim	2012-01-18	2	-11/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Remove delegation to ActionController::Base