aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Update README.mdXavier Noria2015-12-171-1/+1
* | | | | | | | | | | | Merge pull request #22621 from akshay-vishnoi/add-missing-testsRichard Schneeman2015-12-171-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add missing test cases for asset_pathAkshay Vishnoi2015-12-171-0/+2
* | | | | | | | | | | | Puma 2.15.3 actually works fineDavid Heinemeier Hansson2015-12-171-1/+1
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Deal with leading CR when its not a mountable engineDavid Heinemeier Hansson2015-12-171-1/+1
* | | | | | | | | | | Include example of allowed_request_originsDavid Heinemeier Hansson2015-12-171-1/+2
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #22624 from gsamokovarov/application-record-changelogDavid Heinemeier Hansson2015-12-171-10/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pass over the ApplicationRecord changelog entryGenadi Samokovarov2015-12-171-10/+5
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #22626 from gsamokovarov/appliation-record-documentation-f...David Heinemeier Hansson2015-12-1714-162/+182
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ApplicationRecord release notes entryGenadi Samokovarov2015-12-171-0/+19
| * | | | | | | | | | ApplicationRecord documentation passGenadi Samokovarov2015-12-1713-162/+163
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #22586 from rails/merge-action-cableDavid Heinemeier Hansson2015-12-1789-22/+3678
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix testsDavid Heinemeier Hansson2015-12-171-2/+0
| * | | | | | | | | Don't mount the ActionCable server by defaultDavid Heinemeier Hansson2015-12-172-2/+2
| * | | | | | | | | No longer uses keep now that we have ApplicationRecordDavid Heinemeier Hansson2015-12-161-1/+0
| * | | | | | | | | Fix testDavid Heinemeier Hansson2015-12-161-1/+10
| * | | | | | | | | No need to check for pumaRafael Mendonça França2015-12-161-1/+1
| * | | | | | | | | Fix test now that cable is in there by default tooDavid Heinemeier Hansson2015-12-161-1/+1
| * | | | | | | | | Quiet warningsDavid Heinemeier Hansson2015-12-161-2/+2
| * | | | | | | | | Avoid Action Cable stubs on --skip-action-cableDavid Heinemeier Hansson2015-12-163-3/+7
| * | | | | | | | | No longer needed now that we prefill with app/models/application_record.rbDavid Heinemeier Hansson2015-12-161-1/+0
| * | | | | | | | | ClarifyDavid Heinemeier Hansson2015-12-161-3/+3
| * | | | | | | | | Generate all the ApplicationCable stubs by default, like all other Applicatio...David Heinemeier Hansson2015-12-168-38/+16
| * | | | | | | | | Saner incrementsDavid Heinemeier Hansson2015-12-161-3/+3
| * | | | | | | | | Use puma as the default development server, if availableDavid Heinemeier Hansson2015-12-162-4/+4
| * | | | | | | | | Comment out the user handling so default setup connects directlyDavid Heinemeier Hansson2015-12-161-18/+18
| * | | | | | | | | Eager loading is required for Action Cable and we should use the logging tooDavid Heinemeier Hansson2015-12-161-0/+4
| * | | | | | | | | Only mount the ActionCable server if ApplicationCable has been definedDavid Heinemeier Hansson2015-12-161-1/+1
| * | | | | | | | | By default, mount Action Cable on the routerDavid Heinemeier Hansson2015-12-161-0/+3
| * | | | | | | | | Add default redis config for Action CableDavid Heinemeier Hansson2015-12-162-0/+9
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| * | | | | | | | | | Move Cable to ActionCable for client-side constant to avoid conflictsDavid Heinemeier Hansson2015-12-168-49/+49
| * | | | | | | | | | We are using railtie, not engineDavid Heinemeier Hansson2015-12-163-37/+2
| * | | | | | | | | | Basic channel generatorDavid Heinemeier Hansson2015-12-157-0/+101