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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \| \| \| \| \|	Fix documentation bug in Rails::Engine	Trotter Cashion	2012-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	document `:raise` option support for several helpers [ci skip]	Jonathan Roes	2012-01-20	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #79 from doriath/master	Xavier Noria	2012-01-20	1	-19/+19
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Fix indentation in comment of Delegation module
\| \| * \| \| \| \| \| \| \| \| \|	Fix indentation in code example of Delegation	Tomasz Zurkowski	2012-01-20	1	-19/+19
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4573 from amatsuda/ar_default_timezone_utc	José Valim	2012-01-21	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	change AR default_timezone to :utc since it's the default for AR::Railtie
\| * \| \| \| \| \| \| \| \| \|	change AR default_timezone to :utc since it's the default for AR::Railtie	Akira Matsuda	2012-01-21	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4572 from semaperepelitsa/noregexp	José Valim	2012-01-21	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Replace regexp matching with a simple string manipulation.
\| * \| \| \| \| \| \| \| \| \|	Replace regexp matching with a simple string manipulation.	Semyon Perepelitsa	2012-01-21	1	-2/+3
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using regexp looks like overkill here and is also 2x slower. user system total real string 0.020000 0.000000 0.020000 ( 0.016256) regexp 0.030000 0.000000 0.030000 ( 0.035360) require "benchmark" names = ("a".."z").map { \|c\| c + "a" * rand(5..10) + "=" * rand(0..1) }.map(&:to_sym) puts names n = 1000 Benchmark.bmbm do \|x\| x.report "string" do n.times do names.each do \|name\| string_name = name.to_s string_name.chomp!('=') string_name end end end x.report "regexp" do n.times do names.each do \|name\| name.to_s =~ /(.*)=$/ $1 end end end end
* \| \| \| \| \| \| \| \| \|	Merge pull request #4560 from rafaelfranca/av-number_helper-refactor	José Valim	2012-01-20	1	-52/+34
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Refactor NumberHelpers
\| * \| \| \| \| \| \| \| \|	Refactor translations retrieval	Rafael Mendonça França	2012-01-20	1	-18/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove code duplication	Rafael Mendonça França	2012-01-20	1	-34/+19
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	stop splatting so much. We don't need :star:args everywhere	Aaron Patterson	2012-01-20	1	-7/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	broadcasting to the console and remove file tailing middleware	Aaron Patterson	2012-01-20	1	-1/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	pushed broadcasting down to a module	Aaron Patterson	2012-01-20	3	-49/+41
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	defined the actual logger signature	Aaron Patterson	2012-01-20	1	-2/+2
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	restored logging to the log file and display on the console	Aaron Patterson	2012-01-20	1	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fixed test for more informative message	Aaron Patterson	2012-01-20	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	made the broadcast logger quack more like a logger	Aaron Patterson	2012-01-20	2	-15/+59
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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