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

	Commit message (Expand)	Author	Age	Files	Lines
*	`ActiveRecord::Base#becomes` should retain the errors of the original object.	James Adam	2011-11-16	2	-0/+9
*	Merge pull request #3608 from arunagw/unused_var_remove	Jon Leighton	2011-11-16	2	-2/+1
\|\
\| *	Unused variable removed	Arun Agrawal	2011-11-15	2	-2/+1
* \|	removing some useless conditionals	Aaron Patterson	2011-11-16	1	-10/+8
* \|	Merge pull request #2948 from atambo/master	Aaron Patterson	2011-11-16	1	-38/+66
\|\ \
\| * \|	schema_format :sql should behave like schema_format :ruby	Alex Tambellini	2011-11-04	1	-38/+66
* \| \|	Switch from marshal format to plain text for the encoding conversions dump. T...	Jon Leighton	2011-11-16	3	-6/+95
* \| \|	fixing tests on PG	Aaron Patterson	2011-11-16	1	-1/+1
* \| \|	bundler treats trunk ruby as ruby 1.9, hack around that for now	Aaron Patterson	2011-11-16	1	-1/+1
* \| \|	Substituted RailsCommands for Rails::Commands	Daniel Dyba	2011-11-16	1	-159/+161
* \| \|	Changed Commands module to RailsCommands.	Daniel Dyba	2011-11-16	1	-3/+3
* \| \|	Merge pull request #3634 from RyanNaughton/fixes_3483	Aaron Patterson	2011-11-16	2	-6/+12
\|\ \ \
\| * \| \|	Fixes issue #3483, regarding using a mixture of ranges and discrete values in...	Ryan Naughton	2011-11-14	2	-7/+9
\| * \| \|	Failing test case for issue #3483	Gabriel Sobrinho	2011-11-14	1	-0/+4
\| \| \|/ \| \|/\|
* \| \|	Revert "Merge pull request #3640 from indirect/remote_ip"	Jon Leighton	2011-11-15	2	-8/+6
* \| \|	Merge pull request #3640 from indirect/remote_ip	Yehuda Katz	2011-11-15	2	-6/+8
\|\ \ \
\| * \| \|	GetIp#to_s should never return nil. That's icky.	Andre Arko	2011-11-14	2	-6/+8
\| \|/ /
* / /	refactor test_multiple_of	Vijay Dev	2011-11-16	1	-4/+3
\|/ /
* \|	Merge pull request #3632 from indirect/b8c85de	Jon Leighton	2011-11-14	1	-0/+5
\|\ \
\| * \|	add test for bug fixed in 4f2bf64	Andre Arko	2011-11-14	1	-0/+5
\|/ /
* \|	Merge pull request #3631 from indirect/remote_ip	José Valim	2011-11-14	2	-8/+15
\|\ \
\| * \|	Return the calculated remote_ip or ip	Andre Arko	2011-11-14	1	-1/+2
\| * \|	memoize the relatively expensive remote IP code	Andre Arko	2011-11-14	1	-1/+7
\| * \|	cleaner names	Andre Arko	2011-11-14	1	-6/+6
\|/ /
* \|	Speed up attribute invocation by checking if both name and calls are compilable.	José Valim	2011-11-14	3	-29/+34
* \|	Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile	José Valim	2011-11-14	2	-0/+8
\|\ \
\| * \|	Added therubyrhino to default Gemfile under JRuby	Guillermo Iguaran	2011-11-14	2	-0/+8
* \| \|	Merge pull request #3628 from oscardelben/refactoring	Yehuda Katz	2011-11-14	1	-1/+1
\|\ \ \
\| * \| \|	use any? instead of !empty?	Oscar Del Ben	2011-11-14	1	-1/+1
* \| \| \|	Add a note to REALEASING_RAILS about testing the gem locally before releasing	Jon Leighton	2011-11-14	1	-0/+9
* \| \| \|	rake release should push the tag	Jon Leighton	2011-11-14	1	-0/+1
* \| \| \|	Merge pull request #3371 from yahonda/fix_ora_00932_error	Aaron Patterson	2011-11-14	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix ORA-00932 error when trying to insert 0 to DATE type columns.	Yasuo Honda	2011-10-19	1	-1/+1
* \| \| \| \|	Sync changelog entry	Jon Leighton	2011-11-14	1	-0/+2
* \| \| \| \|	Add note about checking postgres tests before release	Jon Leighton	2011-11-14	1	-0/+8
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #3625 from guilleiguaran/sprockets-2.1.0	Jon Leighton	2011-11-14	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Upgrade Sprockets to 2.1.0	Guillermo Iguaran	2011-11-14	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Add note about syncing CHANGELOGs	Jon Leighton	2011-11-14	1	-0/+4
* \| \| \|	Sync CHANGELOGs from 3-1-stable	Jon Leighton	2011-11-14	3	-0/+42
* \| \| \|	Merge pull request #3622 from noefroidevaux/issue_3595	Yehuda Katz	2011-11-13	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix pull request #3609	Noé Froidevaux	2011-11-13	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #3623 from indirect/remote_ip	José Valim	2011-11-13	2	-6/+6
\|\ \ \ \
\| * \| \| \|	remove ignored flag, fixes warnings	Andre Arko	2011-11-13	1	-1/+1
\| * \| \| \|	turns out the tests expect remote_addrs.first	Andre Arko	2011-11-13	1	-1/+1
\| * \| \| \|	correctly raise IpSpoofAttackError message	Andre Arko	2011-11-13	1	-2/+2
\| * \| \| \|	change tests to expect X-F-F over REMOTE_ADDR	Andre Arko	2011-11-13	1	-2/+2
\|/ / / /
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-13	9	-84/+100
\|\ \ \ \
\| * \| \| \|	copy edits in getting started guide	Vijay Dev	2011-11-13	1	-15/+12
\| * \| \| \|	Revert "Move Tip up higher so users who are fine with SQLite can skip to the ...	Vijay Dev	2011-11-13	1	-18/+16
\| * \| \| \|	Revert "Use rails help new instead of rails new -h"	Vijay Dev	2011-11-13	1	-1/+2