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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Moving add_column_options! up to SchemaCreation	jeran	2013-06-12	4	-38/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed two instances of add_column_options! from abstract_mysql_adapter reworked rename_column_sql to remove add_column_options from schema_statements changed to use new hash syntax.
* \| \| \| \| \| \| \| \|	Add missing nsec test for 17f5d8e	Andrew White	2013-06-13	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Keep sub-second resolution when wrapping a DateTime value	Andrew White	2013-06-13	5	-5/+32
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `DateTime#usec` and `DateTime#nsec` so that `ActiveSupport::TimeWithZone` keeps sub-second resolution when wrapping a `DateTime` value. Fixes #10855
* \| \| \| \| \| \| \|	sometimes singularize does not work, so we get a list of two strings. just ↵	Aaron Patterson	2013-06-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	uniq them
* \| \| \| \| \| \| \|	no need to cache hash lookups	Aaron Patterson	2013-06-12	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	split aggregates from association reflections to avoid is_a checks later	Aaron Patterson	2013-06-12	1	-5/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	remove unnecessary is_a check	Aaron Patterson	2013-06-12	1	-2/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	we should apply the default scope before querying	Aaron Patterson	2013-06-12	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #10915 from gsamokovarov/railties-autoloads	Guillermo Iguaran	2013-06-12	1	-12/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor of ::Rails module
\| * \| \| \| \| \| \| \|	Refactor of ::Rails module	Genadi Samokovarov	2013-06-12	1	-12/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Used ActiveSupport::Autoload to dry-up the autoload definitions. 2. Used ActiveSupport's delegate to dry up the application proxied attributes. 3. Did a little white space change on Rails.groups.
* \| \| \| \| \| \| \| \|	Merge pull request #10928 from jetthoughts/use_sprockets_rails_2_0_0	Guillermo Iguaran	2013-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use sprockets-rails 2.0.0
\| * \| \| \| \| \| \| \| \|	Use sprockets-rails 2.0.0	Paul Nikitochkin	2013-06-12	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #10919 from vipulnsward/cleanup_as_test	Carlos Antonio da Silva	2013-06-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop extra variable from test
\| * \| \| \| \| \| \| \| \|	Drop extra variable from test	Vipul A M	2013-06-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #10922 from prathamesh-sonpatki/typos	Carlos Antonio da Silva	2013-06-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in AR changelog [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Fix typos in AR changelog [ci skip]	Prathamesh Sonpatki	2013-06-12	1	-2/+2
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #10923 from arunagw/warning_removed_minitest	Carlos Antonio da Silva	2013-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Warning removed for Minitest
\| * \| \| \| \| \| \| \| \| \|	Warning removed for Minitest	Arun Agrawal	2013-06-12	1	-1/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #10924 from pjg/patch-1	Carlos Antonio da Silva	2013-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Grammar fix [ci skip]
\| * \| \| \| \| \| \| \| \|	Grammar nazi at work [ci skip]	Paweł Gościcki	2013-06-12	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	bind values should not be merged between scopes	Aaron Patterson	2013-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	stop adding a new method for touch callbacks	Aaron Patterson	2013-06-11	1	-29/+21
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	expose a few attribute changed methods	Aaron Patterson	2013-06-11	1	-10/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	push the touch method outside the eval	Aaron Patterson	2013-06-11	1	-13/+34
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove unused variable	Aaron Patterson	2013-06-11	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	check whether the association is constructible rather than checking constants	Aaron Patterson	2013-06-11	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	use attribute methods for finding key values rather than generating method names	Aaron Patterson	2013-06-11	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	push belongs_to counter cache method to a single method	Aaron Patterson	2013-06-11	1	-17/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	push before_destroy counter cache method to a single method	Aaron Patterson	2013-06-11	1	-12/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove evaled belongs_to counter cache method	Aaron Patterson	2013-06-11	1	-8/+22
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	adding callbacks should be private	Aaron Patterson	2013-06-11	1	-4/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	indentation	Aaron Patterson	2013-06-11	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	remove evals from the association	Aaron Patterson	2013-06-11	1	-8/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	reduce evals in depdendent associations	Aaron Patterson	2013-06-11	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	remove some evals from callback conditionals	Aaron Patterson	2013-06-11	3	-2/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #10897 from prathamesh-sonpatki/active-support-typos	Carlos Antonio da Silva	2013-06-10	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typos in activesupport [ci skip]
\| * \| \| \| \| \| \| \|	Fixed typos in activesupport [ci skip]	Prathamesh Sonpatki	2013-06-09	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- eval'ed to eval'd in accordance with https://github.com/rails/rails/pull/10889 - tried to improve statement about compiling Procs into methods using define_method
* \| \| \| \| \| \| \| \|	Merge pull request #10906 from darai2k/fix-activemodel-validations-doc	Carlos Antonio da Silva	2013-06-10	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix ActiveModel::Validations.validators_on doc
\| * \| \| \| \| \| \| \| \|	fix ActiveModel::Validations.validators_on doc	Daichi Arai	2013-06-10	1	-1/+0
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #10795 from atambo/master	Steve Klabnik	2013-06-09	4	-1/+19
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't blindly call blame_file! on exceptions in ActiveSupport::Dependes::Loadable
\| * \| \| \| \| \| \| \| \|	Don't blindly call blame_file! on exceptions in ↵	Andrew Kreiling	2013-06-09	4	-1/+19
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveSupport::Dependencies::Loadable It is possible under some environments to receive an Exception that is not extended with Blamable (e.g. JRuby). ActiveSupport::Dependencies::Loadable#load_dependency blindly call blame_file! on the exception which throws it's own NoMethodError exception and hides the original Exception. This commit fixes #9521
* \| \| \| \| \| \| \| \|	Merge pull request #10710 from senny/5554_let_the_database_raise_on_counts	Jon Leighton	2013-06-09	4	-11/+32
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove column restrictions for `#count`, let the database raise if the SQL is invalid.
\| * \| \| \| \| \| \| \| \|	Remove fall back and column restrictions for `count`.	Yves Senn	2013-06-09	3	-10/+31
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	cleanup whitespace in relation.rb	Yves Senn	2013-06-09	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #10886 from ↵	Jon Leighton	2013-06-09	11	-19/+45
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wangjohn/chnges_for_automatic_inverse_associations Documentation and cleanup of automatic discovery of inverse associations
\| * \| \| \| \| \| \| \|	Getting rid of the +automatic_inverse_of: false+ option in associations in favor	wangjohn	2013-06-08	11	-19/+45
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of using +inverse_of: false+ option. Changing the documentation and adding a CHANGELOG entry for the automatic inverse detection feature.
* \| \| \| \| \| \| \|	Merge pull request #10889 from diatmpravin/fix-typo-in-action-view	Xavier Noria	2013-06-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed typo in action_view template
\| * \| \| \| \| \| \| \|	fixed typo in action_view template	diatmpravin	2013-06-08	1	-1/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #10893 from arunagw/test_for_checkpending_middleware	Guillermo Iguaran	2013-06-08	1	-0/+8
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Testing CheckPending middleware
\| * \| \| \| \| \| \|	Testing CheckPending middleware	Arun Agrawal	2013-06-08	1	-0/+8
\| \| \| \| \| \| \| \|