aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Try running CI for ActionPack on JRubyGaurish Sharma2016-02-271-0/+5
* | | | | | | | | | | Merge pull request #23948 from ctm/remove_pathological_regexpRafael França2016-02-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber#sql_colorClifford T. Matthews2016-02-231-1/+1
* | | | | | | | | | | | Merge pull request #18766 from yasyf/issue_17864Sean Griffin2016-02-294-8/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Honour the order of the joining model in a `has_many :through`Yasyf Mohamedali2015-03-025-9/+69
* | | | | | | | | | | | Merge pull request #23963 from gsamokovarov/exception-wrapper-no-ac-requireKasper Timm Hansen2016-02-291-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Drop Action Controller require in ActionDispatch::ExceptionWrapperGenadi Samokovarov2016-02-291-1/+0
* | | | | | | | | | | | | Merge pull request #23955 from bdewater/doc-13897Sean Griffin2016-02-291-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add documentation for #13897 [skip ci]Bart de Water2016-02-291-3/+9
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #23957 from delftswa2016/fix-documentation-stylesheetArthur Nogueira Neves2016-02-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix value of CSS background-color property in Rails guideBas van IJzendoorn2016-02-291-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #23962 from mohitnatoo/rails_command_test_semanticsRafael França2016-02-291-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-6/+6
| * | | | | | | | | | | | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-5/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #23956 from delftswa2016/fix-documentationप्रथमेश Sonpatki2016-02-291-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix typos in Action View Overview guideBas van IJzendoorn2016-02-291-5/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #23951 from teoljungberg/warning-freeKasper Timm Hansen2016-02-292-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Address ruby warningsTeo Ljungberg2016-02-292-9/+9
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #22591 from gregmolnar/sslKasper Timm Hansen2016-02-282-2/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add `constraint_to` option to SSL middlewareGreg Molnar2016-02-282-2/+13
* | | | | | | | | | | Merge pull request #23929 from prathamesh-sonpatki/update-deprecation-message...Kasper Timm Hansen2016-02-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Update deprecation message shown when tasks from rails namespace are runPrathamesh Sonpatki2016-02-271-2/+2
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23946 from prathamesh-sonpatki/fix-ac-guideप्रथमेश Sonpatki2016-02-281-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix formatting in Action Cable guide [ci skip]Prathamesh Sonpatki2016-02-281-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23945 from prathamesh-sonpatki/rm-merge-conflictDavid Heinemeier Hansson2016-02-281-5/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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