Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge pull request #23185 from droptheplot/actioncable-custom-channels | Kasper Timm Hansen | 2016-01-24 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Rename channels_path var and fix channel_paths method for ActionCable config | Sergey Novikov | 2016-01-23 | 1 | -5/+5 | |
| * | | | | | | | | | | | Allow adding custom paths for action_cable channels | Sergey Novikov | 2016-01-22 | 1 | -2/+4 | |
* | | | | | | | | | | | | Merge pull request #23218 from karlfreeman/bump_mail | Santiago Pastorino | 2016-01-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Bump mail gem constraint from [~> 2.5, >= 2.5.4] to ~> 2.6 | Karl Freeman | 2016-01-24 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #23081 from prathamesh-sonpatki/fix-cache-key-for-queries-... | Kasper Timm Hansen | 2016-01-24 | 2 | -2/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix ActiveRecord::Relation#cache_key for relations with no results | Prathamesh Sonpatki | 2016-01-22 | 2 | -2/+13 | |
* | | | | | | | | | | | | | Merge pull request #23212 from vipulnsward/bin-rails | Kasper Timm Hansen | 2016-01-24 | 9 | -95/+96 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Be consistent in testing outputs from railties test and use /bin/rails everyw... | Vipul A M | 2016-01-24 | 9 | -95/+96 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #23152 from matthewd/actioncable-concurrent | David Heinemeier Hansson | 2016-01-24 | 27 | -106/+385 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Ditch the EM error logging helper | Matthew Draper | 2016-01-24 | 3 | -11/+1 | |
| * | | | | | | | | | | | | | Import the relevant portions of faye-websocket | Matthew Draper | 2016-01-24 | 14 | -44/+332 | |
| * | | | | | | | | | | | | | Using a hacked faye-websocket, drop EventMachine | Matthew Draper | 2016-01-24 | 17 | -69/+70 | |
* | | | | | | | | | | | | | | Merge pull request #23213 from Ferdy89/docs_format_contraints_with_glob | Jon Moss | 2016-01-24 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Update the exception of format constraint in routes | Fernando Seror | 2016-01-23 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | Put test-case dependent helper Class inside the test case | Akira Matsuda | 2016-01-24 | 3 | -39/+39 | |
* | | | | | | | | | | | | | | | :warning: mismatched indentations at 'end' with 'unless' | Akira Matsuda | 2016-01-24 | 2 | -4/+4 | |
* | | | | | | | | | | | | | | | Test files has to be named *_test.rb | Akira Matsuda | 2016-01-24 | 2 | -0/+0 | |
* | | | | | | | | | | | | | | | Merge pull request #23179 from prathamesh-sonpatki/pare-back-default-index-op... | Matthew Draper | 2016-01-25 | 11 | -44/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Pare back default `index` option for the migration generator | Prathamesh Sonpatki | 2016-01-24 | 11 | -44/+64 | |
* | | | | | | | | | | | | | | | Merge pull request #23217 from matthewd/adapter-tests | Matthew Draper | 2016-01-24 | 17 | -37/+389 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add tests for the ActionCable adapters | Matthew Draper | 2016-01-24 | 9 | -0/+236 | |
| * | | | | | | | | | | | | | | Allow subscription adapters to be shut down | Matthew Draper | 2016-01-24 | 4 | -14/+40 | |
| * | | | | | | | | | | | | | | Add Async and Inline adapters | Matthew Draper | 2016-01-24 | 2 | -0/+44 | |
| * | | | | | | | | | | | | | | Normalize on no arguments for the success callback | Matthew Draper | 2016-01-24 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | Split internal subscriber tracking from Postgres adapter | Matthew Draper | 2016-01-24 | 3 | -24/+70 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #23216 from prathamesh-sonpatki/fix-23137 | Matthew Draper | 2016-01-24 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Rails::Generators::Actions#gem should work even if frozen string is passed as... | Prathamesh Sonpatki | 2016-01-24 | 2 | -1/+9 | |
|/ / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / | Add environment back to db:structure:load | Andrew White | 2016-01-23 | 1 | -1/+1 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #23102 from yui-knk/foreign_type_to_singular_association | Eileen M. Uchitelle | 2016-01-23 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Define `:foreign_type` as a valid option in `SingularAssociation` | yui-knk | 2016-01-19 | 3 | -3/+3 | |
* | | | | | | | | | | | | | Use the database type to deserialize enum | Sean Griffin | 2016-01-23 | 4 | -4/+19 | |
* | | | | | | | | | | | | | Document scoping issue with Time.use_zone | Andrew White | 2016-01-23 | 1 | -1/+17 | |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #23206 from joyvuu-dave/action_cable_api_fix | Kasper Timm Hansen | 2016-01-23 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | prevent --skip-action-cable from erroring when --api option is used | Dave Riddle | 2016-01-22 | 2 | -1/+13 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #23207 from y-yagi/fix_path_of_actioncable_config | प्रथमेश Sonpatki | 2016-01-23 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fix path of Action Cable configuration file [ci skip] | yuuji.yaginuma | 2016-01-23 | 1 | -2/+2 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-01-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [ci skip] An internal link is an relative path | yui-knk | 2015-12-23 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #23201 from dkniffin/patch-1 | Jon Moss | 2016-01-22 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Move ApplicationCable::Channel section of readme | Derek Kniffin | 2016-01-22 | 1 | -7/+7 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #23126 from Gaurav2728/implement_rake_to_rails_taks_in_doc | Jon Moss | 2016-01-22 | 1 | -43/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Rails 5.0+ rake commands implemented in Rails Framework itself. We prefer to ... | Gaurav Sharma | 2016-01-22 | 1 | -43/+62 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #23194 from britg/patch-2 | Matthew Draper | 2016-01-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Use the correct reference to the redis connection | Brit Gardner | 2016-01-22 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #23177 from vipulnsward/testing-pass-1 | Jon Moss | 2016-01-22 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | First pass over parts of Testing guide | Vipul A M | 2016-01-22 | 1 | -7/+7 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #23182 from palkan/add-docs-tsrange | Jon Moss | 2016-01-22 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | [ci skip] Add note about tsrange and timezone awareness to docs | palkan | 2016-01-22 | 1 | -1/+5 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #23178 from vipulnsward/rm-changelog | Andrew White | 2016-01-22 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ |