Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #7188 from rodrigoflores/master | Carlos Antonio da Silva | 2012-07-29 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Explaining a bit better about the default behaviour of dependent | Rodrigo Flores | 2012-07-28 | 1 | -1/+2 | |
* | | | | | | Merge pull request #7192 from bogdan/sqlite_tests_fix | Carlos Antonio da Silva | 2012-07-29 | 1 | -4/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | More polite cleanup for sqlite tests | Bogdan Gusiev | 2012-07-29 | 1 | -4/+4 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #7194 from alexandrz/master | Carlos Antonio da Silva | 2012-07-29 | 1 | -6/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | DRY class_attribute code | Aleksandr Zykov | 2012-07-29 | 1 | -6/+3 | |
|/ / / / / | ||||||
* | | | | | issue a warning when we cannot construct a controller | Aaron Patterson | 2012-07-28 | 1 | -2/+10 | |
* | | | | | this test is not a controller test, so switch to AS::TC | Aaron Patterson | 2012-07-28 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | removes the AR session store from eager loaded code [fixes #7160] | Xavier Noria | 2012-07-29 | 1 | -1/+10 | |
* | | | | Merge pull request #7186 from rimidl/fix-failure-test-in-actionpack | Rafael Mendonça França | 2012-07-28 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | fix failure test 'test_can_wait_until_commit(ResponseTest)' in actionpack | Vladimir Strakhov | 2012-07-28 | 1 | -2/+2 | |
* | | | | | Merge pull request #7185 from route/reset_table_name_refactoring | Rafael Mendonça França | 2012-07-28 | 1 | -8/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Refactor to reset_table_name | Dmitry Vorotilin | 2012-07-28 | 1 | -8/+4 | |
* | | | | | missing require: the AR session store depends on the AP abstract store | Xavier Noria | 2012-07-28 | 1 | -0/+2 | |
|/ / / / | ||||||
* | | | | adds a missing require from Active Support | Xavier Noria | 2012-07-28 | 1 | -0/+1 | |
* | | | | threads can wait on responses to be committed | Aaron Patterson | 2012-07-27 | 3 | -1/+34 | |
* | | | | Revert "Removing composed_of from ActiveRecord." | Rafael Mendonça França | 2012-07-27 | 19 | -32/+790 | |
* | | | | Merge pull request #7182 from yahonda/address_7178 | Rafael Mendonça França | 2012-07-27 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Modity the :json_data_empty attribute from `:null => false` to `:null => true` | Yasuo Honda | 2012-07-28 | 1 | -1/+1 | |
* | | | | | Merge pull request #7181 from jfirebaugh/rbx | Rafael Mendonça França | 2012-07-27 | 1 | -5/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Don't test language-level exception messages | John Firebaugh | 2012-07-27 | 1 | -5/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #6827 from zephyr-dev/master | José Valim | 2012-07-27 | 5 | -0/+118 | |
|\ \ \ \ | ||||||
| * | | | | AR has a subclass of AM:PresenceValidator. | Brent Wheeldon & Nick Monje | 2012-07-20 | 5 | -0/+118 | |
* | | | | | Add Object#try! with the old NoMethodError raising behavior | David Heinemeier Hansson | 2012-07-27 | 3 | -2/+40 | |
* | | | | | will now return nil instead of raise a NoMethodError if the receiving object... | David Heinemeier Hansson | 2012-07-27 | 3 | -5/+10 | |
* | | | | | Changelog and doc updates for the previous changes. | Jon Leighton | 2012-07-27 | 3 | -24/+27 | |
* | | | | | Deprecate Relation#all. | Jon Leighton | 2012-07-27 | 6 | -22/+9 | |
* | | | | | Deprecate ActiveRecord::Base.scoped. | Jon Leighton | 2012-07-27 | 42 | -504/+497 | |
* | | | | | ActiveRecord::Base.all returns a Relation. | Jon Leighton | 2012-07-27 | 31 | -324/+329 | |
* | | | | | Only require the `:rails_env` task where is needed. | Rafael Mendonça França | 2012-07-27 | 1 | -12/+12 | |
* | | | | | Merge pull request #7173 from yahonda/address_7138 | Rafael Mendonça França | 2012-07-26 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Modify the preference attribute from `:null => false` to `:null => true` | Yasuo Honda | 2012-07-27 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | * Do not convert digest auth strings to symbols. CVE-2012-3424 | Aaron Patterson | 2012-07-26 | 1 | -2/+2 | |
* | | | | | Merge pull request #7171 from beerlington/refactor_inheritance_base_class | Rafael Mendonça França | 2012-07-26 | 3 | -30/+45 | |
|\ \ \ \ \ | ||||||
| * | | | | | Refactor ActiveRecord::Inheritance.base_class logic | beerlington | 2012-07-26 | 3 | -30/+45 | |
* | | | | | | Merge pull request #7170 from makaroni4/master | Rafael Mendonça França | 2012-07-26 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | fix typo in documentation | Anatoly Makarevich | 2012-07-26 | 2 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7167 from route/missed_extend | José Valim | 2012-07-26 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Missed extend for eager_autoload | Dmitry Vorotilin | 2012-07-26 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7166 from ayrton/patch-1 | Jon Leighton | 2012-07-26 | 1 | -13/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update activerecord/CHANGELOG.md | Ayrton De Craene | 2012-07-26 | 1 | -13/+13 | |
* | | | | | | Merge pull request #7161 from michaelfairley/eager_load_active_record_associa... | Jon Leighton | 2012-07-26 | 1 | -5/+7 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Eager autoload ActiveRecord association helpers | Michael Fairley | 2012-07-25 | 1 | -5/+7 | |
* | | | | | | Merge pull request #7165 from parndt/patch-5 | Rafael Mendonça França | 2012-07-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Switched update_column recommendation in changelog to update_columns | Philip Arndt | 2012-07-26 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2 | Aaron Patterson | 2012-07-25 | 3 | -1/+76 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Stop being silly with formatting of method aliasing. | Steve Jorgensen | 2012-07-16 | 1 | -3/+3 | |
| * | | | | | | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. | Steve Jorgensen | 2012-07-16 | 3 | -0/+75 | |
| * | | | | | | Don't crash exception translation w/ nil result attribute. | Steve Jorgensen | 2012-07-16 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #7158 from yahonda/use_string_for_settings | Rafael Mendonça França | 2012-07-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ |