aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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]
* | | Merge pull request #24218 from schneems/schneems/match-loggerRichard Schneeman2016-03-172-10/+26
|\ \ \ | | | | | | | | Document and Match the Rails logger interface
| * | | Document and Match the Rails logger interfaceschneems2016-03-162-10/+26
| |/ / | | | | | | | | | | | | | | | The logger interface to get all Rails features is not obvious. This change adds documentation on how to assign a logger that will use all Rails features. We are also matching the stdout logging interface to the default logger in bootstrap https://github.com/rails/rails/blob/f5a5988352b165143f0f9d622707c351c1470882/railties/lib/rails/application/bootstrap.rb#L42-L45.
* | | Merge pull request #24201 from rails/rake-db-createRafael França2016-03-173-10/+17
|\ \ \ | |/ / |/| | Creates development and test databases in db:migrate task
| * | Creates development and test databases in db:migrate taskRafael Mendonça França2016-03-143-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a334425caff9b2140d5e99fcfc2eb8c4ab10bdfa. The main reason is that now the workflow is inconsistent when using spring. When using spring `RAILS_ENV` is always set, so only one database is created. This means that in development `bin/rake db:create` and `bundle exec rake db:create` have different results. It also breaks the `bin/setup` script since `bin/rake db:setup db:test:prepare` will fail.
* | | Merge pull request #24215 from shiraikenta/modify-atom-feed-helper-rbJon Moss2016-03-161-1/+1
|\ \ \ | | | | | | | | fix a comment in atom_feed_helper.rb
| * | | fix a comment in atom_feed_helper.rb白井 健太2016-03-161-1/+1
|/ / /
* | | Merge pull request #24205 from delftswa2016/improve-activesupport-dependenciesXavier Noria2016-03-161-3/+6
|\ \ \ | | | | | | | | Improve ActiveSupport::Dependencies code understanding
| * | | Improve code readability in ActiveSupport::DependenciesAaron Ang2016-03-161-5/+6
| | | |
| * | | Add comments to ActiveSupport::Dependencies to help understandingAaron Ang2016-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous patch, all log-related stuff was removed. However, some logs are still useful to understand the code. Therefore, in this patch, I put those log messages back as comments. [ci skip]
* | | | adds .gitattributes to enable Ruby-awarenessXavier Noria2016-03-161-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This configuration improves git diff, git log -p -W, git grep -p, ..., and allows to inspect the history of a method with a command like git log -L:new_constants_in:activesupport/lib/active_support/dependencies.rb Let me also appeal to authority by saying it is present in the Ruby repository as well https://github.com/ruby/ruby/blob/trunk/.gitattributes :)
* | | no need to clear an unusued collectionXavier Noria2016-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the code reaches that line new_constants is no longer needed. We only need here to iterate over it to discard stuff and done. Note that constant_watch_stack.new_constants returns a new reference each time it is invoked, so that #clear call was not cleaning state in some internal structure (which would have been a bit dirty as well at this level of coupling).
* | | removes unreachable codeXavier Noria2016-03-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This array literal cannot be reached. The previous begin either returns to the caller via the explicit return in the ensure block if all goes well, or else propagates whatever make the begin block abort execution. I have investigated the origin of this a bit. In the past the ensure block didn't have a return call, see for example c08547d. Later on the return was added in 4da4506, but the trailing literal was left there.
* | | tests the raising/throwing discards the watching stackXavier Noria2016-03-163-4/+8
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 05:17:43 +0000