Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Simplify code by taking advantage of latest mocha (v0.13.0). | James Mead | 2012-11-12 | 2 | -25/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag t... | Aaron Patterson | 2012-11-12 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #8185 from senny/8182_as_json_options_stick_around | Carlos Antonio da Silva | 2012-11-12 | 3 | -1/+24 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | `#as_json` isolates options when encoding a hash. Closes #8182 | Yves Senn | 2012-11-12 | 3 | -1/+24 | |
| |/ / / / / / | ||||||
* | | | | | | | only clear caches if we are actually connected to the database | Aaron Patterson | 2012-11-12 | 1 | -2/+4 | |
* | | | | | | | depend on voloko/sdoc again | Xavier Noria | 2012-11-12 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #8184 from vipulnsward/add_merge_tests | Carlos Antonio da Silva | 2012-11-12 | 3 | -18/+25 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Merge and add tests related to 5215 | Vipul A M | 2012-11-12 | 3 | -18/+25 | |
| |/ / / / / / | ||||||
* / / / / / / | Debugger gem doesn't work with patchlevel < 327 | Santiago Pastorino | 2012-11-12 | 1 | -1/+2 | |
|/ / / / / / | ||||||
* | | | | | | Remove duplicated ConnectionHandling extension in AR::Base | Carlos Antonio da Silva | 2012-11-11 | 1 | -1/+0 | |
* | | | | | | Merge pull request #8173 from nikitug/match_classes_without_to_s | Carlos Antonio da Silva | 2012-11-11 | 1 | -10/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Match classes without to_s conversions. | Nikita Afanasenko | 2012-11-11 | 1 | -10/+10 | |
* | | | | | | | Merge pull request #8172 from nikitug/silent_diff_deprecation | Santiago Pastorino | 2012-11-11 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Test Hash#diff deprecation, also prevent deprecation message in AS tests | Nikita Afanasenko | 2012-11-11 | 1 | -1/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #8170 from arunagw/warning_removed_railties | Santiago Pastorino | 2012-11-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Removing warning : ambiguous first argument | Arun Agrawal | 2012-11-11 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* / / / / / | Make ActiveRecord::Delegation#method_missing threadsafe | Jon Leighton | 2012-11-10 | 1 | -3/+21 | |
|/ / / / / | ||||||
* | | | | | recent railties changes added to the release notes [ci skip] | Vijay Dev | 2012-11-10 | 1 | -0/+39 | |
* | | | | | update turbolinks readme link [ci skip] | Vijay Dev | 2012-11-10 | 1 | -2/+2 | |
* | | | | | Merge pull request #8165 from arunagw/warning_removed_unused_variables | Carlos Antonio da Silva | 2012-11-10 | 2 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Removing warning : assigned but unused variable | Arun Agrawal | 2012-11-10 | 2 | -2/+2 | |
* | | | | | | Merge pull request #8154 from bogdan/has_one_association_performance | Carlos Antonio da Silva | 2012-11-10 | 3 | -1/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Do not create useless database transaction when building `has_one` association. | Bogdan Gusiev | 2012-11-10 | 3 | -1/+24 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #8164 from nikitug/keep_serialization_in_its_module | Carlos Antonio da Silva | 2012-11-10 | 2 | -9/+13 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Keep the code related to serialization in Serialization module. | Nikita Afanasenko | 2012-11-10 | 2 | -9/+13 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #8162 from fimmtiu/master | Rafael Mendonça França | 2012-11-09 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Trivial documentation fix for ActiveModel::Naming comment. | Dennis Taylor | 2012-11-09 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Use get in the redirection doc examples | Carlos Antonio da Silva | 2012-11-09 | 1 | -7/+7 | |
* | | | | | Gracefully handle upgrading apps with mass assigment configs | Andrew White | 2012-11-09 | 1 | -0/+27 | |
* | | | | | Merge pull request #8158 from steveklabnik/deprecate_diff | Carlos Antonio da Silva | 2012-11-09 | 3 | -3/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Deprecate Hash#diff. | Steve Klabnik | 2012-11-09 | 3 | -3/+5 | |
* | | | | | | Remove not used load hooks for active_record_config | Carlos Antonio da Silva | 2012-11-09 | 2 | -6/+0 | |
* | | | | | | fix warnings | Jon Leighton | 2012-11-09 | 1 | -1/+1 | |
* | | | | | | Properly deprecate ConnectionHandler#connection_pools | Jon Leighton | 2012-11-09 | 3 | -8/+22 | |
* | | | | | | Merge pull request #8157 from steveklabnik/remove_callback_duplication | Rafael Mendonça França | 2012-11-09 | 1 | -7/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Removing duplication in callback normalization. | Steve Klabnik | 2012-11-09 | 1 | -7/+8 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #8116 from senny/7993_configure_counter_cache_for_has_many | Jon Leighton | 2012-11-09 | 6 | -2/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | :counter_cache option for to support custom named counter caches. Closes #7993 | Yves Senn | 2012-11-04 | 6 | -2/+19 | |
* | | | | | | | Delegate all calculations to the scope. | Jon Leighton | 2012-11-09 | 3 | -4/+7 | |
* | | | | | | | CollectionProxy#pluck issues no query for a new_record? owner | Jon Leighton | 2012-11-09 | 2 | -0/+5 | |
* | | | | | | | Nullify the relation at a more general level. | Jon Leighton | 2012-11-09 | 3 | -7/+14 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #8151 from nashby/forwardable | Carlos Antonio da Silva | 2012-11-09 | 1 | -20/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | delegate PathSet's enumerator methods | Vasiliy Ermolovich | 2012-11-09 | 1 | -20/+2 | |
* | | | | | | | Merge pull request #8153 from steveklabnik/fix_include_blank | Carlos Antonio da Silva | 2012-11-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix message about include_blank option. | Steve Klabnik + Katrina Owen | 2012-11-09 | 1 | -1/+1 | |
* | | | | | | | | Relations built off collection associations with an unsaved owner should be n... | Jon Leighton | 2012-11-09 | 2 | -2/+12 | |
* | | | | | | | | Merge pull request #8152 from steveklabnik/squashing_guide | Xavier Noria | 2012-11-09 | 1 | -0/+38 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add note about squashing in contributor guide. | Steve Klabnik + Katrina Owen | 2012-11-09 | 1 | -0/+38 | |
|/ / / / / / / | ||||||
* | | | | | | | implement to_a and to_ary so that the Array() call in template.rb will | Aaron Patterson | 2012-11-09 | 1 | -9/+14 | |
* | | | | | | | make the extremely useful logs debug level | Aaron Patterson | 2012-11-09 | 1 | -2/+2 |