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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	bump AS deprecation_horizon to 4.1	Francesco Rodríguez	2012-06-17	1	-2/+2
\|/ / /
* \| \|	Merge pull request #6760 from kennyj/bump_20120617	Santiago Pastorino	2012-06-17	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Bump tzinfo gem.
\| * \| \|	Bump tzinfo gem.	kennyj	2012-06-17	2	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #6759 from dylanahsmith/only-catch-standard-error	Santiago Pastorino	2012-06-17	5	-8/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Avoid unnecessary catching of Exception instead of StandardError.
\| * \| \| \|	Avoid unnecessary catching of Exception instead of StandardError.	Dylan Smith	2012-06-17	5	-8/+8
\| \| \| \| \|
* \| \| \| \|	Merge pull request #6758 from caironoleto/master	José Valim	2012-06-17	1	-14/+14
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /	Fixing load config in some tasks
\| * / /	Adding `load_config` task as dependency.	Cairo Noleto	2012-06-16	1	-14/+14
\|/ / / \| \| \| \| \| \| \| \| \|	Without this, some tasks won't load configurations like custom engines.
* \| \|	Merge pull request #6755 from kennyj/remove_csv_support	Rafael Mendonça França	2012-06-16	2	-1/+13
\|\ \ \ \| \| \| \| \| \| \| \|	Don't read csv file during executing db:fixtures:load.
\| * \| \|	Don't read csv file during executing db:fixtures:load.	kennyj	2012-06-17	2	-1/+13
\|/ / /
* \| \|	Merge pull request #6752 from steveklabnik/fix_5680	Rafael Mendonça França	2012-06-16	3	-4/+21
\|\ \ \ \| \| \| \| \| \| \| \|	Respect absolute paths in compute_source_path.
\| * \| \|	Respect absolute paths in compute_source_path.	Steve Klabnik	2012-06-16	3	-4/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using compute_source_path to determine the full path of an asset, if our source begins with '/', we don't want to include the directory. Examples are illustrative: > compute_source_path("foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/stylesheets/foo.css" > compute_source_path("/foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/foo.css" Before this patch, the second example would return the same as the first. Fixes #5680.
* \| \| \|	Merge pull request #6753 from schnittchen/patch-1	José Valim	2012-06-16	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Documentation: "asynchronously" is misleading here
\| * \| \| \|	Documentation: make it clearer that subscribers are not notified ↵	Schnittchen	2012-06-16	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	asynchronously, but saved for later use.
* \| \| \|	Merge pull request #6748 from marcandre/dasherize_doc	Rafael Mendonça França	2012-06-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix doc example for dasherize
\| * \| \| \|	Fix doc example for dasherize	Marc-Andre Lafortune	2012-06-15	1	-1/+1
\|/ / / /
* \| \| \|	TestCase does not need to be loaded when loading the framework	Aaron Patterson	2012-06-15	2	-2/+13
\| \| \| \|
* \| \| \|	no need to define methods in included hook	Jon Leighton	2012-06-15	1	-13/+13
\| \| \| \|
* \| \| \|	Fix deprecation warnings when using ↵	Jon Leighton	2012-06-15	2	-3/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config.active_record.mass_assignment_sanitizer=
* \| \| \|	Fix observers with AR::Model	Jon Leighton	2012-06-15	4	-3/+27
\| \| \| \|
* \| \| \|	Fix config.active_record.whitelist_attributes with AR::Model	Jon Leighton	2012-06-15	4	-6/+44
\| \| \| \|
* \| \| \|	Simplify AR configuration code.	Jon Leighton	2012-06-15	31	-567/+356
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get rid of ActiveModel::Configuration, make better use of ActiveSupport::Concern + class_attribute, etc.
* \| \| \|	refactor	Jon Leighton	2012-06-15	1	-11/+5
\| \| \| \|
* \| \| \|	Merge pull request #6646 from kennyj/fix_3470	Carlos Antonio da Silva	2012-06-15	7	-3/+35
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Support unicode character route directly in config/routes.rb. Fix #3470.
\| * \| \|	Support unicode character route in config/routes.rb.	kennyj	2012-06-16	7	-3/+35
\|/ / /
* \| \|	Use status, content_type, body method signature for render too	Santiago Pastorino	2012-06-14	1	-4/+3
\| \| \|
* \| \|	Refactor public exceptions to reuse render format method	Carlos Antonio da Silva	2012-06-14	1	-9/+6
\| \|/ \|/\|
* \|	Remove unneded tests.	Rafael Mendonça França	2012-06-14	1	-11/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before 7f4b0a1231bf3c65db2ad4066da78c3da5ffb01, this test are asserting that update_attribute does the dirty tracking. Since we remove this method and update_column write in the database directly this tests will always fail>
* \|	Add CHANGELOG entry to the uuid datatype support to PostgreSQL adpter	Rafael Mendonça França	2012-06-14	1	-0/+2
\| \|
* \|	Merge pull request #6713 from etehtsea/activerecord-uuid	Rafael Mendonça França	2012-06-14	6	-10/+39
\|\ \ \| \| \| \| \| \| \| \| \|	Add uuid datatype support to PostgreSQL adapter
\| * \|	Add uuid type support to PostgreSQL adapter	Konstantin Shabanov	2012-06-14	6	-10/+39
\| \| \|
* \| \|	registers the removal of update_attribute in the CHANGELOG	Xavier Noria	2012-06-14	1	-0/+6
\| \| \|
* \| \|	Merge pull request #6738 from steveklabnik/master	Xavier Noria	2012-06-14	7	-87/+11
\|\ \ \ \| \| \| \| \| \| \| \|	Remove update_attribute.
\| * \| \|	Remove update_attribute.	Steve Klabnik	2012-06-14	7	-87/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Historically, update_attribute and update_attributes are similar, but with one big difference: update_attribute does not run validations. These two methods are really easy to confuse given their similar names. Therefore, update_attribute is being removed in favor of update_column. See the thread on rails-core here: https://groups.google.com/forum/?fromgroups#!topic/rubyonrails-core/BWPUTK7WvYA
* \| \| \|	adding a test for #6459	Aaron Patterson	2012-06-14	1	-0/+10
\| \| \| \|
* \| \| \|	fix some formatting [ci skip]	Vijay Dev	2012-06-14	1	-28/+38
\| \| \| \|
* \| \| \|	Revert "AV::TestCase does not need to be loaded when eagerly loading the"	Aaron Patterson	2012-06-14	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f5e7cb84cd377feb1b60c5356ce02123e9c94380.
* \| \| \|	modify middleware docs [ci skip]	Vijay Dev	2012-06-14	1	-2/+2
\| \| \| \|
* \| \| \|	we raise a subclass of LoadError, so rescue that	Aaron Patterson	2012-06-14	1	-1/+6
\| \| \| \|
* \| \| \|	Add docs about how to remove some middleware	Santiago Pastorino	2012-06-14	1	-0/+17
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-06-14	16	-766/+297
\|\ \ \ \
\| * \| \| \|	move the info about cosmetic changes to a diff location [ci skip]	Vijay Dev	2012-06-14	1	-4/+2
\| \| \| \| \|
\| * \| \| \|	moar copy edits [ci skip]	Vijay Dev	2012-06-14	1	-2/+1
\| \| \| \| \|
\| * \| \| \|	copy editing [ci skip]	Vijay Dev	2012-06-14	1	-4/+7
\| \| \| \| \|
\| * \| \| \|	Revert "Add a note about JavaScript runtime"	Vijay Dev	2012-06-14	1	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit d63b69ba7f2b9111aeb04b50884949c2a4b6e584.
\| * \| \| \|	Add server.run example	Oscar Del Ben	2012-06-14	1	-0/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the last chapter before I go back and make sure the guide is complete/review
\| * \| \| \|	Show how to add attributes to options	Nathan Long	2012-06-13	1	-0/+12
\| \| \| \| \|
\| * \| \| \|	Show when Rack middlewares are executed	Oscar Del Ben	2012-06-13	1	-0/+40
\| \| \| \| \|
\| * \| \| \|	Add initialize! explanation	Oscar Del Ben	2012-06-13	1	-0/+25
\| \| \| \| \|
\| * \| \| \|	Close explanation of config/environment	Oscar Del Ben	2012-06-13	1	-0/+8
\| \| \| \| \|
\| * \| \| \|	Adding note about cosmetic changes not being accepted	Andrew Hooker	2012-06-12	1	-0/+4
\| \| \| \| \|