aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use Thread.current.thread_variable_set/get insetad of the direct accessorsDavid Heinemeier Hansson2015-12-171-4/+4
|
* Merge pull request #22634 from arunagw/api-doc-for-actioncableRafael França2015-12-171-0/+7
|\ | | | | Generate API doc for actioncable
| * Generate API doc for actioncableArun Agrawal2015-12-171-0/+7
| |
* | Merge pull request #22636 from nateberkopec/fix-dhh-typoRafael França2015-12-171-1/+1
|\ \ | | | | | | Fix typo in thread_mattr_accessor doco [ci skip]
| * | Fix typo in thread_mattr_accessor doco [ci skip]Nate Berkopec2015-12-171-1/+1
| | |
* | | Merge pull request #22635 from arunagw/add-actioncable-to-release-listKasper Timm Hansen2015-12-171-1/+1
|\ \ \ | |/ / |/| | Add actioncable to list of release frameworks [ci skip]
| * | Add actioncable to list of release frameworks [ci skip]Arun Agrawal2015-12-171-1/+1
| |/
* | Merge pull request #22630 from rails/attribute-accessors-per-threadDavid Heinemeier Hansson2015-12-175-0/+302
|\ \ | |/ |/| Add thread_m/cattr_accessor/reader/writer suite of methods for declaring class and module variables that live per-thread
| * Use separate test class nameDavid Heinemeier Hansson2015-12-171-1/+1
| |
| * Use consistent referencesDavid Heinemeier Hansson2015-12-171-3/+3
| |
| * Add thread_m/cattr_accessor/reader/writer suite of methods for declaring ↵David Heinemeier Hansson2015-12-175-0/+302
| | | | | | | | class and module variables that live per-thread
* | Merge pull request #22068 from y-yagi/change_default_to_markdownRafael França2015-12-177-9/+13
|\ \ | | | | | | README.rdoc -> README.md for newly generated plugins
| * | README.rdoc -> README.md for newly generated pluginsyuuji.yaginuma2015-12-177-9/+13
| | | | | | | | | | | | I think Markdown is nowadays a better default.
* | | Merge pull request #22629 from ↵Rafael França2015-12-171-1/+0
|\ \ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/kill-extra-line-in-manifest-js Kill extra newline at the start of generated manifest.js
| * | | Kill extra newline at the start of generated manifest.jsPrathamesh Sonpatki2015-12-171-1/+0
| | | |
* | | | Merge pull request #22632 from prathamesh-sonpatki/fix-upgrading-guideRafael França2015-12-171-4/+4
|\ \ \ \ | | | | | | | | | | Fix section about ApplicationRecord in upgrading guide [ci skip]
| * | | | Fix section about ApplicationRecord in upgrading guide [ci skip]Prathamesh Sonpatki2015-12-171-4/+4
| | |_|/ | |/| |
* | | | Update README.mdXavier Noria2015-12-171-1/+1
| | | | | | | | | | | | ActiveRecord -> Active Record [ci skip]
* | | | Merge pull request #22621 from akshay-vishnoi/add-missing-testsRichard Schneeman2015-12-171-0/+2
|\ \ \ \ | |/ / / |/| | | Add missing test cases for asset_path
| * | | 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 entry
| * | Pass over the ApplicationRecord changelog entryGenadi Samokovarov2015-12-171-10/+5
| | | | | | | | | | | | | | | | | | | | | The changelog entry for ApplicationRecord was a bit confusing. Thank you guys for helping me get it in a better shape. [ci skip]
* | | Merge pull request #22626 from ↵David Heinemeier Hansson2015-12-1714-162/+182
|\ \ \ | | | | | | | | | | | | | | | | gsamokovarov/appliation-record-documentation-fixes Appliation record documentation fixes
| * | | ApplicationRecord release notes entryGenadi Samokovarov2015-12-171-0/+19
| | | | | | | | | | | | | | | | [ci skip]
| * | | ApplicationRecord documentation passGenadi Samokovarov2015-12-1713-162/+163
| |/ / | | | | | | | | | | | | | | | | | | This is a pass over the documentation which fills the missing gaps of `ApplicationRecord`. [ci skip]
* | | Merge pull request #22586 from rails/merge-action-cableDavid Heinemeier Hansson2015-12-1789-22/+3678
|\ \ \ | |/ / |/| | Merge Action Cable into master
| * | Fix testsDavid Heinemeier Hansson2015-12-171-2/+0
| | |
| * | Don't mount the ActionCable server by defaultDavid Heinemeier Hansson2015-12-172-2/+2
| | | | | | | | | | | | | | | | | | Since we require you to enable it on the client-side, let us do the same on the server-side. Then you’re not running an EventMachine unless you need to.
| * | 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
| | | | | | | | | | | | Rack::Server already does it work for us if the server is installed.
| * | 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
| | | | | | | | | | | | | | | Still missing the stuff in app/ – we need to basically switch from a * match to specifically picking out what we need.
| * | 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 ↵David Heinemeier Hansson2015-12-168-38/+16
| | | | | | | | | | | | Application* stubs
| * | 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
| | | |