aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix merge conflict in Action Cable guide [ci skip]Prathamesh Sonpatki2016-02-281-5/+2
* Further cleanup of the cable guideDavid Heinemeier Hansson2016-02-281-100/+51
* Merge pull request #23943 from y-yagi/remove_rake_wordप्रथमेश Sonpatki2016-02-282-4/+4
|\
| * remove "rake" word [ci skip]yuuji.yaginuma2016-02-282-4/+4
* | Merge pull request #23944 from prathamesh-sonpatki/ac-guide-fixesप्रथमेश Sonpatki2016-02-281-25/+25
|\ \
| * | Fix typos in Action Cable guide [ci skip]Prathamesh Sonpatki2016-02-281-25/+25
|/ /
* | Merge pull request #23176 from davidkuhta/patch-1David Heinemeier Hansson2016-02-281-0/+671
|\ \
| * | Header TypoDavid Kuhta2016-02-231-1/+1
| * | `stream_for` exampleDavid Kuhta2016-02-231-0/+15
| * | Explicitly denote that channel.rb is a default file.David Kuhta2016-02-231-2/+2
| * | Change ActionCable.server.broadcast to XChannel.broadcast_toDavid Kuhta2016-02-231-10/+7
| * | Create action_cable_overview.md resolves #23176 [ci skip]David Kuhta2016-02-141-0/+659
* | | Merge pull request #23811 from iamvery/string-channelDavid Heinemeier Hansson2016-02-285-1/+37
|\ \ \ | |_|/ |/| |
| * | Update changelogJay Hayes2016-02-241-0/+4
| * | Ensure server broadcasts are to string queue namesJay Hayes2016-02-242-1/+16
| * | Convert stream broadcasting to a stringJay Hayes2016-02-242-0/+18
| * | whitespaceJay Hayes2016-02-241-1/+0
* | | Merge pull request #23937 from y-yagi/use_app_updateArun Agrawal2016-02-281-2/+2
|\ \ \
| * | | use `app:update` instead of deprecated `rails:update` [ci skip]yuuji.yaginuma2016-02-281-2/+2
|/ / /
* | | Merge pull request #23933 from HayleyCAnderson/ha-action-cable-docs-fixesJon Moss2016-02-275-15/+15
|\ \ \
| * | | Add small Action Cable documentation fixesHayley Anderson2016-02-275-15/+15
* | | | Update docs to point to new update task.Arthur Neves2016-02-271-3/+3
* | | | Merge pull request #23921 from y-yagi/remove_rack_cors_initializer_when_updatingArthur Nogueira Neves2016-02-272-0/+31
|\ \ \ \ | |/ / / |/| | |
| * | | remove rack cors initializer when updatingyuuji.yaginuma2016-02-272-0/+31
* | | | Fix test name typo prescence -> presenceeileencodes2016-02-271-1/+1
* | | | Merge pull request #23439 from ryohashimoto/160203_rake_railsKasper Timm Hansen2016-02-277-10/+29
|\ \ \ \
| * | | | The tasks in the rails task namespace is deprecated in favor of app namespace.Ryo Hashimoto2016-02-267-10/+29
* | | | | Merge pull request #23926 from kuldeepaggarwal/fix-docsप्रथमेश Sonpatki2016-02-271-1/+1
|\ \ \ \ \
| * | | | | [ci skip]Add info for specifying logger in different envrionments.Kuldeep Aggarwal2016-02-271-1/+1
|/ / / / /
* | | | | :scissors:Rafael Mendonça França2016-02-261-2/+2
* | | | | Merge pull request #23917 from chashmeetsingh/patch-1Rafael Mendonça França2016-02-261-1/+3
|\ \ \ \ \
| * | | | | Create tmp folder if not presentChashmeet Singh2016-02-271-1/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #23920 from ianks/masterRafael França2016-02-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Specify plaform: :mri for byebugIan Ker-Seymer2016-02-261-1/+1
|/ / / /
* | | | Merge pull request #23915 from sikachu/pr-23710-updateRafael França2016-02-263-3/+30
|\ \ \ \
| * | | | Add CHANGELOG entry for "Rendering ..." loggingPrem Sichanugrist2016-02-261-0/+6
| * | | | Update to use Subscriber#start insteadPrem Sichanugrist2016-02-262-7/+15
| * | | | Added log "Rendering ...", when starting to render a template, to log that we...Vipul A M2016-02-263-3/+16
* | | | | Merge pull request #23916 from lifo/same-redis-connection-for-subscription-an...Jeremy Daer2016-02-261-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use redis_connector to create redis connections for both subscriptions and br...Pratik Naik2016-02-261-2/+6
* | | | | Merge pull request #23906 from schneems/schneems/puma-3-0Richard Schneeman2016-02-262-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [close #23681] Use puma 3.0.0+ schneems2016-02-262-1/+6
|/ / / /
* | | | Merge pull request #23902 from prajakta-tambe/update-debuggings-rails-app-docप्रथमेश Sonpatki2016-02-261-5/+5
|\ \ \ \
| * | | | - Changed Debugging Rails Applications doc's logger introduction section. Cha...prajakta2016-02-261-5/+5
* | | | | Merge pull request #23899 from y-yagi/fix_typo_in_pull_request_templateप्रथमेश Sonpatki2016-02-261-1/+1
|\ \ \ \ \
| * | | | | fix typo in pull_request_template [ci skip]yuuji.yaginuma2016-02-261-1/+1
|/ / / / /
* | | | | :nail_care:Arthur Nogueira Neves2016-02-251-1/+1
* | | | | The async.callback call should live with the hijackMatthew Draper2016-02-261-4/+5
* | | | | Merge pull request #23738 from maclover7/issue-templateRafael França2016-02-252-0/+33
|\ \ \ \ \
| * | | | | Add `issue_template.md` and `pull_request_template.md`Jon Moss2016-02-182-0/+33