Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | test description uses "disable" when it should be "disabled" | Waynn Lue | 2013-12-11 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #13280 from waynn/patch-4 | Rafael Mendonça França | 2013-12-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | value is "disabled" not "disable" | Waynn Lue | 2013-12-11 | 1 | -1/+1 | |
* | | | | | | | | | Remove not necessary file, move constants to the file they are used | Carlos Antonio da Silva | 2013-12-11 | 3 | -8/+8 | |
* | | | | | | | | | Merge pull request #13264 from laurocaetano/fix_dynamic_finder_with_reserved_... | Rafael Mendonça França | 2013-12-11 | 3 | -2/+16 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Prevent invalid code when using dynamic finders with Ruby's reserved words. | Lauro Caetano | 2013-12-11 | 3 | -2/+16 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'support-deprecated-finders' | Rafael Mendonça França | 2013-12-11 | 8 | -48/+66 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Move the parameter normalization to the initialize method | Rafael Mendonça França | 2013-12-11 | 1 | -4/+5 | |
| * | | | | | | | | Revert the whole refactoring in the association builder classes. | Rafael Mendonça França | 2013-12-11 | 8 | -47/+64 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* / | | | | | | | Nodoc missing number helper classes in AS [ci skip] | Carlos Antonio da Silva | 2013-12-11 | 3 | -4/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key" | Rafael Mendonça França | 2013-12-11 | 1 | -1/+2 | |
* | | | | | | | Mark the arguments needed by activerecord-deprecated_finders with a TODO | Rafael Mendonça França | 2013-12-11 | 4 | -2/+20 | |
* | | | | | | | Revert "Merge pull request #12518 from vipulnsward/remove_count_options" | Rafael Mendonça França | 2013-12-11 | 5 | -17/+20 | |
* | | | | | | | Bring back the valid_options class accessor | Rafael Mendonça França | 2013-12-11 | 6 | -9/+14 | |
* | | | | | | | Merge pull request #13276 from aayushkhandelwal11/change_to_key | Rafael Mendonça França | 2013-12-11 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | removing multiple check conditions to single check condition | Aayush khandelwal | 2013-12-11 | 1 | -2/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #13273 from robertomiranda/test-remove-require | Guillermo Iguaran | 2013-12-11 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove require 'models/administrator', Administrator is not used in secure pa... | robertomiranda | 2013-12-11 | 1 | -1/+0 | |
* | | | | | | | | Merge pull request #13270 from aayushkhandelwal11/typos | Damien Mathieu | 2013-12-11 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | typo rectified [skip ci] | Aayush khandelwal | 2013-12-11 | 2 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #13260 from arunagw/using-parallelize_me | Aaron Patterson | 2013-12-10 | 1 | -6/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Using parallelize_me! to parallelize isolated test | Arun Agrawal | 2013-12-10 | 1 | -6/+3 | |
* | | | | | | | | Merge pull request #12699 from drogus/fix-mounting-engine-in-resources | Piotr Sarnacki | 2013-12-10 | 3 | -2/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix mounting engines inside a resources block | Piotr Sarnacki | 2013-12-10 | 3 | -2/+18 | |
|/ / / / / / / / |