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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "warn the user values are directly interpolated into _html translation...	Xavier Noria	2011-11-17	2	-14/+0
*	allow people to set a local .Gemfile so that things like ruby-debug are not r...	Aaron Patterson	2011-11-17	2	-5/+3
*	warn the user values are directly interpolated into _html translation strings	Xavier Noria	2011-11-17	2	-0/+14
*	update guide: db:structure:dump produces structure.sql now	Vijay Dev	2011-11-18	1	-1/+1
*	Revert "Merge pull request #1163 from amatsuda/sexier_migration_31"	Aaron Patterson	2011-11-17	4	-142/+13
*	Revert "Merge pull request #3603 from vijaydev/change_table_without_block_arg"	Aaron Patterson	2011-11-17	2	-66/+7
*	Merge pull request #3663 from atambo/master	José Valim	2011-11-17	4	-10/+10
\|\
\| *	Move schema_format :sql config setting from test.rb to application.rb	Alex Tambellini	2011-11-17	4	-10/+10
\|/
*	Merge pull request #3654 from wildchild/label_i18n	José Valim	2011-11-17	2	-1/+55
\|\
\| *	Fix impractical I18n lookup in nested fields_for	Alexander Uvarov	2011-11-17	2	-1/+55
* \|	Merge pull request #3658 from arunagw/fix_initialize_var_name	Vijay Dev	2011-11-16	1	-1/+1
\|\ \
\| * \|	It should be @calculated_ip not @calculate_ip	Arun Agrawal	2011-11-17	1	-1/+1
\|/ /
* \|	Merge pull request #3656 from arunagw/readline_to_read	Vijay Dev	2011-11-16	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	No need to `readlines` then `join`, just use `read` :heart:	Arun Agrawal	2011-11-17	1	-1/+1
\|/
*	Initialize our instance variables.	Aaron Patterson	2011-11-16	1	-1/+3
*	Merge pull request #3649 from indirect/remote_ip	Aaron Patterson	2011-11-16	2	-5/+7
\|\
\| *	the object itself isn't the IP, #to_s is the IP	Andre Arko	2011-11-16	1	-1/+1
\| *	:facepalm: Request#remote_ip has to work without the middleware	Andre Arko	2011-11-16	2	-3/+3
\| *	Revert "Revert "Merge pull request #3640 from indirect/remote_ip""	Andre Arko	2011-11-16	2	-6/+8
* \|	No need to `readlines` then `join`, just use `read` :heart:	Aaron Patterson	2011-11-16	1	-1/+1
* \|	Adding a deprecation warning for use of the schema_info table.	Aaron Patterson	2011-11-16	1	-0/+2
* \|	Join method uses empty string by default, so remove it	Aaron Patterson	2011-11-16	1	-2/+2
* \|	dbfile isn't supported anymore, so remove	Aaron Patterson	2011-11-16	1	-3/+3
* \|	Reduce schema format tests	Aaron Patterson	2011-11-16	1	-10/+14
* \|	Move conditionals to separate tasks so they can be reused.	Aaron Patterson	2011-11-16	1	-7/+11
* \|	Merge pull request #3500 from olivierlacan/error-whitespace	Jon Leighton	2011-11-16	1	-0/+1
\|\ \
\| * \|	CSS fix to prevent error output from being breaking out of body element.	Olivier Lacan	2011-11-03	1	-0/+1
* \| \|	Merge pull request #3438 from lazyatom/becomes-includes-errors	Jon Leighton	2011-11-16	2	-0/+9
\|\ \ \
\| * \| \|	`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