aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #22739 from akshay-vishnoi/fix-docsRafael França2015-12-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Fix typoAkshay Vishnoi2015-12-221-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cableRafael França2015-12-212-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure Action Cable files are removed when `skip_action_cable` is set.Jey Balachandran2015-12-212-0/+11
* | | | | | | | | | Use the generators options to not generate channel assetsRafael Mendonça França2015-12-212-7/+6
* | | | | | | | | | Merge pull request #22727 from prathamesh-sonpatki/fix-masterKasper Timm Hansen2015-12-211-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure that assets are enabled back after the test that tests assets are disa...Prathamesh Sonpatki2015-12-211-1/+4
* | | | | | | | | | | Merge pull request #22736 from akshay-vishnoi/fix-changelogsRafael França2015-12-212-6/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718)Akshay Vishnoi2015-12-222-6/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #22735 from reshleman/patch-1Claudio B2015-12-211-2/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update "Support" in ActionCable README [ci skip]Robert Eshleman2015-12-211-2/+10
|/ / / / / / / / / / /
* | | | | | | | | | | Remember the parameter hash we returnMatthew Draper2015-12-221-1/+1
* | | | | | | | | | | Merge pull request #22693 from yui-knk/use_appropriate_rebuild_taskYves Senn2015-12-211-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use an appropriate rebuild task on Travisyui-knk2015-12-221-1/+8
* | | | | | | | | | | | Merge pull request #22684 from teknofire/fix-using-add_resource-with-a-block-...Yves Senn2015-12-213-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixes using `add_source` with a block after using `gem` in a custom railsWill Fisher2015-12-213-1/+14
* | | | | | | | | | | | Merge pull request #22722 from k0kubun/use-cgi-html-escapeMatthew Draper2015-12-221-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use CGI.escapeHTML for html escapeTakashi Kokubun2015-12-211-4/+2
* | | | | | | | | | | | | Merge pull request #22717 from nning/actioncable-readme-fixesDavid Heinemeier Hansson2015-12-211-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | One long dash in headline.henning mueller2015-12-211-1/+1
| * | | | | | | | | | | | | Use default cable path in (in-app) server config example.henning mueller2015-12-211-3/+3
| * | | | | | | | | | | | | Replaced "Cable" by "ActionCable" in CoffeeScript examples.henning mueller2015-12-211-2/+2
* | | | | | | | | | | | | | Merge pull request #22692 from ryohashimoto/22669_api_generatorDavid Heinemeier Hansson2015-12-212-1/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Action Cable channel generator should not create JS assets in --api modeRyo Hashimoto2015-12-192-1/+33
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #22698 from y-yagi/display_detail_info_on_inline_reportKasper Timm Hansen2015-12-215-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | display detailed information in inline reportingyuuji.yaginuma2015-12-215-7/+19
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Revert "Merge pull request #22486 from methyl/fix-includes-for-groupped-assoc...Yves Senn2015-12-213-26/+1
* | | | | | | | | | | | | Merge pull request #22719 from akshay-vishnoi/fix-docsYves Senn2015-12-211-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [ci skip] `rails new project` generates README.md nowAkshay Vishnoi2015-12-211-3/+3
* | | | | | | | | | | | | | Merge pull request #22718 from gsamokovarov/fix-changelogsYves Senn2015-12-218-25/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | No more no changes entries in the CHANGELOGsGenadi Samokovarov2015-12-218-25/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #22581 from hirocaster/fix-expect-sample-codeYves Senn2015-12-211-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Change output timming of sample codehirocaster2015-12-141-2/+2
* | | | | | | | | | | | | | Merge pull request #22486 from methyl/fix-includes-for-groupped-associationYves Senn2015-12-213-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Pass SQL group by values when including scoped associationLucjan Suski2015-12-153-1/+25
* | | | | | | | | | | | | | | Merge pull request #22706 from habermann24/fix_mattr_accessor_docsYves Senn2015-12-211-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix documentation for mattr_accessor methodsJan Habermann2015-12-201-6/+6
* | | | | | | | | | | | | | | Merge pull request #22716 from mattreduce/mattreduce-getting-started-guideMatthew Draper2015-12-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update README extension in Getting Started guideMatthew Conway2015-12-201-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #22712 from jonatack/update-changelogsRafael França2015-12-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add missing @claudiob credit to change log [skip ci]Jon Atack2015-12-201-0/+1
* | | | | | | | | | | | | | | | Merge pull request #22715 from kamipo/remove_mysql_adapterSean Griffin2015-12-2013-98/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove legacy mysql adapterRyuta Kamizono2015-12-2113-98/+87
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #22711 from jonatack/add-missing-period-in-upgrading-rails...Kasper Timm Hansen2015-12-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Upgrade Guide: Add missing period, :scissors: whitespace [skip ci]Jon Atack2015-12-201-2/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #22704 from rajcybage/mysql_fixSean Griffin2015-12-203-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | mysql2 adapter instead of mysql [ci skip]Rajarshi Das2015-12-203-4/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #22707 from yui-knk/fix_warningRichard Schneeman2015-12-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Suppress warning ambiguous first argumentyui-knk2015-12-201-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-12-203-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |