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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge pull request #2444 from elight/master	Santiago Pastorino	2011-08-06	1	-5/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor refactor to delegate
\| * \| \| \| \| \| \| \|	Refactored to more closely resemble idiom applied for on_nil	Evan Light	2011-08-05	1	-5/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Use rake >= 0.9.3.beta.1 in Ruby 1.9.3	Santiago Pastorino	2011-08-06	1	-1/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Avoid generating app/views/layouts/application.html.erb on mountable ↵	Santiago Pastorino	2011-08-05	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	engines, just generate the namespaced one
* \| \| \| \| \| \| \|	Revert "Test against Rubinius"	Aaron Patterson	2011-08-05	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3cfbb3824436b2f8a37544b8ffe2f3a4605bc7c8.
* \| \| \| \| \| \| \|	Merge pull request #2442 from sferik/test_on_rubinius	Aaron Patterson	2011-08-05	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test against Rubinius
\| * \| \| \| \| \| \| \|	Test against Rubinius	Erik Michaels-Ober	2011-08-05	1	-1/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Happy Rubinius Day!
* \| \| \| \| \| \| \|	Revert "to_key on a destroyed model should return nil". Closes #2440	Santiago Pastorino	2011-08-05	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c5448721b5054b8a467958d60427fdee15eac604.
* \| \| \| \| \| \| \|	Fix test for Rubinius	Santiago Pastorino	2011-08-05	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #2439 from guilleiguaran/fix-error-on-ar-tests-rbxday	Aaron Patterson	2011-08-05	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix AR test suite error under Rubinius 2.0 #rbxday
\| * \| \| \| \| \| \|	Fix AR test suite error under Rubinius 2.0	Guillermo Iguaran	2011-08-05	1	-0/+1
\| \|/ / / / / /
* / / / / / /	pg does not allow aliases in the having clause, but functions are fine	Aaron Patterson	2011-08-05	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Xavier Noria	2011-08-04	1	-2/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	we should not ignore all gems in here	Aaron Patterson	2011-08-04	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Explicitly included hashes in sentence regarding SQL-injection-safe ↵	Xavier Noria	2011-08-04	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	forms" Reason: The hash form is secure, and preferred over the array form if possible. This reverts commit 6dc749596c328c44c80f898d5fa860fff6cab783.
* \| \| \| \| \| \|	Revert "grammatical changes"	Xavier Noria	2011-08-04	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason: As discussed in GitHub, it is debatable, and present tense is fine (and simple, and preferred). This reverts commit 54ccda9f0a5e4a5e72a4c159dc8787faaf65e8a2.
* \| \| \| \| \| \|	The trailing '/' isn't being picked up by Github anyway, and the link works ↵	Rashmi Yadav	2011-08-04	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as is.
* \| \| \| \| \| \|	The trailing '/' isn't being picked up by Github anyway, and the link works ↵	Waynn Lue	2011-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as is.
* \| \| \| \| \| \|	grammatical changes	JudeArasu	2011-08-04	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	typo fix	Vijay Dev	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	minor changes in migrations guide	Vijay Dev	2011-08-04	1	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fixed incorrect tags	Vijay Dev	2011-08-04	1	-16/+16
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix typo 'console' -> 'constant'	pbflinn	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Active Resource - guide for destroy	Vishnu Atrai	2011-08-04	1	-0/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Active Resource - guide for update/save	Vishnu Atrai	2011-08-04	1	-0/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Active Resource - guide for create	Vishnu Atrai	2011-08-04	1	-1/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Active Resource - guide for reading and writing data	Vishnu Atrai	2011-08-04	1	-0/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	typo in "wont"	Waynn Lue	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	3.1 release notes Active Record changes, Architectural changes and	Vijay Dev	2011-08-04	1	-24/+165
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	organizing sections.
* \| \| \| \| \| \|	Adding more info as rake about is fixed	Arun Agrawal	2011-08-04	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Rack::Sendfile is no more default middleware.	Arun Agrawal	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	"blog" is more common than "weblog" these days.	Waynn Lue	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	3.1 release notes - added AP and Railties sections	Vijay Dev	2011-08-04	1	-0/+142
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	3.1 release notes draft	Vijay Dev	2011-08-04	1	-0/+136
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	prefer to use if..end unless the condition is simple/compact	Vijay Dev	2011-08-04	1	-4/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	remove some parts of the section on shortcut helpers, document custom validators	Vijay Dev	2011-08-04	1	-59/+45
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	make the warning clear about the effect of using validates_associated on ↵	Vijay Dev	2011-08-04	1	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	both sides on an association.
* \| \| \| \| \| \|	usages of active resouce	Vishnu Atrai	2011-08-04	1	-0/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	configuration for active resource	Vishnu Atrai	2011-08-04	1	-0/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Introduction for active resource	Vishnu Atrai	2011-08-04	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Active Resouce guide initial load	Vishnu Atrai	2011-08-04	1	-0/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	'/' was outside of anchor tag.	Bratish Goswami	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Superfluous "the".	Waynn Lue	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	extra '/' removed from url, which was not linked	Bratish Goswami	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Extra "l" removed before h2.	Arun Agrawal	2011-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	document meta method	Vijay Dev	2011-08-04	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Removed trailing slash of 'Download and installation' Github URL as per ↵	ejy	2011-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	convention
* \| \| \| \| \| \|	Explicitly included hashes in sentence regarding SQL-injection-safe forms	Pete Campbell	2011-08-04	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Association and Callbacks guide: Added section on shortcut syntax 'validates'.	Alberto Perdomo	2011-08-04	1	-0/+55
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix two spaces between sententes on README.rdoc.	Hendy Tanata	2011-08-04	1	-3/+3
\| \| \| \| \| \| \|