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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #4125 from nashby/remove-process-daemon	José Valim	2011-12-21	4	-32/+0
\|\
\| *	remove Proces.daemon from core_ext	Vasiliy Ermolovich	2011-12-22	4	-32/+0
\|/
*	just require things once	Aaron Patterson	2011-12-21	1	-4/+2
*	append puts the routes after the default, which causes a 404. instead use pre...	Aaron Patterson	2011-12-21	1	-1/+1
*	just use def setup	Aaron Patterson	2011-12-21	1	-1/+2
*	DeprecatedUnderscoreRead does not exist anymore	Aaron Patterson	2011-12-21	1	-1/+0
*	adding integration test for journey #7	Aaron Patterson	2011-12-21	1	-0/+22
*	switch to git journey	Aaron Patterson	2011-12-21	1	-1/+1
*	Merge pull request #4122 from qoobaa/mass_assignment_with_associated_object	José Valim	2011-12-21	4	-13/+66
\|\
\| *	added failing tests for has_many, has_one and belongs_to associations with st...	Jakub Kuźma	2011-12-21	4	-13/+66
* \|	Move SubTestTask. Soften up tests.	Jeremy Kemper	2011-12-21	3	-48/+44
* \|	Merge pull request #4119 from lucasmazza/render_without_options	José Valim	2011-12-21	2	-4/+13
\|\ \
\| * \|	raises an ArgumentError if no valid options are given to TemplateRenderer#det...	Lucas Mazza	2011-12-21	2	-4/+13
* \| \|	Merge pull request #4104 from lest/remove-1-8-code	José Valim	2011-12-21	4	-59/+3
\|\ \ \
\| * \| \|	remove Enumerable#each_with_object from core_ext as it is present in ruby 1.9	lest	2011-12-21	4	-59/+3
* \| \| \|	Merge pull request #4109 from Karunakar/test1	José Valim	2011-12-21	1	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Changed the old logger to new active support logger	Karunakar (Ruby)	2011-12-21	1	-2/+2
* \| \| \|	Merge pull request #4116 from lest/remove-deprecated	José Valim	2011-12-21	5	-276/+1
\|\ \ \ \
\| * \| \| \|	remove deprecated set and original methods for table_name, primary_key, etc	Sergey Nartimov	2011-12-21	5	-276/+1
\|/ / / /
* \| \| \|	Merge pull request #4115 from Karunakar/action_pack	Aaron Patterson	2011-12-21	2	-2/+2
\|\ \ \ \
\| * \| \| \|	Action pack logger methodschanged to active supoort Logger methods	Karunakar (Ruby)	2011-12-22	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #4110 from lest/remove-deprecated-underscore-read	Jon Leighton	2011-12-21	3	-41/+0
\|\ \ \ \
\| * \| \| \|	remove deprecated underscore versions of attribute methods	Sergey Nartimov	2011-12-21	3	-41/+0
\|/ / / /
* \| \| \|	caches should not be global, so no need to clear in the teardown	Aaron Patterson	2011-12-21	1	-4/+0
* \| \| \|	removing deprecated methods	Aaron Patterson	2011-12-21	1	-28/+0
* \| \| \|	Merge pull request #4097 from guilleiguaran/safebuffer-html-escape	Aaron Patterson	2011-12-21	1	-27/+15
\|\ \ \ \
\| * \| \| \|	We don't need a special html_escape for 1.8 anymore	Guillermo Iguaran	2011-12-21	1	-27/+15
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Restore `rake TEST=test/unit/foo_test.rb` support.	Jeremy Kemper	2011-12-21	1	-1/+5
* \| \| \|	Rails::SubTestTask warns on test failure and moves on. Renamed from TestTaskW...	Jeremy Kemper	2011-12-21	1	-45/+38
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-21	2	-10/+10
\|\ \ \ \
\| * \| \| \|	Doc fixes on Rails::Generators::Base.hook_for.	Hendy Tanata	2011-12-21	1	-3/+3
\| * \| \| \|	[docs] Ruby upgrade	Arun Agrawal	2011-12-20	1	-1/+1
\| * \| \| \|	4.0.0.beta now :-)	Arun Agrawal	2011-12-20	1	-6/+6
* \| \| \| \|	Merge pull request #4102 from arunagw/warning_removed_actionpack	Vijay Dev	2011-12-21	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	removed warning "warning: ambiguous first argument; put parentheses or even s...	Arun Agrawal	2011-12-21	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	sync AS guide with the Ruby 1.9 related deletions in master	Vijay Dev	2011-12-21	1	-73/+0
* \| \| \| \|	Merge pull request #4105 from lest/bad-requires	Piotr Sarnacki	2011-12-21	2	-2/+0
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	remove requires of core_ext/array/random_access that no longer exists	lest	2011-12-21	2	-2/+0
\|/ / / /
* \| \| \|	Merge pull request #4103 from lest/remove-1-8-code	José Valim	2011-12-21	3	-26/+1
\|\ \ \ \
\| * \| \| \|	remove Kernel#singleton_class from core_ext as it is present in ruby 1.9	lest	2011-12-21	3	-26/+1
\|/ / / /
* \| \| \|	Merge pull request #4101 from nashby/ruby-18-cleaning	José Valim	2011-12-21	3	-59/+0
\|\ \ \ \
\| * \| \| \|	remove Array#sample from core_ext	Vasiliy Ermolovich	2011-12-21	3	-59/+0
\| \|/ / /
* \| \| \|	Merge pull request #4094 from lest/remove-1-8-code	José Valim	2011-12-21	1	-8/+1
\|\ \ \ \
\| * \| \| \|	remove check for string from request body setter	lest	2011-12-21	1	-8/+1
* \| \| \| \|	Merge pull request #4098 from Karunakar/active_model2	José Valim	2011-12-21	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Changed the require path for logger	Karunakar (Ruby)	2011-12-21	1	-1/+1
\| * \| \| \| \|	removed deprecated loggers	Karunakar (Ruby)	2011-12-21	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #4100 from simi/master	José Valim	2011-12-21	1	-13/+13
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	rails version order fixed and formatted in railties changelog	Josef Šimánek	2011-12-21	1	-13/+13
\|/ / / /
* \| \| \|	Merge pull request #4079 from drogus/http_digest_issue	José Valim	2011-12-21	7	-8/+137
\|\ \ \ \