aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ambiguous reflections are on :through relationships are no longer supported.Aaron Patterson2013-06-134-3/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, you need to change this: class Author < ActiveRecord::Base has_many :posts has_many :taggings, :through => :posts end class Post < ActiveRecord::Base has_one :tagging has_many :taggings end class Tagging < ActiveRecord::Base end To this: class Author < ActiveRecord::Base has_many :posts has_many :taggings, :through => :posts, :source => :tagging end class Post < ActiveRecord::Base has_one :tagging has_many :taggings end class Tagging < ActiveRecord::Base end
* Merge pull request #10425 from ↵Rafael Mendonça França2013-06-134-38/+47
|\ | | | | | | | | ranjaykrishna/push_add_column_options_to_schema_creation Push add column options to schema creation
| * Moving add_column_options! up to SchemaCreationjeran2013-06-124-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 17f5d8eAndrew White2013-06-131-0/+5
| |
* | Keep sub-second resolution when wrapping a DateTime valueAndrew White2013-06-135-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 Patterson2013-06-121-1/+1
| | | | | | | | uniq them
* | no need to cache hash lookupsAaron Patterson2013-06-121-1/+1
| |
* | split aggregates from association reflections to avoid is_a checks laterAaron Patterson2013-06-121-5/+11
| |
* | remove unnecessary is_a checkAaron Patterson2013-06-121-2/+1
| |
* | we should apply the default scope before queryingAaron Patterson2013-06-121-1/+2
| |
* | Merge pull request #10915 from gsamokovarov/railties-autoloadsGuillermo Iguaran2013-06-121-12/+10
|\ \ | | | | | | Refactor of ::Rails module
| * | Refactor of ::Rails moduleGenadi Samokovarov2013-06-121-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_0Guillermo Iguaran2013-06-121-1/+1
|\ \ \ | | | | | | | | Use sprockets-rails 2.0.0
| * | | Use sprockets-rails 2.0.0Paul Nikitochkin2013-06-121-1/+1
|/ / /
* | | Merge pull request #10919 from vipulnsward/cleanup_as_testCarlos Antonio da Silva2013-06-121-2/+2
|\ \ \ | | | | | | | | Drop extra variable from test
| * | | Drop extra variable from testVipul A M2013-06-121-2/+2
| | | |
* | | | Merge pull request #10922 from prathamesh-sonpatki/typosCarlos Antonio da Silva2013-06-121-2/+2
|\ \ \ \ | | | | | | | | | | Fix typos in AR changelog [ci skip]
| * | | | Fix typos in AR changelog [ci skip]Prathamesh Sonpatki2013-06-121-2/+2
| |/ / /
* | | | Merge pull request #10923 from arunagw/warning_removed_minitestCarlos Antonio da Silva2013-06-121-1/+1
|\ \ \ \ | | | | | | | | | | Warning removed for Minitest
| * | | | Warning removed for MinitestArun Agrawal2013-06-121-1/+1
| |/ / /
* | | | Merge pull request #10924 from pjg/patch-1Carlos Antonio da Silva2013-06-121-1/+1
|\ \ \ \ | |/ / / |/| | | Grammar fix [ci skip]
| * | | Grammar nazi at work [ci skip]Paweł Gościcki2013-06-121-1/+1
|/ / /
* | | bind values should not be merged between scopesAaron Patterson2013-06-111-1/+1
| | |
* | | stop adding a new method for touch callbacksAaron Patterson2013-06-111-29/+21
| | |
* | | expose a few attribute changed methodsAaron Patterson2013-06-111-10/+10
| | |
* | | push the touch method outside the evalAaron Patterson2013-06-111-13/+34
| | |
* | | remove unused variableAaron Patterson2013-06-111-1/+0
| | |
* | | check whether the association is constructible rather than checking constantsAaron Patterson2013-06-111-3/+3
| | |
* | | use attribute methods for finding key values rather than generating method namesAaron Patterson2013-06-111-3/+3
| | |
* | | push belongs_to counter cache method to a single methodAaron Patterson2013-06-111-17/+18
| | |
* | | push before_destroy counter cache method to a single methodAaron Patterson2013-06-111-12/+17
| | |
* | | remove evaled belongs_to counter cache methodAaron Patterson2013-06-111-8/+22
| | |
* | | adding callbacks should be privateAaron Patterson2013-06-111-4/+6
| | |
* | | indentationAaron Patterson2013-06-111-1/+1
|/ /
* | remove evals from the associationAaron Patterson2013-06-111-8/+2
| |
* | reduce evals in depdendent associationsAaron Patterson2013-06-111-1/+2
| |
* | remove some evals from callback conditionalsAaron Patterson2013-06-113-2/+17
| |
* | Merge pull request #10897 from prathamesh-sonpatki/active-support-typosCarlos Antonio da Silva2013-06-101-3/+3
|\ \ | | | | | | Fixed typos in activesupport [ci skip]
| * | Fixed typos in activesupport [ci skip]Prathamesh Sonpatki2013-06-091-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-docCarlos Antonio da Silva2013-06-101-1/+0
|\ \ \ | | | | | | | | fix ActiveModel::Validations.validators_on doc
| * | | fix ActiveModel::Validations.validators_on docDaichi Arai2013-06-101-1/+0
|/ / /
* | | Merge pull request #10795 from atambo/masterSteve Klabnik2013-06-094-1/+19
|\ \ \ | | | | | | | | Don't blindly call blame_file! on exceptions in ActiveSupport::Dependes::Loadable
| * | | Don't blindly call blame_file! on exceptions in ↵Andrew Kreiling2013-06-094-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_countsJon Leighton2013-06-094-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 Senn2013-06-093-10/+31
| | | |
| * | | cleanup whitespace in relation.rbYves Senn2013-06-091-1/+1
|/ / /
* | | Merge pull request #10886 from ↵Jon Leighton2013-06-0911-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 favorwangjohn2013-06-0811-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-viewXavier Noria2013-06-081-1/+1
|\ \ \ | | | | | | | | fixed typo in action_view template
| * | | fixed typo in action_view templatediatmpravin2013-06-081-1/+1
| |/ /