Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #13879 from schneems/schneems/more-explicit-database-confi... | Rafael Mendonça França | 2014-01-29 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Enhance errors while retrieving database config | schneems | 2014-01-29 | 1 | -0/+2 | |
* | | | | | | | | | | | Aesthetic | Rafael Mendonça França | 2014-01-29 | 3 | -13/+13 | |
* | | | | | | | | | | | Merge pull request #13867 from mauricio/bug-13861 | Rafael Mendonça França | 2014-01-29 | 5 | -1/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fixing issue with activerecord serialization not being able to dump a record ... | Mauricio Linhares | 2014-01-29 | 5 | -1/+52 | |
* | | | | | | | | | | | | Merge pull request #13876 from sowjumn/master | Rafael Mendonça França | 2014-01-29 | 1 | -10/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Added some style changes in asset pipeline documentation | sowjanya | 2014-01-29 | 1 | -10/+5 | |
* | | | | | | | | | | | | Merge pull request #13871 from kassio/fix-filters-with-classes-documentation | Robin Dupret | 2014-01-29 | 3 | -2/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix documentation of new controller filters api [ci skip] | Kassio Borges | 2014-01-29 | 3 | -2/+12 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #13201 from marcandre/find_in_batch_enumerator | Rafael Mendonça França | 2014-01-29 | 3 | -0/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | `find_in_batches` now returns an `Enumerator` when called without a block, so... | Marc-Andre Lafortune | 2013-12-06 | 3 | -0/+27 | |
* | | | | | | | | | | | Merge pull request #13877 from marcandre/find_in_batches | Rafael Mendonça França | 2014-01-29 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Mention find_each in find_in_batches doc [ci skip] | Marc-Andre Lafortune | 2014-01-29 | 1 | -0/+2 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #13450 from chancancode/ar_raise_on_conflict | Godfrey Chan | 2014-01-29 | 8 | -9/+219 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | `enum` now raises on "dangerous" name conflicts | Godfrey Chan | 2014-01-29 | 3 | -3/+113 | |
| * | | | | | | | | | | | `scope` now raises on "dangerous" name conflicts | Godfrey Chan | 2014-01-29 | 4 | -4/+95 | |
| * | | | | | | | | | | | Fixed a bug in AR::Base#respond_to? | Godfrey Chan | 2014-01-29 | 2 | -2/+11 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Update CHANGELOG properly with GH #13692 [ci-skip] | Guillermo Iguaran | 2014-01-29 | 1 | -14/+14 | |
* | | | | | | | | | | | Merge pull request #13692 from lukesarnacki/change-default-session-serializer | Guillermo Iguaran | 2014-01-29 | 11 | -10/+121 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Allow session serializer key in config.session_store | Lukasz Sarnacki | 2014-01-29 | 11 | -10/+121 | |
* | | | | | | | | | | | | Merge pull request #13868 from mauricio/bug-13788 | Yves Senn | 2014-01-29 | 3 | -1/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Correctly send the string given to lock! and reload(:lock) to the lock scope ... | Mauricio Linhares | 2014-01-29 | 3 | -1/+22 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | always use a block for cleanup / prepare callbacks so we can clean the method... | Aaron Patterson | 2014-01-28 | 1 | -0/+9 | |
* | | | | | | | | | | | scope is not necessary | Aaron Patterson | 2014-01-28 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge pull request #13864 from sowjumn/master | Rafael Mendonça França | 2014-01-28 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Added documentation for css_compressor | sowjanya | 2014-01-28 | 1 | -1/+6 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #13813 from lukesarnacki/log-deep-munge | Rafael Mendonça França | 2014-01-28 | 6 | -4/+77 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Log which keys were set to nil in deep_munge | Lukasz Sarnacki | 2014-01-28 | 6 | -4/+77 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #11821 from kuroda/select-and-order-by-aliased-attributes | Godfrey Chan | 2014-01-28 | 4 | -1/+44 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Handle aliased attributes in AR::Relation#select, #order, etc. | Tsutomu Kuroda | 2014-01-29 | 4 | -1/+44 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Fix indent on test case [ci skip] | Carlos Antonio da Silva | 2014-01-28 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #13838 from vipulnsward/13197-fix-has-one-documentation | Damien Mathieu | 2014-01-28 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add docs about behaviour of replacing a has_one associate object, that the pr... | Vipul A M | 2014-01-28 | 1 | -1/+2 | |
* | | | | | | | | | | Merge pull request #13857 from teoljungberg/replace-file-exists-eh | Carlos Antonio da Silva | 2014-01-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Replace File.exists? with File.exist? | Teo Ljungberg | 2014-01-27 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #13855 from kuldeepaggarwal/reset_validators | Carlos Antonio da Silva | 2014-01-27 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | use the new clear_validators! api everywhere to reset validators in tests | Kuldeep Aggarwal | 2014-01-28 | 3 | -4/+4 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #13832 from kassio/setup-for-raise-missing-translations | Rafael Mendonça França | 2014-01-27 | 7 | -4/+33 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Rails config for raise on missing translations | Kassio Borges | 2014-01-27 | 7 | -4/+33 | |
* | | | | | | | | | | | Clear filtered request attributes between requests in tests | Andrew White | 2014-01-27 | 4 | -0/+29 | |
* | | | | | | | | | | | docs, remove deprecation entry in favor of abe6484. [ci skip] | Yves Senn | 2014-01-27 | 1 | -5/+0 | |
* | | | | | | | | | | | Fix doc markup of clear_validators! | Carlos Antonio da Silva | 2014-01-27 | 1 | -2/+2 | |
* | | | | | | | | | | | Use the new clear_validators! api to reset validators in tests | Carlos Antonio da Silva | 2014-01-27 | 16 | -42/+33 | |
* | | | | | | | | | | | Merge tests about multiple validation contexts | Carlos Antonio da Silva | 2014-01-27 | 1 | -10/+6 | |
* | | | | | | | | | | | mention #13314 in 4.1 release notes. refs #12140. [ci skip] | Yves Senn | 2014-01-27 | 1 | -0/+3 | |
* | | | | | | | | | | | Merge pull request #13754 from vpuzzella/master | Carlos Antonio da Silva | 2014-01-27 | 3 | -5/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Ability to specify multiple contexts when defining a validation. | Vince Puzzella | 2014-01-27 | 3 | -5/+45 | |
* | | | | | | | | | | | Merge pull request #13848 from huoxito/tell-value | Carlos Antonio da Silva | 2014-01-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Display value when raising due to unscope() issues | Washington Luiz | 2014-01-27 | 1 | -1/+1 | |
* | | | | | | | | | | | docs, clarify usage of `action_mailer.default_options`. [ci skip]. Closes #13... | Yves Senn | 2014-01-27 | 1 | -4/+12 |