Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cargo cult fix to make Celluloid behave | David Heinemeier Hansson | 2015-12-16 | 1 | -0/+3 |
* | Merge branch 'master' into merge-action-cable | Rafael Mendonça França | 2015-12-16 | 54 | -407/+485 |
|\ | |||||
| * | Merge branch 'sprockets-3' | Rafael Mendonça França | 2015-12-16 | 5 | -58/+40 |
| |\ | |||||
| | * | Use sprockets 3 in the Rails 5 release | Rafael Mendonça França | 2015-12-16 | 5 | -57/+46 |
| * | | Merge pull request #22556 from imanel/range_prepend | Kasper Timm Hansen | 2015-12-16 | 1 | -10/+7 |
| |\ \ | |||||
| | * | | Use Module.prepend instead of alias_method for Range#to_s | Bernard Potocki | 2015-12-16 | 1 | -10/+7 |
| * | | | Merge pull request #17845 from gsamokovarov/qualified-const | Rafael França | 2015-12-16 | 3 | -74/+107 |
| |\ \ \ | |||||
| | * | | | Don't leak Object constants in core_ext/module/qualified_const | Genadi Samokovarov | 2015-12-16 | 3 | -74/+107 |
| | | |/ | | |/| | |||||
| * / | | Avoid conditionals in the Gemfile | Sean Griffin | 2015-12-16 | 2 | -6/+16 |
| |/ / | |||||
| * | | Require a version of bcrypt that works on Windows when needed | Sean Griffin | 2015-12-16 | 1 | -1/+5 |
| * | | Merge pull request #22567 from gsamokovarov/introduce-application-record | Rafael França | 2015-12-16 | 16 | -134/+200 |
| |\ \ | |||||
| | * | | Introduce ApplicationRecord, an Active Record layer supertype | Genadi Samokovarov | 2015-12-16 | 16 | -134/+200 |
| * | | | Add additional platforms for Windows | Sean Griffin | 2015-12-16 | 1 | -1/+1 |
| * | | | Merge pull request #22605 from tonyta/delete-dead-comments | Rafael França | 2015-12-16 | 5 | -39/+0 |
| |\ \ \ | |||||
| | * | | | delete code commented out (and replaced) in e93d0a5 | Tony Ta | 2015-12-15 | 1 | -1/+0 |
| | * | | | deletes commented code introduced in f238d495 | Tony Ta | 2015-12-15 | 1 | -5/+0 |
| | * | | | deletes commented code introduced in db045db (initial commit) | Tony Ta | 2015-12-15 | 2 | -18/+0 |
| | * | | | deletes commented code introduced in 4673c47d | Tony Ta | 2015-12-15 | 1 | -5/+0 |
| | * | | | deletes code commented out in 72160d9f | Tony Ta | 2015-12-15 | 1 | -10/+0 |
| * | | | | Ensure we install the database backend gems on Windows | Sean Griffin | 2015-12-16 | 1 | -1/+1 |
| * | | | | Merge pull request #22598 from yui-knk/deprecate_string_callback | Rafael França | 2015-12-16 | 8 | -23/+31 |
| |\ \ \ \ | |||||
| | * | | | | Deprecate passing string to define callback. | yui-knk | 2015-12-16 | 8 | -23/+31 |
| * | | | | | Merge pull request #22611 from existent-co-uk/patch-1 | Rafael França | 2015-12-16 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix a couple of grammatical errors in security.md | Existent Ltd | 2015-12-16 | 1 | -2/+2 |
| * | | | | | | Merge pull request #22612 from caike/master | Eileen M. Uchitelle | 2015-12-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Mention the correct way to halt callback chains | Carlos Souza | 2015-12-16 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'remove-test-case' | eileencodes | 2015-12-15 | 9 | -52/+64 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Run railties generated app tests in test env | eileencodes | 2015-12-15 | 1 | -3/+3 |
| | * | | | | Update test generators to use ActionDispatch::IntegrationTest | Abdelkader Boudih | 2015-12-15 | 8 | -49/+61 |
| |/ / / / | |||||
| * | | | | Do not default to any Serializer | Santiago Pastorino | 2015-12-15 | 3 | -8/+2 |
| * | | | | Merge pull request #22562 from sblackstone/master | Jeremy Daer | 2015-12-15 | 2 | -2/+9 |
| |\ \ \ \ | |||||
| | * | | | | Allow users to pass flags from database.yml | Stephen Blackstone | 2015-12-15 | 2 | -2/+9 |
| * | | | | | Merge pull request #14212 from tylerhunt/fix-token-regex | Sean Griffin | 2015-12-15 | 2 | -1/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Handle tab in token authentication header. | Tyler Hunt | 2014-02-26 | 2 | -1/+9 |
| * | | | | | | Remove warning of shadowing variable | Rafael Mendonça França | 2015-12-15 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Only include action cable meta tags if it is not skipped | Rafael Mendonça França | 2015-12-16 | 1 | -0/+2 |
* | | | | | | Needless whitespace | David Heinemeier Hansson | 2015-12-16 | 1 | -2/+0 |
* | | | | | | Include the action cable URL meta tag by default | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+3 |
* | | | | | | Require tree | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
* | | | | | | Simpler directory structure | David Heinemeier Hansson | 2015-12-16 | 1 | -2/+2 |
* | | | | | | Note that changes to the cable setup requires restarting the server | David Heinemeier Hansson | 2015-12-16 | 3 | -0/+3 |
* | | | | | | @App could have been set elsewhere | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
* | | | | | | Another stab at only mounting redis if the config is there | David Heinemeier Hansson | 2015-12-16 | 1 | -2/+2 |
* | | | | | | Assume that the cable server is running in-process by default, offer option t... | David Heinemeier Hansson | 2015-12-16 | 2 | -0/+5 |
* | | | | | | Fix parent class | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
* | | | | | | Fix the engine reference | Rafael Mendonça França | 2015-12-16 | 1 | -1/+1 |
* | | | | | | Doh, should have read ff370ee61754b00f864f3ddd0af62be4dfa0de67 | David Heinemeier Hansson | 2015-12-16 | 2 | -2/+2 |
* | | | | | | Only initialize redis if the config file is there | David Heinemeier Hansson | 2015-12-16 | 1 | -5/+5 |
* | | | | | | Another bad reference to engine instead of railtie | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
* | | | | | | Include changes made to the engine | David Heinemeier Hansson | 2015-12-16 | 1 | -0/+5 |