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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merged pull request #327 from dcrec1/master.	José Valim	2011-04-28	2	-3/+17
\|\ \| \| \| \|	Prefix option for number_to_human_size
\| *	added a :prefix option to number_to_human_size	Diego Carrion	2011-04-27	2	-3/+17
\| \|
* \|	Merged pull request #336 from neerajdotname/upgrade_rack_mount.	José Valim	2011-04-28	1	-1/+1
\|\ \ \| \| \| \| \| \|	upgrade rack-mount to 0.7.2
\| * \|	upgrade rack-mount	Neeraj Singh	2011-04-28	1	-1/+1
\|/ / \| \| \| \| \| \|	Newer version is a few minor performance fixes
* \|	Tidy up previous commit.	José Valim	2011-04-28	1	-3/+8
\| \|
* \|	Merged pull request #219 from panthomakos/memcache.	José Valim	2011-04-28	2	-1/+42
\|\ \ \| \| \| \| \| \|	Character encoding issues with MemCacheStore in 1.9.2
\| * \|	Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2.	Pan Thomakos	2011-03-11	2	-1/+42
\| \| \|
* \| \|	Merged pull request #333 from jgarber/master.	José Valim	2011-04-28	2	-2/+13
\|\ \ \ \| \| \| \| \| \| \| \|	Specific translations for labels with values
\| * \| \|	Allow a label with the value option to have value-specific translations.	Jason Garber	2011-04-27	2	-2/+13
\| \| \| \|
* \| \| \|	Revert "Handle enabling/disabling observers at different levels of the class ↵	José Valim	2011-04-28	3	-75/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hierarchy." This reverts commit ad62f1928768bd2676958a4a08512bad342fe469 because the current subclasses implementation leaks memory in development. Instead of keeping an array of subclasses, the better solution is to ask the parent if an observer is being disabled or not.
* \| \| \|	Merged pull request #328 from MSNexploder/fix_clear_inflector.	José Valim	2011-04-28	2	-13/+31
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	proper reset all inflector scopes
\| * \| \| \|	proper reset all inflector scopes	Stefan Huber	2011-04-25	2	-13/+31
\| \| \| \| \|
* \| \| \| \|	Handle enabling/disabling observers at different levels of the class hierarchy.	Myron Marston	2011-04-28	3	-3/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Last call wins.
* \| \| \| \|	Allow observers to be enabled and disabled.	Myron Marston	2011-04-28	5	-3/+276
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is useful in situations like model unit tests and the occasional rake task to backfill old data.
* \| \| \| \|	Wrap line that is over 200 characters long. Now it's much easier to read.	Myron Marston	2011-04-28	1	-1/+5
\| \|/ / / \|/\| \| \|
* \| \| \|	requiring a newer version of the mysql2 gem	Aaron Patterson	2011-04-27	2	-1/+2
\| \|_\|/ \|/\| \|
* \| \|	Merged pull request #325 from joshk/mass_assignment_tests_fixed.	Aaron Patterson	2011-04-27	1	-7/+7
\|\ \ \ \| \| \| \| \| \| \| \|	final corrections to the mass-assignment security tests
\| * \| \|	some test renaming to avoid collisions, and some annoying issues between dbs	Josh Kalderimis	2011-04-27	1	-7/+7
\|/ / /
* \| \|	prevent errors when passing a frozen string as a param to ↵	misfo	2011-04-28	2	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionController::TestCase#process since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process. This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed thanks and high fives to kinsteronline
* \| \|	Merged pull request #325 from joshk/mass_assignment_tests_fixed.	Aaron Patterson	2011-04-27	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \|	final corrections to the mass-assignment security tests
\| * \| \|	final corrections to the mass-assignment security tests	Josh Kalderimis	2011-04-27	1	-4/+4
\|/ / /
* \| \|	Merged pull request #324 from joshk/fix_array_from.	Joshua Peek	2011-04-27	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	fixed a small bug with Array#from core_ext
\| * \| \|	fixed a small bug with Array#from core_ext	Josh Kalderimis	2011-04-27	1	-1/+1
\|/ / /
* \| \|	Relevant options closer together	David Heinemeier Hansson	2011-04-27	1	-4/+4
\| \| \|
* \| \|	minor git sources formatting change in railties app_base.rb	Josh Kalderimis	2011-04-27	1	-3/+3
\| \| \|
* \| \|	using @tenderlove's suggested implementation to speed things up	Jared McFarland	2011-04-27	1	-1/+1
\| \| \|
* \| \|	enable uglifier gem as new version of execjs is relased	Ganesh Kumar	2011-04-27	2	-2/+2
\| \| \|
* \| \|	Merged pull request #319 from nusco/master.	Piotr Sarnacki	2011-04-26	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Fixed minor typo in comment
\| * \| \|	Fixed minor typo in comment	Paolo "Nusco" Perrotta	2011-04-26	1	-1/+1
\|/ / /
* \| \|	Merged pull request #318 from joshk/fix_tests.	Aaron Patterson	2011-04-26	2	-15/+15
\|\ \ \ \| \| \| \| \| \| \| \|	fix mass-assignment security tests
\| * \| \|	fix mass-assignment security tests, this was due to a string column limit ↵	Josh Kalderimis	2011-04-27	2	-15/+15
\|/ / / \| \| \| \| \| \| \| \| \|	which doesn't cause issues on sqlite
* \| \|	Merged pull request #317 from jaredonline/master.	David Heinemeier Hansson	2011-04-26	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Change Array#from to return consistent results
\| * \| \|	fixing Array#from to return consistent results	Jared McFarland	2011-04-26	2	-3/+3
\|/ / /
* \| \|	Merged pull request #313 from chadk/master.	David Heinemeier Hansson	2011-04-26	2	-2/+17
\|\ \ \ \| \| \| \| \| \| \| \|	[patch] Asset helpers should understand scheme-relative URLs
\| * \| \|	moving check fo scheme-relative URI into is_uri?	Chad Krsek	2011-04-26	1	-9/+2
\| \| \| \|
\| * \| \|	asset helpers should understand scheme-relative URLs	Chad Krsek	2011-04-26	2	-2/+24
\| \| \| \|
\| * \| \|	Revert "asset helpers should understand scheme-relative URLs"	Chad Krsek	2011-04-25	2	-24/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 057412ce38ead06307a887dca333837a99f84f22.
\| * \| \|	asset helpers should understand scheme-relative URLs	Chad Krsek	2011-04-25	2	-2/+24
\| \| \| \|
* \| \| \|	Prem fixes 1.9 engine test issue	David Heinemeier Hansson	2011-04-26	1	-1/+1
\| \| \| \|
* \| \| \|	Merged pull request #279 from miloops/434d757.	José Valim	2011-04-26	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix console to accept [environment] [options] as specified in docs.
\| * \| \| \|	Fix console to accept [environment] [options] as specified in docs.	Emilio Tagua	2011-04-14	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merged pull request #314 from smartinez87/master.	Aaron Patterson	2011-04-26	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix #update_attributes api format error
\| * \| \| \| \|	Fix #update_attributes api format error	Sebastian Martinez	2011-04-26	1	-1/+1
\|/ / / / /
* \| \| \| \|	simplifying buffered logger for easier and slightly more performant codes. ↵	Aaron Patterson	2011-04-26	2	-10/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pumpkin
* \| \| \| \|	Merged pull request #307 from arunagw/master.	Aaron Patterson	2011-04-26	4	-3/+58
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	jdbcpostgresql support added into template.
\| * \| \| \| \|	Database creation for jdbcpostgresql #jruby	Arun Agrawal	2011-04-26	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	jdbcpostgresql support added into template.	Vishnu Atrai	2011-04-26	3	-2/+57
\| \| \| \| \| \|
* \| \| \| \| \|	Merged pull request #311 from joshk/assign_attributes.	David Heinemeier Hansson	2011-04-26	0	-0/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AR update_attributes api is updated to reflect the addition of assign_att
* \| \| \| \| \| \|	Merged pull request #311 from joshk/assign_attributes.	Aaron Patterson	2011-04-26	2	-4/+49
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AR update_attributes api is updated to reflect the addition of assign_att
\| * \| \| \| \| \|	AR update_attributes api is updated to reflect the addition of assign_attributes	Josh Kalderimis	2011-04-26	2	-4/+49
\| \| \| \| \| \| \|