aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Add Rails 5.0 Release NotesJon Moss2015-12-211-0/+188
| | |/ / | |/| |
* | | | Merge pull request #22483 from y-yagi/use_bin_test_in_plugins_guideYves Senn2015-12-221-32/+67
|\ \ \ \
| * | | | use `bin/test` in plugins guide [ci skip]yuuji.yaginuma2015-12-221-32/+67
| |/ / /
* | | | Merge pull request #22752 from y-yagi/remove_div_for_from_docMatthew Draper2015-12-221-8/+9
|\ \ \ \
| * | | | do not use `div_for` in example [ci skip]yuuji.yaginuma2015-12-221-8/+9
| |/ / /
* | | | Merge pull request #22754 from ryohashimoto/151222_remove_content_tag_forMatthew Draper2015-12-221-7/+5
|\ \ \ \
| * | | | remove content_tag_for exampleRyo Hashimoto2015-12-221-7/+5
| | |/ / | |/| |
* | | | Merge pull request #22753 from gwincr11/keeps-options-breaks-assetsMatthew Draper2015-12-221-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix .keep file issue with ActionCableCory Gwin2015-12-211-1/+1
* | | | Merge pull request #22746 from davidenglishmusic/masterGuillermo Iguaran2015-12-211-1/+1
|\ \ \ \
| * | | | corrects a typoDavid English2015-12-211-1/+1
|/ / / /
* | | | Merge pull request #22709 from jonatack/clarify-explanation-for-new-config-ha...Rafael França2015-12-211-1/+1
|\ \ \ \
| * | | | Clarify config settings for AS::halt_callback_chains_on_return_falseJon Atack2015-12-211-1/+1
* | | | | Merge pull request #22745 from claudiob/fix-hartl-linkClaudio B2015-12-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix Rails tutorial linkclaudiob2015-12-211-1/+1
|/ / / /
* | | | 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