aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/
* | Merge pull request #10893 from arunagw/test_for_checkpending_middlewareGuillermo Iguaran2013-06-081-0/+8
|\ \ | |/ |/| Testing CheckPending middleware
| * Testing CheckPending middlewareArun Agrawal2013-06-081-0/+8
| |
* | Override Time.at to work with Time-like valuesAndrew White2013-06-083-0/+38
| | | | | | | | | | | | | | Time.at allows passing a single Time argument which is then converted to an integer. The conversion code since 1.9.3r429 explicitly checks for an instance of Time so we need to override it to allow DateTime and ActiveSupport::TimeWithZone values.
* | ’ -> ' [ci skip]Steve Klabnik2013-06-081-1/+1
|/
* Merge pull request #10872 from AJAlabs/masterSteve Klabnik2013-06-071-4/+11
|\ | | | | Update Getting Started Guide - Strong Parameter [ci skip]
| * Update Getting Started Guide - Strong ParametersAJ Acevedo2013-06-071-4/+11
| | | | | | | | modified: guides/source/getting_started.md
* | Revert "Merge pull request #10539 from davidcelis/ar-sql-improvements"Jon Leighton2013-06-071-1/+5
| | | | | | | | | | | | | | | | | | This reverts commit 257fa6897d9c85da16b7c9fcb4ae3008198d320e, reversing changes made to 94725b81f5588e4b0f43222c4f142c3135941b4b. The build failed https://travis-ci.org/rails/rails/builds/7883546
* | Merge pull request #10539 from davidcelis/ar-sql-improvementsJon Leighton2013-06-071-5/+1
|\ \ | | | | | | Improve performance of ActiveRecord::Relation#blank?
| * | ActiveRecord::Relation#blank? should `LIMIT 1`David Celis2013-06-071-5/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an SQL improvement to ActiveRecord::Relation#blank?. Currently, it calls `to_a` on the Relation, which loads all records in the association, and calls `blank?` on the loaded Array. There are other ways, however, to check the emptiness of an association that are far more performant. `#empty?`, `#exists?` and `#any?` all attach a `LIMIT 1` to the SQL query before firing it off, which is a nice query improvement. `#blank?` should do the same! Bonus performance improvements will also happen for `#present?`, which merely calls the negation of `#blank?` Signed-off-by: David Celis <me@davidcel.is>
* | Merge pull request #10860 from ka8725/activemodel_logCarlos Antonio da Silva2013-06-071-0/+4
|\ \ | | | | | | Ignore activemodel/log/ folder
| * | Stub logger for testsAndrey Koleshko2013-06-061-0/+4
| | |
* | | Merge pull request #10875 from vipulnsward/fix_some_typos_in_asCarlos Antonio da Silva2013-06-072-2/+2
|\ \ \ | | | | | | | | Fix some typos [ci skip]