Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #7580 from spohlenz/mounted-url-helper-ivars | José Valim | 2012-09-09 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use internal instance variable naming scheme for mounted URL helper proxies | Sam Pohlenz | 2012-09-09 | 2 | -1/+12 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #7571 from arunagw/warning_removed_shadowing | Rafael Mendonça França | 2012-09-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | removed warning: shadowing outer local variable | Arun Agrawal | 2012-09-09 | 1 | -1/+1 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #7548 from ernie/missing-attributes-query-fix | Carlos Antonio da Silva | 2012-09-08 | 3 | -1/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Raise MissingAttributeError on query methods | Ernie Miller | 2012-09-08 | 3 | -1/+8 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7577 from frodsan/fix_ap_response | Rafael Mendonça França | 2012-09-08 | 1 | -25/+32 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | set default_headers to nil after use it to avoid order dependent tests | Francesco Rodriguez | 2012-09-08 | 1 | -25/+32 | |
* | | | | | | | | Merge pull request #7576 from prijutme4ty/fix_require_necessary_for_generatin... | Rafael Mendonça França | 2012-09-08 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed missing require | Ilya Vorontsov | 2012-09-08 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #7574 from frodsan/chlog_ar | Rafael Mendonça França | 2012-09-08 | 1 | -8/+9 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | improve AR CHANGELOG [ci skip] | Francesco Rodriguez | 2012-09-08 | 1 | -8/+9 | |
|/ / / / / / / | ||||||
* | | | | | | | Tidy up excerpt separator logic a bit | Carlos Antonio da Silva | 2012-09-08 | 1 | -17/+11 | |
* | | | | | | | Improve latest AR and AP changelog entries | Carlos Antonio da Silva | 2012-09-08 | 2 | -2/+10 | |
* | | | | | | | Refactor some date helpers to use merge! | Carlos Antonio da Silva | 2012-09-08 | 1 | -5/+9 | |
* | | | | | | | Refactor nested attributes limit logic to lookup :limit option only once | Carlos Antonio da Silva | 2012-09-08 | 1 | -11/+12 | |
* | | | | | | | Merge pull request #7189 from GCorbel/excerpt_with_separation | Carlos Antonio da Silva | 2012-09-08 | 3 | -11/+64 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add a separation option for the excerpt function | Guirec Corbel | 2012-09-08 | 3 | -11/+64 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #7566 from etehtsea/schema-new-hash | Carlos Antonio da Silva | 2012-09-08 | 5 | -61/+63 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Dump schema using new style hash | Konstantin Shabanov | 2012-09-08 | 5 | -61/+63 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #7568 from alup/master | Carlos Antonio da Silva | 2012-09-08 | 2 | -0/+29 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add integration tests for reset_session in cookie store | Andreas Loupasakis | 2012-09-08 | 1 | -0/+20 | |
| * | | | | | | Add test for clear in ActionDispatch::Request::Session | Andreas Loupasakis | 2012-09-08 | 1 | -0/+9 | |
|/ / / / / / | ||||||
* | | | | | | Add changelog entry for #7545: map interval with precision to string | Carlos Antonio da Silva | 2012-09-07 | 1 | -0/+2 | |
* | | | | | | Merge pull request #7545 from senny/7518_postgres_type_detection | Aaron Patterson | 2012-09-07 | 3 | -3/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | postgres, map scaled intervals to string datatype (#7518) | Yves Senn | 2012-09-06 | 3 | -3/+6 | |
* | | | | | | | Minor refactor in ActiveRecord#initialize_dup | Carlos Antonio da Silva | 2012-09-07 | 3 | -12/+4 | |
* | | | | | | | Merge pull request #7565 from guilleiguaran/dalli-session-store | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Improve error message for memcache session store when dalli isn't loaded in app | Guillermo Iguaran | 2012-09-07 | 1 | -2/+6 | |
* | | | | | | | | create a transaction object and point AR objects at that object during a | Aaron Patterson | 2012-09-07 | 4 | -12/+55 | |
* | | | | | | | | Fix AS tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+2 | |
* | | | | | | | | Fix AR tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -6/+6 | |
* | | | | | | | | Bump builder dependencies in Active Model and Action Pack | Carlos Antonio da Silva | 2012-09-07 | 2 | -2/+2 | |
* | | | | | | | | Update Active Model xml serialization test to reflect a change in builder | Carlos Antonio da Silva | 2012-09-07 | 2 | -1/+12 | |
* | | | | | | | | Use merge! to merge additional options onto default options | Carlos Antonio da Silva | 2012-09-07 | 1 | -4/+3 | |
* | | | | | | | | Fix Active Support changelog formatting [ci skip] | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+2 | |
* | | | | | | | | Remove 3.2.x entries from Active Record changelog [ci skip] | Carlos Antonio da Silva | 2012-09-07 | 1 | -100/+0 | |
* | | | | | | | | Add Changelog entry for #4976: fix eager load associations without pks [ci skip] | Carlos Antonio da Silva | 2012-09-07 | 1 | -0/+2 | |
* | | | | | | | | Add Changelog entry for #7560: deprecate #filter in AS::Callbacks [ci skip] | Carlos Antonio da Silva | 2012-09-07 | 1 | -0/+22 | |
* | | | | | | | | Merge pull request #7552 from guilleiguaran/dalli-session-store | Santiago Pastorino | 2012-09-07 | 3 | -13/+8 | |
|\| | | | | | | | ||||||
| * | | | | | | | Dalli doesn't support autoloading of unloaded classes | Guillermo Iguaran | 2012-09-06 | 1 | -5/+0 | |
| * | | | | | | | Use dalli 2.2.1 or prior to fix failing tests in memcache session store | Guillermo Iguaran | 2012-09-06 | 1 | -1/+1 | |
| * | | | | | | | More fixes for action pack tests with Dalli. | Arun Agrawal | 2012-09-06 | 1 | -3/+3 | |
| * | | | | | | | Let's run action pack tests with Dalli | Arun Agrawal | 2012-09-06 | 1 | -4/+4 | |
* | | | | | | | | Merge pull request #7560 from bogdan/deprecate_callbacks_monkeypatch | José Valim | 2012-09-07 | 3 | -8/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | AS::Callbacks: deprecate monkey patch of object callbacks | Bogdan Gusiev | 2012-09-07 | 3 | -8/+9 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #4976 from kreynolds/fix_eager_without_pkey | Jon Leighton | 2012-09-07 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Change JoinPart test from an integration to a unit test | Kelley Reynolds | 2012-07-05 | 2 | -13/+8 | |
| * | | | | | | | | Fix eagerly loading associations without primary keys | Kelley Reynolds | 2012-02-09 | 2 | -1/+14 | |
* | | | | | | | | | fix tests on Ruby 2.0.0 | Aaron Patterson | 2012-09-06 | 1 | -1/+1 | |
| |/ / / / / / / |/| | | | | | | |