aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #22743 from maclover7/fix-22738Rafael Mendonça França2015-12-222-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | Add #== back to ActionDispatch::MiddlewareStack::Middleware
| * | | | Add #== back to ActionDispatch::MiddlewareStack::MiddlewareJon Moss2015-12-212-0/+21
| | |/ / | |/| | | | | | | | | | | | | | This was causing bug #22738 to occur. Also added extra tests to make sure everything is A-OK.
* | | | Merge pull request #22749 from sblackstone/mysql2flagsMatthew Draper2015-12-232-2/+14
|\ \ \ \ | | | | | | | | | | Add support for passing flags to MySQL2 adapter by array
| * | | | Add support for passing flags to MySQL2 adapter by arrayStephen Blackstone2015-12-222-2/+14
| | |_|/ | |/| |
* | | | Merge pull request #22757 from paulkogel/patch-1Rafael França2015-12-221-1/+1
|\ \ \ \ | | | | | | | | | | seeds.rb.tt: fix English.
| * | | | seeds.rb.tt: fix English.Paul Kögel2015-12-221-1/+1
| | | | |
* | | | | Merge pull request #22758 from LaurierMantel/release_5_0_typoArun Agrawal2015-12-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fixes typo in 5.0 release notes
| * | | | | fixes typo in 5.0 release notesLaurier Mantel2015-12-221-1/+1
|/ / / / /
* | | | | Merge pull request #22755 from y-yagi/remove_cors_initializer_from_rails_appSean Griffin2015-12-222-0/+12
|\ \ \ \ \ | |/ / / / |/| | | | remove cors initializer from rails app
| * | | | remove cors initializer from rails appyuuji.yaginuma2015-12-222-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | `rack-cors` gem is defined in Gemfile by default only if the api, not defined by default in rails app.
* | | | | release notes, extract notable changes from Action Mailer CHANGELOG.Yves Senn2015-12-222-3/+21
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | release notes, extract notable changes from Action View CHANGELOG.Yves Senn2015-12-222-7/+28
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | release notes, use past tense. [ci skip]Yves Senn2015-12-221-15/+15
| | | | |
* | | | | release notes, extract notable changes from Action Pack CHANGELOG.Yves Senn2015-12-222-24/+139
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | [ci skip] Steal `ActionCable.server` mounting from routes template.Kasper Timm Hansen2015-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Mounting it as prescribed here: https://github.com/rails/rails/blob/0d1d50c2db40ea1a9d3bebfb0c35da43bbd4d27f/railties/lib/rails/generators/rails/app/templates/config/routes.rb#L5
* | | | | release notes, extract notable changes from Railties CHANGELOG.Yves Senn2015-12-222-9/+53
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | guides, restructure Rails 5.0 release notes. [ci skip]Yves Senn2015-12-222-91/+160
|/ / / / | | | | | | | | | | | | | | | | xref #22701. xref #20612.
* | | | Merge pull request #22701 from maclover7/rails-5-release-notesYves Senn2015-12-221-0/+188
|\ \ \ \ | | | | | | | | | | [WIP] Rails 5 release notes [ci skip]
| * | | | Add Rails 5.0 Release NotesJon Moss2015-12-211-0/+188
| | |/ / | |/| | | | | | | | | | [ci skip]
* | | | 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]
| * | | | use `bin/test` in plugins guide [ci skip]yuuji.yaginuma2015-12-221-32/+67
| |/ / / | | | | | | | | | | | | | | | | `bin/test` can use the same API as the `bin/rails test`, since it is possible to run a flexible test than rake, I think better to use a guide even `bin/test`.
* | | | 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]
| * | | | do not use `div_for` in example [ci skip]yuuji.yaginuma2015-12-221-8/+9
| |/ / / | | | | | | | | | | | | `div_for` removed in 01e94ef
* | | | Merge pull request #22754 from ryohashimoto/151222_remove_content_tag_forMatthew Draper2015-12-221-7/+5
|\ \ \ \ | | | | | | | | | | remove content_tag_for example
| * | | | 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 ActionCable
| * | | Fix .keep file issue with ActionCableCory Gwin2015-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #22708 Make sure the channels file is create in assets/javascript/ so require tree works in asset pipeline.
* | | | Merge pull request #22746 from davidenglishmusic/masterGuillermo Iguaran2015-12-211-1/+1
|\ \ \ \ | | | | | | | | | | corrects a typo [ci-skip]
| * | | | corrects a typoDavid English2015-12-211-1/+1
|/ / / /
* | | | Merge pull request #22709 from ↵Rafael França2015-12-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | jonatack/clarify-explanation-for-new-config-halt-callback-chains Clarify config settings for AS::halt_callback_chains_on_return_false
| * | | | Clarify config settings for AS::halt_callback_chains_on_return_falseJon Atack2015-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | Merge pull request #22745 from claudiob/fix-hartl-linkClaudio B2015-12-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix Rails tutorial link
| * | | | Fix Rails tutorial linkclaudiob2015-12-211-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] The old link is 404 not found. The link matches what the rest of the documentation already points to: * https://github.com/rails/rails/blame/2de2263118d6763c11a02db05079a5b7a97a0a34/guides/source/getting_started.md#L2052 * https://github.com/rails/rails/blame/2de2263118d6763c11a02db05079a5b7a97a0a34/README.md#L74
* | | | Merge pull request #22739 from akshay-vishnoi/fix-docsRafael França2015-12-211-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Fix typo
| * | | | [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.
| * | | | Ensure Action Cable files are removed when `skip_action_cable` is set.Jey Balachandran2015-12-212-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Action Cable generators creates four files which need to be removed if `skip_action_cable` is set. 1. `app/assets/javascripts/cable.coffee` 2. `app/channels/application_cable/channel.rb` 3. `app/channels/application_cable/connection.rb` 4. `config/redis/cable.yml` Fixes #22669.
* | | | | 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 disabled
| * | | | | Ensure that assets are enabled back after the test that tests assets are ↵Prathamesh Sonpatki2015-12-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | disabled
* | | | | | 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)
| * | | | | | [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]
| * | | | | | Update "Support" in ActionCable README [ci skip]Robert Eshleman2015-12-211-2/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * Add link to API documentation * Link to issue tracker for rails/rails (instead of rails/actioncable) * Add link to rails-core mailing list for feature requests
* | | | | | Remember the parameter hash we returnMatthew Draper2015-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Callers expect to be able to manipulate it.
* | | | | | Merge pull request #22693 from yui-knk/use_appropriate_rebuild_taskYves Senn2015-12-211-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use an appropriate rebuild task on Travis
| * | | | | | Use an appropriate rebuild task on Travisyui-knk2015-12-221-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `db:mysql:rebuild` when testing mysql2, `db:postgresql:rebuild` when testing postgresql and no rebuild task when testing others.
* | | | | | | Merge pull request #22684 from ↵Yves Senn2015-12-213-1/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | teknofire/fix-using-add_resource-with-a-block-after-gem-call Fix using add_resource with a block after gem in custom generators
| * | | | | | Fixes using `add_source` with a block after using `gem` in a custom railsWill Fisher2015-12-213-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | generator template.
* | | | | | | Merge pull request #22722 from k0kubun/use-cgi-html-escapeMatthew Draper2015-12-221-4/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use CGI.escapeHTML for html escape
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 15:19:30 +0000