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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	added test for number_to_phone with an empty string and area code true	Diego Carrion	2011-04-25	1	-0/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \| \| \|	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
\| * \| \| \|	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
\| * \| \| \|	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
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Start Adding jdbcmysql support to new rails template.
\| * \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More will come for jruby app.
* \| \| \| \| \|	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.
\| * \| \| \| \| \|	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 ↵	Piotr Sarnacki	2011-04-25	3	-39/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionController::Base.all_helpers_from_path public methods
* \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: José Valim <jose.valim@gmail.com>
* \| \| \| \| \|	No need to check for both full and mountable.	Prem Sichanugrist	2011-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All mountable engine are considered `full?` already.
* \| \| \| \| \|	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 ↵	David Heinemeier Hansson	2011-04-24	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can be released (tomorrow?)
* \| \| \| \| \|	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 ↵	Josh Kalderimis	2011-04-24	4	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whitelist of attributes available for mass assignment for all models in your app
\| * \| \| \| \|	updated the security guide on the updated mass-assignment security scopes ↵	Josh Kalderimis	2011-04-24	1	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	addition, and assign_attributes in AR
\| * \| \| \| \|	Added assign_attributes to Active Record which accepts a mass-assignment ↵	Josh Kalderimis	2011-04-24	6	-27/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	security scope using the :as option, while also allowing mass-assignment security to be bypassed using :with_protected
\| * \| \| \| \|	AM mass assignment security attr_accessible and attr_protected now allow for ↵	Josh Kalderimis	2011-04-24	4	-45/+135
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scopes using :as => scope eg. attr_accessible :name attr_accessible :name, :admin, :as => :admin
* \| \| \| \| \|	Stop adding actual dummy tests (they clutter up the real ones in a new app), ↵	David Heinemeier Hansson	2011-04-23	7	-28/+21
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	just show how its done
* \| \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-04-23	17	-67/+98
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
\| * \| \| \| \|	copy-edits 0e2644c	Xavier Noria	2011-04-23	3	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	copy-edits e2656e0	Xavier Noria	2011-04-23	2	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	copy-edits 3d45964	Xavier Noria	2011-04-23	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	copy-edits 2f0dca5	Xavier Noria	2011-04-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Added docs for #drop_database on MySQL adapter	Sebastian Martinez	2011-04-22	2	-1/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Grammer fix on note about wildcard routes	Ronnie Miller	2011-04-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix block alignment	Vijay Dev	2011-04-23	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	fix indentation	Vijay Dev	2011-04-23	1	-13/+13
\| \| \| \| \| \|
\| * \| \| \| \|	add examples for array access methods	Vijay Dev	2011-04-23	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	updating to_xml example to new AR api	Vijay Dev	2011-04-23	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Added docs for #disconnect! on adapters	Sebastian Martinez	2011-04-22	3	-1/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Added missing docs for clear_cache! on adapters	Sebastian Martinez	2011-04-22	3	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Added missing docs for +supports_primary_key?+ on some adapters	Sebastian Martinez	2011-04-22	2	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Added missing docs for +support_migrations?+ on some adapters	Sebastian Martinez	2011-04-22	2	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Have a more connection specific rdoc for +supports_statement_cache?+	Sebastian Martinez	2011-04-22	3	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Removed ON() on distinct comment	Sebastian Martinez	2011-04-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove HTML escaping from Record Tag Helper docs.	Semyon Perepelitsa	2011-04-22	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	minor correction to the Active Model instantiate_observers doc	Josh Kalderimis	2011-04-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Grammar fixes for Object#in? documentation.	Cheah Chu Yeow	2011-04-22	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Replace example hostname with "example.com".	Joost Baaij	2011-04-21	5	-32/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The hostname used in these comments actually exists, which is undesirable. See also RFC 2606.