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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #6360 from bcardarella/logger_debug_fix	Aaron Patterson	2012-05-16	1	-0/+3
\|\ \| \| \| \|	Fixed logger bug introduced by #2237
\| *	Fixed logger bug introduced by #2237	Brian Cardarella	2012-05-17	1	-0/+3
\|/
*	Don't need to force size to nil	Rafael Mendonça França	2012-05-16	4	-10/+0
\|
*	Merge pull request #5453 from ↵	Aaron Patterson	2012-05-16	2	-2/+12
\|\ \| \| \| \| \| \| \| \|	JonRowe/patch_uniq_has_and_belongs_to_many_when_already_loaded When Active Record has already loaded a unique association `.size` returns the wrong number.
\| *	when using a preloaded array and the uniq flag is set then return the size ↵	Jon Rowe	2012-03-15	2	-2/+12
\| \| \| \| \| \| \| \|	of the uniq array
* \|	Merge pull request #6357 from takai/improve_logging_of_mass_assignment_sanitizer	Aaron Patterson	2012-05-16	4	-15/+28
\|\ \ \| \| \| \| \| \|	Improve logging of ActiveModel::MassAssignmentSecurity::Sanitizer
\| * \|	Improve logging of ActiveModel::MassAssignmentSecurity::Sanitizer	Naoto Takai	2012-05-17	4	-15/+28
\| \| \|
* \| \|	Merge pull request #6358 from jfirebaugh/schema_define	Aaron Patterson	2012-05-16	2	-7/+17
\|\ \ \ \| \| \| \| \| \| \| \|	Call methods on the correct instance in AR::Schema.define
\| * \| \|	Call methods on the correct instance in AR::Schema.define	John Firebaugh	2012-05-16	2	-7/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that migrations support instance methods, we should use the same instance rather than relying on delegation to a global instance. This allows subclassing AR::Schema.
* \| \| \|	Fix CollectionAssociation#replace to return new target (closes #6231)	Piotr Sarnacki	2012-05-16	2	-0/+14
\| \| \| \|
* \| \| \|	Document the usage of grouped_options_for_select with divider option	Rafael Mendonça França	2012-05-16	1	-1/+19
\| \| \| \|
* \| \| \|	Make :prompt work as documented	Rafael Mendonça França	2012-05-16	3	-3/+16
\| \| \| \|
* \| \| \|	Test deprecation and fix the documentation of grouped_options_for_select	Rafael Mendonça França	2012-05-16	2	-3/+6
\| \| \| \|
* \| \| \|	Merge pull request #2237 from jackdempsey/log_redirect_to	Aaron Patterson	2012-05-16	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	log at debug level what line caused the redirect_to
\| * \| \| \|	log at debug level what line caused the redirect_to	Jack Dempsey	2012-05-16	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #6192 from ↵	Aaron Patterson	2012-05-16	5	-15/+97
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	danmcclain/add_inet_and_cidr_types_to_postgresql_adapter Add support for macaddr, inet, and cidr types to PostgreSQL adapter
\| * \| \| \| \|	Removes NetAddr dependency	Dan McClain	2012-05-08	3	-10/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Converts inet and cidr columns to NetAddr::CIDR	Dan Seaver	2012-05-07	5	-7/+48
\| \| \| \| \| \|
\| * \| \| \| \|	Adds migration and schema dump support for INET, CIDR, and MACADDR	Dan Seaver	2012-05-05	3	-7/+47
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5369 from ↵	Aaron Patterson	2012-05-16	2	-4/+44
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Greenie0506/add_separator_to_grouped_options_for_select Add separator option to grouped_options_for_select
\| * \| \| \| \| \|	Add separator argument to grouped_options_for_select	Greenie0506	2012-05-15	2	-4/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change prompt to options hash in grouped_options_for_select
* \| \| \| \| \| \|	Merge pull request #5535 from markmcspadden/issue_5527_rollbacks	Aaron Patterson	2012-05-16	2	-1/+46
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow manual rollbacks in after_save to reset object correctly
\| * \| \| \| \| \| \|	Allow manual rollbacks in after_save to reset object correctly	Mark McSpadden	2012-03-21	2	-1/+46
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Load all the env files available in config.paths (closes #6335)	Piotr Sarnacki	2012-05-16	3	-3/+14
\| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6337 from bcardarella/patch-1	Aaron Patterson	2012-05-16	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	Changing the indentation level of the block comment close for Sass
\| * \| \| \| \| \|	Changing the indentation level of the block comment close for SASS	Brian Cardarella	2012-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* \| \| \| \| \| \|	assuming there is only one column, we can simplify the type cast loop	Aaron Patterson	2012-05-16	1	-7/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless	Aaron Patterson	2012-05-16	2	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	an alias is provided. Without the alias, the column cannot be found and properly typecast.
* \| \| \| \| \| \|	remove stray text in getting started guide [ci skip]	Vijay Dev	2012-05-17	1	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Merge pull request #6354 from lest/patch-1"	Carlos Galdino + Rafael Mendonça França	2012-05-16	3	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing changes made to 9adf28c026070afb78b80027521a4ddddd68d697. Reason: This broke the actionmailer tests
* \| \| \| \| \| \|	document the AR::Base#ids method introduced in 9307616 [ci skip]	Vijay Dev	2012-05-17	1	-0/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6354 from lest/patch-1	Rafael Mendonça França	2012-05-16	3	-5/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove unnecessary require
\| * \| \| \| \| \| \|	remove unnecessary require	Sergey Nartimov	2012-05-16	3	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- access & filters don't use multibyte ext - transliterate requires only AS::Multibyte but not multibyte ext
* \| \| \| \| \| \| \|	fix bad formatting [ci skip]	Vijay Dev	2012-05-17	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6136 from mhfs/sqlbypass_fixes	Aaron Patterson	2012-05-16	2	-5/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring SqlByPassTest to light and fix broken tests
\| * \| \| \| \| \| \|	Rename test file so that the test suite matches it, implement `persisted?` ↵	Marcelo Silveira	2012-05-16	2	-5/+15
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error).
* \| \| \| \| \| \|	Merge pull request #6349 from erichmenge/patch-raise-type-errors	Aaron Patterson	2012-05-16	4	-7/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integer limit out of range should be allowed to raise. Closes #6272
\| * \| \| \| \| \| \|	Integer limit out of range should be allowed to raise. Closes #6272	Erich Menge	2012-05-16	4	-7/+34
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #6353 from nashby/safe-interpolation	Aaron Patterson	2012-05-16	2	-0/+38
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix safe string interpolation with SafeBuffer#%
\| * \| \| \| \| \| \|	fix safe string interpolation with SafeBuffer#%, closes #6352	Vasiliy Ermolovich	2012-05-16	2	-0/+38
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6336 from erichmenge/patch-pluck-fragment	Carlos Antonio da Silva	2012-05-16	2	-8/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Fixes issue where SQL fragments prevented type casting based on column
\| * \| \| \| \| \| \|	Fixes issue where SQL fragments prevented type casting based on column type.	Erich Menge	2012-05-16	2	-8/+6
\| \|/ / / / / /
* \| \| \| \| \| \|	remove image_tag onmouseover option docs [ci skip]	Vijay Dev	2012-05-16	1	-6/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove unneeded tests	Piotr Sarnacki	2012-05-16	1	-12/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6347 from avakhov/ar-changelog-misprint	Vijay Dev	2012-05-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix misprint in AR changelog
\| * \| \| \| \| \| \|	Fix misprint in AR changelog	Alexey Vakhov	2012-05-16	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix tests in railties	Piotr Sarnacki	2012-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since `bundle install` was fixed in `rails plugin new`, it now requires `rails 4.0.0.beta` version in filesystem when running tests. Instead of providing it, we can run tested command with `--dev` option, to use rails from the local directory.
* \| \| \| \| \| \| \|	improve #6318	Michal Papis	2012-05-15	2	-5/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6344 from erichmenge/patch_sqlite_time_type	Piotr Sarnacki	2012-05-15	4	-4/+16
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	SQLite3 doesn't actually support the 'time' type.
\| * \| \| \| \| \| \|	SQLite3 doesn't actually support the 'time' type.	Erich Menge	2012-05-15	4	-4/+16
\| \|/ / / / / /