Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #22739 from akshay-vishnoi/fix-docs | Rafael França | 2015-12-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ci skip] Fix typo | Akshay Vishnoi | 2015-12-22 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cable | Rafael França | 2015-12-21 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Ensure Action Cable files are removed when `skip_action_cable` is set. | Jey Balachandran | 2015-12-21 | 2 | -0/+11 | |
* | | | | | | | | | | Use the generators options to not generate channel assets | Rafael Mendonça França | 2015-12-21 | 2 | -7/+6 | |
* | | | | | | | | | | Merge pull request #22727 from prathamesh-sonpatki/fix-master | Kasper Timm Hansen | 2015-12-21 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Ensure that assets are enabled back after the test that tests assets are disa... | Prathamesh Sonpatki | 2015-12-21 | 1 | -1/+4 | |
* | | | | | | | | | | | Merge pull request #22736 from akshay-vishnoi/fix-changelogs | Rafael França | 2015-12-21 | 2 | -6/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718) | Akshay Vishnoi | 2015-12-22 | 2 | -6/+0 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #22735 from reshleman/patch-1 | Claudio B | 2015-12-21 | 1 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update "Support" in ActionCable README [ci skip] | Robert Eshleman | 2015-12-21 | 1 | -2/+10 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Remember the parameter hash we return | Matthew Draper | 2015-12-22 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #22693 from yui-knk/use_appropriate_rebuild_task | Yves Senn | 2015-12-21 | 1 | -1/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Use an appropriate rebuild task on Travis | yui-knk | 2015-12-22 | 1 | -1/+8 | |
* | | | | | | | | | | | | Merge pull request #22684 from teknofire/fix-using-add_resource-with-a-block-... | Yves Senn | 2015-12-21 | 3 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fixes using `add_source` with a block after using `gem` in a custom rails | Will Fisher | 2015-12-21 | 3 | -1/+14 | |
* | | | | | | | | | | | | Merge pull request #22722 from k0kubun/use-cgi-html-escape | Matthew Draper | 2015-12-22 | 1 | -4/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Use CGI.escapeHTML for html escape | Takashi Kokubun | 2015-12-21 | 1 | -4/+2 | |
* | | | | | | | | | | | | | Merge pull request #22717 from nning/actioncable-readme-fixes | David Heinemeier Hansson | 2015-12-21 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | One long dash in headline. | henning mueller | 2015-12-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Use default cable path in (in-app) server config example. | henning mueller | 2015-12-21 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | Replaced "Cable" by "ActionCable" in CoffeeScript examples. | henning mueller | 2015-12-21 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | Merge pull request #22692 from ryohashimoto/22669_api_generator | David Heinemeier Hansson | 2015-12-21 | 2 | -1/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Action Cable channel generator should not create JS assets in --api mode | Ryo Hashimoto | 2015-12-19 | 2 | -1/+33 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #22698 from y-yagi/display_detail_info_on_inline_report | Kasper Timm Hansen | 2015-12-21 | 5 | -7/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | display detailed information in inline reporting | yuuji.yaginuma | 2015-12-21 | 5 | -7/+19 | |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Revert "Merge pull request #22486 from methyl/fix-includes-for-groupped-assoc... | Yves Senn | 2015-12-21 | 3 | -26/+1 | |
* | | | | | | | | | | | | | Merge pull request #22719 from akshay-vishnoi/fix-docs | Yves Senn | 2015-12-21 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | [ci skip] `rails new project` generates README.md now | Akshay Vishnoi | 2015-12-21 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | Merge pull request #22718 from gsamokovarov/fix-changelogs | Yves Senn | 2015-12-21 | 8 | -25/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | No more no changes entries in the CHANGELOGs | Genadi Samokovarov | 2015-12-21 | 8 | -25/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #22581 from hirocaster/fix-expect-sample-code | Yves Senn | 2015-12-21 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Change output timming of sample code | hirocaster | 2015-12-14 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | Merge pull request #22486 from methyl/fix-includes-for-groupped-association | Yves Senn | 2015-12-21 | 3 | -1/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Pass SQL group by values when including scoped association | Lucjan Suski | 2015-12-15 | 3 | -1/+25 | |
* | | | | | | | | | | | | | | | Merge pull request #22706 from habermann24/fix_mattr_accessor_docs | Yves Senn | 2015-12-21 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix documentation for mattr_accessor methods | Jan Habermann | 2015-12-20 | 1 | -6/+6 | |
* | | | | | | | | | | | | | | | Merge pull request #22716 from mattreduce/mattreduce-getting-started-guide | Matthew Draper | 2015-12-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Update README extension in Getting Started guide | Matthew Conway | 2015-12-20 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #22712 from jonatack/update-changelogs | Rafael França | 2015-12-20 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Add missing @claudiob credit to change log [skip ci] | Jon Atack | 2015-12-20 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | Merge pull request #22715 from kamipo/remove_mysql_adapter | Sean Griffin | 2015-12-20 | 13 | -98/+87 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Remove legacy mysql adapter | Ryuta Kamizono | 2015-12-21 | 13 | -98/+87 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #22711 from jonatack/add-missing-period-in-upgrading-rails... | Kasper Timm Hansen | 2015-12-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Upgrade Guide: Add missing period, :scissors: whitespace [skip ci] | Jon Atack | 2015-12-20 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #22704 from rajcybage/mysql_fix | Sean Griffin | 2015-12-20 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | mysql2 adapter instead of mysql [ci skip] | Rajarshi Das | 2015-12-20 | 3 | -4/+4 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #22707 from yui-knk/fix_warning | Richard Schneeman | 2015-12-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Suppress warning ambiguous first argument | yui-knk | 2015-12-20 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-12-20 | 3 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |