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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merged pull request #307 from arunagw/master.	Aaron Patterson	2011-04-26	4	-3/+58
\|\
\| *	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
\|\ \
* \| \|	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_attributes	Josh Kalderimis	2011-04-26	2	-4/+49
* \| \|	Merged pull request #312 from joshk/bump_multi_json.	Joshua Peek	2011-04-26	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	bump multi_json dependency	Josh Kalderimis	2011-04-26	1	-1/+1
* \| \|	Merged pull request #310 from beanieboi/master.	Aaron Patterson	2011-04-26	4	-2/+51
\|\ \ \
\| * \| \|	Added tsvector Datatype Support	Benjamin Fritsch	2011-04-26	4	-2/+51
* \| \| \|	bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception handle...	Sven Fuchs	2011-04-26	3	-5/+5
* \| \| \|	Updating to use Mail v2.3.0	Mikel Lindsaar	2011-04-26	2	-6/+6
* \| \| \|	Merged pull request #308 from joshk/assign_attributes.	José Valim	2011-04-25	3	-11/+22
\|\ \ \ \
\| * \| \| \|	deprecated the use of the guard_protected_attributes argument with attributes...	Josh Kalderimis	2011-04-25	3	-11/+22
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merged pull request #277 from kuinak/master.	Aaron Patterson	2011-04-25	1	-1/+1
\|\ \ \ \
\| * \| \| \|	ruby 1.9.2 and other ruby implementations may not return the same hash value ...	Evan Petrie	2011-04-14	1	-1/+1
* \| \| \| \|	Merged pull request #306 from rsim/case_insensitive_uniqueness_validation_fix.	Aaron Patterson	2011-04-25	2	-2/+29
\|\ \ \ \ \
\| * \| \| \| \|	Do not use SQL LIKE operator for case insensitive uniqueness validation	Raimonds Simanovskis	2011-04-25	2	-2/+29
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merged pull request #309 from arunagw/sass_new.	Aaron Patterson	2011-04-25	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Using sass directly as new version is out.	Arun Agrawal	2011-04-26	1	-1/+1
\|/ / / /
* / / /	added test for number_to_phone with an empty string and area code true	Diego Carrion	2011-04-25	1	-0/+1
\|/ / /
* \| \|	Merged pull request #304 from arunagw/jdbcmysql_db_create.	Aaron Patterson	2011-04-25	2	-1/+23
\|\ \ \
\| * \| \|	Fixed error when running db:create with jdbcmysql	Rashmi Yadav	2011-04-25	2	-1/+23
* \| \| \|	Merged pull request #305 from joshk/bump_deprecation.	José Valim	2011-04-25	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	bump AS deprecation_horizon to 3.2	Josh Kalderimis	2011-04-25	1	-1/+1
* \| \| \|	Merged pull request #300 from arunagw/jdbc_test.	Aaron Patterson	2011-04-25	4	-1/+64
\|\ \ \ \
\| * \| \| \|	Adding jdbcsqlite3 name in comment.	Arun Agrawal	2011-04-24	1	-1/+1
\| * \| \| \|	Looks more friendly.	Arun Agrawal	2011-04-24	1	-1/+2
\| * \| \| \|	jdbcsqlite3 support added into template. #jruby	Arun Agrawal	2011-04-23	3	-1/+26
\| * \| \| \|	Start Adding jdbcmysql support to new rails template.	Arun Agrawal	2011-04-23	3	-2/+39
* \| \| \| \|	Merged pull request #302 from metaskills/empty_inserts.	Aaron Patterson	2011-04-25	3	-9/+1
\|\ \ \ \ \
\| * \| \| \| \|	Use existing #empty_insert_statement_value for an insert with no columns.	Ken Collins	2011-04-24	3	-9/+1
* \| \| \| \| \|	Fix tests, main_app mounted helper must be defined explicitly now.	Piotr Sarnacki	2011-04-25	1	-0/+1
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Make ActionController::Base.modules_for_helpers and ActionController::Base.al...	Piotr Sarnacki	2011-04-25	3	-39/+39
* \| \| \| \|	Explicitly define main_app proxy	Piotr Sarnacki	2011-04-25	2	-2/+5
* \| \| \| \|	Add Engine#helpers method which loads all the engine's helpers	Piotr Sarnacki	2011-04-25	2	-0/+84
* \| \| \| \|	Go with latest Sass directly	David Heinemeier Hansson	2011-04-25	1	-1/+1
* \| \| \| \|	Fix tests.	José Valim	2011-04-25	2	-7/+3
* \| \| \| \|	rename test case to better describe use case	David Chelimsky	2011-04-25	1	-6/+6
* \| \| \| \|	No need to check for both full and mountable.	Prem Sichanugrist	2011-04-25	1	-1/+1
* \| \| \| \|	Add `app/assets/images` directory to plugin new generator	Prem Sichanugrist	2011-04-25	2	-0/+14
* \| \| \| \|	Temporarily disable uglifier until a new version depending on execjs 0.2.0 ca...	David Heinemeier Hansson	2011-04-24	2	-2/+2
* \| \| \| \|	Merge branch 'master' of github.com:rails/rails	David Heinemeier Hansson	2011-04-24	14	-74/+311
\|\\| \| \| \|
\| * \| \| \|	minor correction to the AMo mass-assignment security docs	Josh Kalderimis	2011-04-24	1	-1/+1
\| * \| \| \|	added config.active_record.whitelist_attributes which creates an empty whitel...	Josh Kalderimis	2011-04-24	4	-3/+20
\| * \| \| \|	updated the security guide on the updated mass-assignment security scopes add...	Josh Kalderimis	2011-04-24	1	-1/+26
\| * \| \| \|	Added assign_attributes to Active Record which accepts a mass-assignment secu...	Josh Kalderimis	2011-04-24	6	-27/+132
\| * \| \| \|	AM mass assignment security attr_accessible and attr_protected now allow for ...	Josh Kalderimis	2011-04-24	4	-45/+135
* \| \| \| \|	Stop adding actual dummy tests (they clutter up the real ones in a new app), ...	David Heinemeier Hansson	2011-04-23	7	-28/+21
\|/ / / /
* \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-04-23	17	-67/+98
\|\ \ \ \