Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13302 from afshinator/master | Lauro Caetano | 2013-12-12 | 1 | -1/+1 |
|\ | |||||
| * | fix grammatical error | Afshin Mokhtari | 2013-12-12 | 1 | -1/+1 |
* | | Merge pull request #12590 from laurocaetano/whitelist-to-delegate-array-methods | Rafael Mendonça França | 2013-12-12 | 4 | -104/+105 |
|\ \ | |||||
| * | | Use `public_send` instead of just use `send`. | Lauro Caetano | 2013-12-12 | 2 | -9/+9 |
| * | | Use a whitelist to delegate methods to array | Lauro Caetano | 2013-12-12 | 2 | -75/+38 |
| * | | Add changelog | laurocaetano | 2013-12-12 | 1 | -6/+15 |
| * | | Remove delegation test. | laurocaetano | 2013-12-12 | 1 | -17/+46 |
| |/ | |||||
* | | extract cache counter logic to one method | Aaron Patterson | 2013-12-12 | 1 | -11/+10 |
* | | remove duplicate code | Aaron Patterson | 2013-12-12 | 1 | -15/+6 |
* | | extract a method for updating without a record object | Aaron Patterson | 2013-12-12 | 1 | -6/+10 |
* | | extract methods out of the cache update method | Aaron Patterson | 2013-12-12 | 1 | -14/+22 |
* | | pull a nil check up one frame | Aaron Patterson | 2013-12-12 | 1 | -6/+10 |
|/ | |||||
* | docs guidelines: recommends wording in a way that avoids "you"s and "your"s | Xavier Noria | 2013-12-12 | 1 | -1/+15 |
* | copy-edits 68abbac [ci skip] | Xavier Noria | 2013-12-12 | 1 | -10/+22 |
* | Merge pull request #13255 from strzalek/bump-builder | Rafael Mendonça França | 2013-12-12 | 2 | -2/+2 |
|\ | |||||
| * | More liberal builder dependency | Łukasz Strzałkowski | 2013-12-12 | 2 | -2/+2 |
* | | Merge pull request #13300 from chancancode/add_nodoc_am_dirty_methods | Aaron Patterson | 2013-12-12 | 1 | -2/+2 |
|\ \ | |||||
| * | | Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip] | Godfrey Chan | 2013-12-12 | 1 | -2/+2 |
|/ / | |||||
* | | remove more nil checks | Aaron Patterson | 2013-12-12 | 1 | -6/+5 |
* | | remove nil check | Aaron Patterson | 2013-12-12 | 2 | -7/+11 |
* | | remove the nil check from set_inverse_instance | Aaron Patterson | 2013-12-12 | 4 | -4/+7 |
* | | make sure cached table name is a string. fixes #12582 | Aaron Patterson | 2013-12-12 | 3 | -1/+12 |
* | | Merge pull request #13229 from vipulnsward/fix-10635-tests | Rafael Mendonça França | 2013-12-12 | 2 | -2/+17 |
|\ \ | |||||
| * | | PR #10635 introduces rescue from ArgumentError thrown by `Base64.strict_decod... | Vipul A M | 2013-12-12 | 2 | -2/+17 |
* | | | Merge pull request #13293 from akshay-vishnoi/typo | Carlos Antonio da Silva | 2013-12-12 | 8 | -12/+12 |
|\ \ \ | |||||
| * | | | Spelling and Grammar checks | Akshay Vishnoi | 2013-12-12 | 8 | -12/+12 |
* | | | | Merge pull request #13271 from chancancode/warn_about_using_return_in_as_call... | Rafael Mendonça França | 2013-12-12 | 1 | -0/+33 |
|\ \ \ \ | |||||
| * | | | | Warn about using `return` inside inline callback blocks [ci skip] | Godfrey Chan | 2013-12-11 | 1 | -0/+33 |
* | | | | | Copy-edit the parent commit | Rafael Mendonça França | 2013-12-12 | 1 | -6/+8 |
* | | | | | Merge pull request #13268 from aayushkhandelwal11/master | Rafael Mendonça França | 2013-12-12 | 1 | -22/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Moving the common code of increment and decrement of cache file store into se... | Aayush khandelwal | 2013-12-12 | 1 | -22/+16 |
| |/ / / / | |||||
* | | | | | Merge pull request #13290 from strzalek/inline-syntax-docs | Rafael Mendonça França | 2013-12-12 | 3 | -0/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Variants inline syntax documentation [ci skip] | Łukasz Strzałkowski | 2013-12-12 | 3 | -0/+27 |
* | | | | | | Merge pull request #13291 from strzibny/new_unique_constraint | Yves Senn | 2013-12-12 | 1 | -1/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Translate new unique constraint for sqlite >= 3.8.2 | Josef Stribny | 2013-12-12 | 1 | -1/+5 |
* | | | | | | Merge pull request #13032 from kuldeepaggarwal/after_touch_documentation | Yves Senn | 2013-12-12 | 1 | -0/+49 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ci skip] added after_touch callback documentation | Kuldeep Aggarwal | 2013-12-12 | 1 | -0/+49 |
* | | | | | | | Get rid of hack for freezing time on AR tests | Carlos Antonio da Silva | 2013-12-12 | 2 | -23/+5 |
* | | | | | | | Changelog improvements [ci skip] | Carlos Antonio da Silva | 2013-12-12 | 3 | -12/+14 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #13288 from dvsuresh/fix_typo | Damien Mathieu | 2013-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix typo in action_controller responder.rb | dvsuresh | 2013-12-12 | 1 | -1/+1 |
* | | | | | | | Merge pull request #13287 from aayushkhandelwal11/typo_rectified | Yves Senn | 2013-12-11 | 3 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | typos rectified lifecycle => life cycle | Aayush khandelwal | 2013-12-12 | 3 | -5/+5 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | JSON: speed up date/time encoding | Jeremy Kemper | 2013-12-11 | 1 | -24/+19 |
* | | | | | | | Merge pull request #13284 from aayushkhandelwal11/typos_corrected | Godfrey Chan | 2013-12-11 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | typos rectified [ci skip] | Aayush khandelwal | 2013-12-12 | 3 | -3/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #13279 from misfo/session-fetch-that-behaves-like-hash-fetch | Rafael Mendonça França | 2013-12-11 | 3 | -14/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update CHANGELOG entry for Session#fetch | Trent Ogren | 2013-12-11 | 1 | -3/+1 |
| * | | | | | | Make ActionDispatch::Request::Session#fetch behave like Hash#fetch | Trent Ogren | 2013-12-11 | 2 | -11/+10 |
* | | | | | | | Merge pull request #13281 from waynn/patch-5 | Rafael Mendonça França | 2013-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ |