aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* show correct command name in help of rails runneryuuji.yaginuma2016-03-261-3/+4
| | | | | | If use rails together with `spring`, `spring` is rewrite `$0` in the interior command name. Therefore, for `$0` correct command name does not appear, `$0` has been modified so that it does not use.
* Merge pull request #24037 from ↵Jeremy Daer2016-03-231-53/+34
|\ | | | | | | | | jeremy/implicit-render-raises-on-browser-GET-requests-only Are you missing that template or did you omit it on purpose?
| * Refinement of our "are you missing a template or did you omit it on ↵Jeremy Daer2016-03-031-53/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | purpose?" heuristics Narrows the "are you in a browser, viewing the page?" check to exclude non-GET requests. Allows content-less APIs to use implicit responses without having to set a fake request format. This will need further attention. If you forget to redirect from a POST to a GET, you'll get a 204 No Content response that browsers will typically treat as… do nothing. It'll seem like the form just didn't work and knowing where to start debugging is non-obvious. On the flip side, redirecting from POST and others is the default, done everywhere, so it's less likely to be removed or otherwise missed. Alternatives are to do more explicit browser sniffing. Ref #23827.
* | Merge pull request #24259 from jeremy/cable/disconnected-client-errorsJeremy Daer2016-03-235-1/+136
|\ \ | | | | | | Cable: Gracefully handle disconnected clients
| * | Gracefully handle disconnected clientsJeremy Daer2016-03-205-1/+136
| | | | | | | | | | | | | | | | | | | | | | | | We'll get `Errno::ECONNRESET` if the client forcibly disconnected. Just close the socket rather than raising the exception. Handle other errors in `ClientSocket#write`, too, mirroring the Faye error handling which swallows all `StandardError` on write.
* | | Merge pull request #24167 from ↵Jeremy Daer2016-03-233-28/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/append_sql_mode_instead_of_overwriting_in_strict_mode Append sql_mode instead of overwriting in strict mode
| * | | Append sql_mode instead of overwriting in strict modeRyuta Kamizono2016-03-132-28/+37
| | | | | | | | | | | | | | | | For keep the default SQL mode.
* | | | Merge pull request #24284 from olivierlacan/patch-1Rafael França2016-03-231-1/+1
|\ \ \ \ | | | | | | | | | | Remove reference to unmaintained plugin/gem in Security guide
| * | | | Remove reference to unmaintained plugin/gemOlivier Lacan2016-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [restful-authentication](https://rubygems.org/gems/restful-authentication/versions/1.2.1) hasn't been updated since September 6th, 2012 so it might not be a great idea to recommend that Rails users try it out. Devise seems like a much more popular and secure solution that automatically resets sessions on sign in and out so it's a great example in this case. /cc @tenderlove @josevalim
* | | | | Merge pull request #24196 from koenpunt/plugin-action-cableKasper Timm Hansen2016-03-231-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | Bugfix: ActionCable not loaded when generating plugin without ActiveRecord
| * | | | Add ActionCable require statement to pluginKoen Punt2016-03-231-2/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating a plugin without ActiveRecord (-O), ActionCable wasn't include, which causes problems with the require action_cable statement in cable.js add active_job require statement also updated order of require statements to match with all.rb
* | | | [ci skip] Improve comment minitest plugin initialization.Kasper Timm Hansen2016-03-221-2/+4
| | | | | | | | | | | | | | | | | | | | Didn't feel we were clear enough about our motivation for placing Rails first and why we needed to call `load_plugins`.
* | | | Don't get ahead of ourselves.Kasper Timm Hansen2016-03-221-3/+3
| | | | | | | | | | | | | | | | The useless explicit self calls were driving me nuts.
* | | | Set Rails as the first minitest initialized plugin.Kasper Timm Hansen2016-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling `load_plugins` minitest would fill out its extensions, then we'd tackle ourselves on as the last plugin. Because minitest loads plugins in order we will ultimately have the last say on what reporters will be used. Invert that strategy by putting ourselves first and give other plugins plenty of leeway to override our default reporter setup. Fixes #24179.
* | | | Merge pull request #24278 from keram/rails_code_conventionRafael França2016-03-222-2/+2
|\ \ \ \ | | | | | | | | | | Use || instead of `or` in bin/(update|setup) tpl as preferred by rails code convention
| * | | | Use || instead of `or` as preferred in rails code conventionMarek L2016-03-222-2/+2
| | | | |
* | | | | Merge pull request #24276 from artfuldodger/patch-2Kasper Timm Hansen2016-03-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix WebSocket already open log message typo
| * | | | | Fix WebSocket already open log message typoJon Evans2016-03-221-1/+1
| |/ / / /
* | | | | Merge pull request #24275 from arekf/masterKasper Timm Hansen2016-03-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix typo for redirect_back (docs)
| * | | | Fix typo for redirect_backArkadiusz Fal2016-03-221-1/+1
|/ / / / | | | | | | | | | | | | | | | | indetical -> identical [skip ci]
* | | | Merge pull request #24271 from vipulnsward/grammar-fix-changelogYves Senn2016-03-221-1/+1
|\ \ \ \ | | | | | | | | | | Fixed abrupt start of sentence in changelog [ci skip]
| * | | | - Fixed abrupt start of sentence in changelogVipul A M2016-03-221-1/+1
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | guides, sync 5.0 release notes with changelogsYves Senn2016-03-224-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Sync AV, AR, AJ, AS, AM changelogs with our 5.0 release notes draft. This is a follow up to c94045d and contains changes made since the release of beta1.
* | | | guides, sync railties and AP changelogs with 5.0 release notes.Yves Senn2016-03-223-13/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] This updates the 5.0 release notes guide to reflect changes that happened after beta1 has been released. I'll sync the other changelogs later today but I'll push this batch to prevent against cumbersome merge conflicts.
* | | | Merge pull request #24269 from bquorning/require-enumerableAkira Matsuda2016-03-221-0/+1
|\ \ \ \ | | | | | | | | | | Require enumerable module when using #sum
| * | | | Require enumerable module when using #sumBenjamin Quorning2016-03-221-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | In https://github.com/rails/rails/commit/dfa48f200cbc5c1ca18457a8cde14642e12af5, a call to `#sum` was added. For that to always work, we need to require the core_ext/enumerable module.
* | | | Merge pull request #24261 from y-yagi/update_default_adapterJon Moss2016-03-212-5/+9
|\ \ \ \ | | | | | | | | | | update Active Job default adapter [ci skip]
| * | | | update Active Job default adapter [ci skip]yuuji.yaginuma2016-03-222-5/+9
| | |/ / | |/| | | | | | | | | | Follow up to 625baa69d14881ac49ba2e5c7d9cac4b222d7022
* | | | Merge pull request #24258 from jeremy/cable/faye-and-isolated-testsJeremy Daer2016-03-212-3/+15
|\ \ \ \ | | | | | | | | | | Cable: add isolated tests and FAYE=1 test runs
| * | | | Cable: add isolated tests and FAYE=1 test runsJeremy Daer2016-03-202-3/+15
| | | | |
* | | | | Merge pull request #24253 from y-yagi/change_default_value_of_cachingKasper Timm Hansen2016-03-212-2/+3
|\ \ \ \ \ | | | | | | | | | | | | changed default value of `caching` option to `nil`
| * | | | | changed default value of `caching` option to `nil`yuuji.yaginuma2016-03-212-2/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The default is that's false, caching even if you do not specify the caching option is determined not to use, and `tmp/caching-dev.txt` will be deleted. If it is this, regardless of whether or not there is `tmp/caching-dev.txt`, be sure to order would be necessary to specify the caching option, I think that in than good to so as not to do anything by default.
* | | | | Merge pull request #24243 from dewski/dont-upgrade-file-watcherArthur Neves2016-03-212-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Comment out config.file_watcher during Rails upgrade process
| * | | | | Add tests for file_watcher config on updateArthur Neves2016-03-211-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | [related #24243]
| * | | | | Don't upgrade config.file_watcher during upgrade pathGarrett Bjerkhoel2016-03-181-0/+5
| | | | | |
* | | | | | Fix generator test to match to use the stringRafael Mendonça França2016-03-212-2/+2
| | | | | |
* | | | | | Merge pull request #24231 from hallmatt/masterRafael Mendonça França2016-03-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | switched layout :mailer to a string so that mail layout can be properly sent
| * | | | | | switched layout :mailer to a string so that mail layout can be properly ↵Matt Hall2016-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | found and mail can be delivered properly
* | | | | | | Keep all session tests in the same fileRafael Mendonça França2016-03-212-46/+28
| | | | | | |
* | | | | | | Merge pull request #24229 from maclover7/fix-24222Rafael Mendonça França2016-03-213-1/+51
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | Fix request.reset_session for API controllers
| * | | | | | Fix request.reset_session for API controllersJon Moss2016-03-193-1/+51
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to that `ActionDispatch::Flash` (the flash API's middleware) is not included for API controllers, the `request.reset_session` method, which relies on there being a `flash=` method which is in fact defined by the middleware, was previously breaking. Similarly to how add46482a540b33184f3011c5c307f4b8e90c9cc created a method to be overridden by the flash middleware in order to ensure non-breakage, this is how flashes are now reset. Fixes #24222
* | | | | | Merge pull request #24244 from bronson/asset-pipeline-docJon Moss2016-03-181-7/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | remove Rails 4 text from asset pipeline guide
| * | | | | remove Rails 4 text from asset pipeline guideScott Bronson2016-03-181-7/+3
|/ / / / /
* | | | | Merge pull request #22518 from ↵Arthur Nogueira Neves2016-03-182-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | RochesterinNYC/better-error-message-for-includes-relations-missing Improve error message for missing relations for includes and eager_load
| * | | | | Improve clarity of error message for missing includes and eager_loadJames Wen2016-01-282-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | relations
* | | | | | Merge pull request #24223 from mechanicles/reserved-keys-testsEileen M. Uchitelle2016-03-181-6/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added more tests for reserved hash keys of ActiveJob::Arguments.
| * | | | | | Added more tests for reserved hash keys of ActiveJob::Arguments.Santosh Wadghule2016-03-171-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added tests for checking all reserved hash keys of ActiveJob::Arguments. - Moved unrelated code from the test to the correct place, i.e. newly created test.
* | | | | | | Merge pull request #24226 from mabras/masterXavier Noria2016-03-181-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | use rails 5 favicon.ico for rails guides [ci skip]
| * | | | | | use rails 5 favicon.ico for rails guidesMohamad Abras2016-03-171-0/+0
| | |_|/ / / | |/| | | |
* / | | | | Evented Redis adapter: log reconnect failures as errors, not just infoJeremy Daer2016-03-171-1/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 05:00:50 +0000