aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cargo cult fix to make Celluloid behaveDavid Heinemeier Hansson2015-12-161-0/+3
* Merge branch 'master' into merge-action-cableRafael Mendonça França2015-12-1654-407/+485
|\
| * Merge branch 'sprockets-3'Rafael Mendonça França2015-12-165-58/+40
| |\
| | * Use sprockets 3 in the Rails 5 releaseRafael Mendonça França2015-12-165-57/+46
| * | Merge pull request #22556 from imanel/range_prependKasper Timm Hansen2015-12-161-10/+7
| |\ \
| | * | Use Module.prepend instead of alias_method for Range#to_sBernard Potocki2015-12-161-10/+7
| * | | Merge pull request #17845 from gsamokovarov/qualified-constRafael França2015-12-163-74/+107
| |\ \ \
| | * | | Don't leak Object constants in core_ext/module/qualified_constGenadi Samokovarov2015-12-163-74/+107
| | | |/ | | |/|
| * / | Avoid conditionals in the GemfileSean Griffin2015-12-162-6/+16
| |/ /
| * | Require a version of bcrypt that works on Windows when neededSean Griffin2015-12-161-1/+5
| * | Merge pull request #22567 from gsamokovarov/introduce-application-recordRafael França2015-12-1616-134/+200
| |\ \
| | * | Introduce ApplicationRecord, an Active Record layer supertypeGenadi Samokovarov2015-12-1616-134/+200
| * | | Add additional platforms for WindowsSean Griffin2015-12-161-1/+1
| * | | Merge pull request #22605 from tonyta/delete-dead-commentsRafael França2015-12-165-39/+0
| |\ \ \
| | * | | delete code commented out (and replaced) in e93d0a5Tony Ta2015-12-151-1/+0
| | * | | deletes commented code introduced in f238d495Tony Ta2015-12-151-5/+0
| | * | | deletes commented code introduced in db045db (initial commit)Tony Ta2015-12-152-18/+0
| | * | | deletes commented code introduced in 4673c47dTony Ta2015-12-151-5/+0
| | * | | deletes code commented out in 72160d9fTony Ta2015-12-151-10/+0
| * | | | Ensure we install the database backend gems on WindowsSean Griffin2015-12-161-1/+1
| * | | | Merge pull request #22598 from yui-knk/deprecate_string_callbackRafael França2015-12-168-23/+31
| |\ \ \ \
| | * | | | Deprecate passing string to define callback.yui-knk2015-12-168-23/+31
| * | | | | Merge pull request #22611 from existent-co-uk/patch-1Rafael França2015-12-161-2/+2
| |\ \ \ \ \
| | * | | | | Fix a couple of grammatical errors in security.mdExistent Ltd2015-12-161-2/+2
| * | | | | | Merge pull request #22612 from caike/masterEileen M. Uchitelle2015-12-161-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Mention the correct way to halt callback chainsCarlos Souza2015-12-161-1/+1
| |/ / / / /
| * | | | | Merge branch 'remove-test-case'eileencodes2015-12-159-52/+64
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Run railties generated app tests in test enveileencodes2015-12-151-3/+3
| | * | | | Update test generators to use ActionDispatch::IntegrationTestAbdelkader Boudih2015-12-158-49/+61
| |/ / / /
| * | | | Do not default to any SerializerSantiago Pastorino2015-12-153-8/+2
| * | | | Merge pull request #22562 from sblackstone/masterJeremy Daer2015-12-152-2/+9
| |\ \ \ \
| | * | | | Allow users to pass flags from database.ymlStephen Blackstone2015-12-152-2/+9
| * | | | | Merge pull request #14212 from tylerhunt/fix-token-regexSean Griffin2015-12-152-1/+9
| |\ \ \ \ \
| | * | | | | Handle tab in token authentication header.Tyler Hunt2014-02-262-1/+9
| * | | | | | Remove warning of shadowing variableRafael Mendonça França2015-12-151-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Only include action cable meta tags if it is not skippedRafael Mendonça França2015-12-161-0/+2
* | | | | | Needless whitespaceDavid Heinemeier Hansson2015-12-161-2/+0
* | | | | | Include the action cable URL meta tag by defaultDavid Heinemeier Hansson2015-12-161-1/+3
* | | | | | Require treeDavid Heinemeier Hansson2015-12-161-1/+1
* | | | | | Simpler directory structureDavid Heinemeier Hansson2015-12-161-2/+2
* | | | | | Note that changes to the cable setup requires restarting the serverDavid Heinemeier Hansson2015-12-163-0/+3
* | | | | | @App could have been set elsewhereDavid Heinemeier Hansson2015-12-161-1/+1
* | | | | | Another stab at only mounting redis if the config is thereDavid Heinemeier Hansson2015-12-161-2/+2
* | | | | | Assume that the cable server is running in-process by default, offer option t...David Heinemeier Hansson2015-12-162-0/+5
* | | | | | Fix parent classDavid Heinemeier Hansson2015-12-161-1/+1
* | | | | | Fix the engine referenceRafael Mendonça França2015-12-161-1/+1
* | | | | | Doh, should have read ff370ee61754b00f864f3ddd0af62be4dfa0de67David Heinemeier Hansson2015-12-162-2/+2
* | | | | | Only initialize redis if the config file is thereDavid Heinemeier Hansson2015-12-161-5/+5
* | | | | | Another bad reference to engine instead of railtieDavid Heinemeier Hansson2015-12-161-1/+1
* | | | | | Include changes made to the engineDavid Heinemeier Hansson2015-12-161-0/+5