Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #7576 from ↵ | Rafael Mendonça França | 2012-09-08 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | prijutme4ty/fix_require_necessary_for_generating_guides Fixed missing require | |||||
| * | | | | Fixed missing require | Ilya Vorontsov | 2012-09-08 | 1 | -0/+1 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Missing require caused fail of guide generation (in action_dispatch/http/mime_type, line 295, undefined method `ends_with` for "to_ary":String) With this fix guides were normally generated | |||||
* | | | | Merge pull request #7574 from frodsan/chlog_ar | Rafael Mendonça França | 2012-09-08 | 1 | -8/+9 | |
|\ \ \ \ | |/ / / |/| | | | improve AR CHANGELOG [ci skip] | |||||
| * | | | 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 | |
| | | | | | | | | | | | | Also just set the hash value instead of merging when it's only one key. | |||||
* | | | 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 separator option for the excerpt function. | |||||
| * | | | Add a separation option for the excerpt function | Guirec Corbel | 2012-09-08 | 3 | -11/+64 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The separation option enable to keep entire words, lines or anything. To split by line, like github, we can set the separation option as \n. To split by word, like google, we can set the separation option as " ". The radius option represent the number of lines or words we want to have in the result. The default behaviour is the same. If we don't set the separation option, it split the text any where. | |||||
* | | | 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 | |||||
| * | | | 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 | |
|\ \ \ | |/ / |/| | | Tests for session handling | |||||
| * | | 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 | |
| | | | | | | | | | | Merged in f41dba27a411fe3e2ddeb8d9ab6856dbb23acd02 [ci skip] | |||||
* | | 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 | |||||
| * | | 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 | |
| | | | | | | | | | | | | | | | | | | * There is no need to delete the primary key from cloned attributes, since it sets the same pk to nil afterwards. * Check for empty? instead of any? to run initialize callbacks. | |||||
* | | | 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 | |||||
| * | | | 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 | |
| | | | | | | | | | | | | | | | | transaction. | |||||
* | | | | Fix AS tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. | |||||
* | | | | Fix AR tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | Check 0180e090ab6cbe66f7b521a0c03e278a0463accd for more reasoning about that. | |||||
* | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a change in builder, nil values and empty strings now generates closed tags, so instead of this: <pseudonyms nil=\"true\"></pseudonyms> It generates this: <pseudonyms nil=\"true\"/> Document this change in Rails so that people can track it down easily if necessary. | |||||
* | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 810a50dacf9ddddc1d59c1cb350e8ce785c8bf85, the new policy is to keep old changelogs in their own branches, to avoid manual syncing across different branches. Please check that commit for more reasoning about the new policy. | |||||
* | | | | 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 | |
|\| | | | | | | | | | | | Use Dalli for memcache session store | |||||
| * | | | 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 | |
| | | | | | | | | | | | | | | | | There is no memcache gem left in repo. | |||||
* | | | | 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 | |||||
| * | | | | 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 | |
|\ \ \ \ | | | | | | | | | | | Fix eagerly loading associations without primary keys | |||||
| * | | | | 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 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #7549 from asanghi/master | Carlos Antonio da Silva | 2012-09-06 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix Changelog example in Action Mailer [ci skip] | |||||
| * | | | | fix bad changelog example | Aditya Sanghi | 2012-09-07 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #7550 from sikachu/master-changelog | Carlos Antonio da Silva | 2012-09-06 | 1 | -0/+6 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Update Active Record CHANGELOG for #7419 [ci skip] | |||||
| * | | | | Update Active Record CHANGELOG for #7419 | Prem Sichanugrist | 2012-09-06 | 1 | -0/+6 | |
|/ / / / | ||||||
* | | | | Merge pull request #7419 from releu/fix-invalid-filename-migration-generator | José Valim | 2012-09-06 | 2 | -0/+16 | |
|\ \ \ \ | |_|/ / |/| | | | Ensure valid migration filename on generating migration | |||||
| * | | | add mini-validator on creating migration | Jan Bernacki | 2012-09-06 | 2 | -0/+16 | |
|/ / / | | | | | | | | | | move validation to AR | |||||
* | | | Merge pull request #7542 from aaronrenner/patch-2 | José Valim | 2012-09-06 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fixed around callback with lambda example | |||||
| * | | | Fixed around callback with lambda example | Aaron Renner | 2012-09-06 | 1 | -1/+1 | |
|/ / / | | | | | | | This is a follow up to issue #7535 |