aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31195 from mltsy/patch-2Vipul A M2017-11-241-1/+1
|\ | | | | Fix tld_length documentation in ActionDispatch::Cookies [ci skip]
| * Fix tld_length documentationJoe Marty2017-11-211-1/+1
| | | | | | Change recommendation for tld_length (for sharing cookies across subdomains of a 2-token TLD), to 2 instead of 1.
* | Correct render method's response header's content type for option(:body) ↵Avneet Singh Malhotra2017-11-241-1/+1
| | | | | | | | from text/html to text/plain. (#31212)
* | Avoid connecting to GCS during app bootGeorge Claghorn2017-11-232-12/+14
| |
* | Merge pull request #31178 from mtsmfm/fix-unstable-testRyuta Kamizono2017-11-231-2/+10
|\ \ | | | | | | Fix unstable test test_delegate_socket_errors_to_on_error_handler
| * | Fix unstable test test_delegate_socket_errors_to_on_error_handlerFumiaki MATSUSHIMA2017-11-231-2/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I often face the following error when running test/connection/client_socket_test.rb: ``` $ bin/test test/connection/client_socket_test.rb:38 Run options: --seed 44035 # Running: F Failure: ActionCable::Connection::ClientSocketTest#test_delegate_socket_errors_to_on_error_handler [/app/actioncable/test/connection/client_socket_test.rb:47]: --- expected +++ actual @@ -1 +1 @@ -["foo"] +["Broken pipe", "Broken pipe", "Broken pipe", "foo"] ``` It can be reproduced easily by applying the following patch: ``` diff --git a/actioncable/test/connection/client_socket_test.rb b/actioncable/test/connection/client_socket_test.rb index 2051216010..6bb9f13ea7 100644 --- a/actioncable/test/connection/client_socket_test.rb +++ b/actioncable/test/connection/client_socket_test.rb @@ -34,7 +34,8 @@ def on_error(message) @server.config.allowed_request_origins = %w( http://rubyonrails.com ) end - test "delegate socket errors to on_error handler" do + 1000.times do |i| + test "delegate socket errors to on_error handler #{i}" do run_in_eventmachine do connection = open_connection @@ -47,6 +48,7 @@ def on_error(message) assert_equal %w[ foo ], connection.errors end end + end test "closes hijacked i/o socket at shutdown" do run_in_eventmachine do ``` The cause is writing io from different thread at the same time. `connection.process` sends handshake message from [StreamEventLoop's thread][] whereas `connection.handle_open` sends welcome message from current thread. [StreamEventLoop's thread]: https://github.com/rails/rails/blob/067fc779c4560fff4812614a2f78f9248f3e55f8/actioncable/lib/action_cable/connection/stream_event_loop.rb#L75
* | Merge pull request #31194 from ↵Yuji Yaginuma2017-11-231-6/+1
|\ \ | | | | | | | | | | | | yahonda/attributes_before_type_cast_on_boolean_with_jruby No difference between JRuby and CRuby at test_read_attributes_before_…
| * | No difference between JRuby and CRuby at ↵Yasuo Honda2017-11-211-6/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_read_attributes_before_type_cast_on_a_boolean https://github.com/jruby/activerecord-jdbc-adapter ActiveRecord JDBC Adapter is actively developed and it supports Rails 5.1 now. This pull request addresses one of the failure when running ActiveRecord unit tests with ActiveRecord JDBC Adapter. As of right now, ActiveRecord JDBC Adapter supports Rails 5.1, not master branch then this test only can run on `5-1-stable` branch. But I have opened this pull request to `master` branch since this type cast should be going to work in the future versions of ActiveRecord JDBC Adapter . ```ruby $ ARCONN=jdbcmysql bin/test test/cases/attribute_methods_test.rb:203 Using jdbcmysql Run options: --seed 8874 F Finished in 0.709120s, 1.4102 runs/s, 1.4102 assertions/s. 1) Failure: AttributeMethodsTest#test_read_attributes_before_type_cast_on_a_boolean [/home/yahonda/git/rails/activerecord/test/cases/attribute_methods_test.rb:203]: Expected: "0" Actual: 0 1 runs, 1 assertions, 1 failures, 0 errors, 0 skips $ ```
* | Merge pull request #31202 from fgo/patch-21Rafael França2017-11-221-9/+9
|\ \ | | | | | | Update Action Cable Overview Guide [ci skip]
| * | Update Action Cable Overview Guide [ci skip]Francis Go2017-11-221-9/+9
| | |
* | | Merge pull request #31205 from tjschuck/doc_indentation_fixRyuta Kamizono2017-11-231-6/+6
|\ \ \ | | | | | | | | Fix CustomUrls#direct doc formatting
| * | | Fix CustomUrls#direct doc formattingT.J. Schuck2017-11-221-6/+6
|/ / / | | | | | | | | | | | | Particularly, the bulleted list was getting formatted as a code block because of the extra level of indentation. Pulling it back to the left makes it render properly as a list instead. [ci skip]
* | | Merge pull request #31204 from tjschuck/doc_fix_some_backticks_to_ttRafael França2017-11-2213-27/+27
|\ \ \ | | | | | | | | Update incorrect backtick usage in RDoc to teletype
| * | | Update incorrect backtick usage in RDoc to teletypeT.J. Schuck2017-11-2213-27/+27
| |/ / | | | | | | [ci skip]
* / / Make ActiveSupport::TimeZone.all independent of previous lookups (#31176)Chris LaRose2017-11-223-3/+23
|/ /
* | Merge pull request #29887 from willnet/generator-suggestion-localeYuji Yaginuma2017-11-222-1/+15
|\ \ | | | | | | Fix generator suggestion raise error when I18n.available_locales don’t include :en
| * | Fix generator suggestion raise error when I18n.available_locales don’t ↵willnet2017-11-222-1/+15
|/ / | | | | | | include :en
* | Fix loading ActiveStorage::DiskController when CSRF protection is disabled ↵George Claghorn2017-11-211-1/+1
| | | | | | | | by default
* | Fix that some ASt route helpers silently discarded optionsGeorge Claghorn2017-11-211-10/+10
|/
* Merge pull request #31188 from tgxworld/update_rack_testYuji Yaginuma2017-11-211-1/+1
|\ | | | | FIX: `rack-test` 0.7.1 probably got yanked.
| * Update `rack-test` to 0.8.Guo Xiang Tan2017-11-211-1/+1
|/
* Remove unused `em-hiredis`yuuji.yaginuma2017-11-212-8/+0
| | | | `em-hiredis` is unused since 48766e32d31651606b9f68a16015ad05c3b0de2c
* Provide attachment writersGeorge Claghorn2017-11-202-0/+40
| | | | | | | | | | | | | Permit creating a record and attaching files in a single step. # Before: User.create!(user_params.except(:avatar)).tap do |user| user.avatar.attach(user_params[:avatar]) end # After: User.create!(user_params) [Yoshiyuki Hirano & George Claghorn]
* MemCacheStore: Support expiring countersTakumasa Ochi2017-11-203-2/+31
| | | | | | | Support `expires_in` in `ActiveSupport::Cache::MemCacheStore#increment` and `#decrement`. Closes #30716.
* Load 5.2 defaults in ASt dummy appGeorge Claghorn2017-11-201-1/+1
|
* Fix direct uploads to local serviceGeorge Claghorn2017-11-203-0/+6
| | | | | | | | Disable CSRF protection for ActiveStorage::DiskController#update. The local disk service is intended to imitate a third-party service like S3 or GCS, so we don't care where direct uploads originate: they’re authorized by signed tokens. Closes #30290. [Shinichi Maeshima & George Claghorn]
* Merge pull request #31185 from vipulnsward/threading-guideVipul A M2017-11-201-3/+3
|\ | | | | Pass over Execution guide[ci skip]
| * Pass over Execution guide[ci skip]Vipul A M2017-11-201-3/+3
|/
* Merge pull request #31170 from PHedkvist/system_testing_guidesMatthew Draper2017-11-201-0/+10
|\ | | | | [ci skip] Added example for using headless_chrome with SystemTest
| * [ci skip] Added example for using headless_chrome with ↵Pierre Hedkvist2017-11-181-0/+10
| | | | | | | | ActionDispatch::SystemTestCase
* | Permit attaching files to new recordsGeorge Claghorn2017-11-193-5/+53
| | | | | | | | Closes #31164.
* | Prevent extra `spawn` to make `klass.all` faster (#29009)Ryuta Kamizono2017-11-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These extra `spawn` are called via `klass.all` and `klass.all` is called everywhere in the internal. Avoiding the extra `spawn` makes` klass.all` 30% faster for STI classes. https://gist.github.com/kamipo/684d03817a8115848cec8e8b079560b7 ``` Warming up -------------------------------------- fast relation 4.410k i/100ms slow relation 3.334k i/100ms Calculating ------------------------------------- fast relation 47.373k (± 5.2%) i/s - 238.140k in 5.041836s slow relation 35.757k (±15.9%) i/s - 176.702k in 5.104625s Comparison: fast relation: 47373.2 i/s slow relation: 35756.7 i/s - 1.32x slower ```
* | Fix `test_session_store_with_expire_after` failure with rack-test 0.7.1Ryuta Kamizono2017-11-202-3/+3
| | | | | | | | https://travis-ci.org/rails/rails/jobs/304428814#L1977
* | Fix ASt CI failure with rack-test 0.7.1Ryuta Kamizono2017-11-201-1/+1
| | | | | | | | Due to https://github.com/rack-test/rack-test/commit/5fd3631078e7c73aaed7d4371f70fb2a79384be9.
* | Generate `keys` instead of `keys_to_names`Ryuta Kamizono2017-11-201-3/+3
| | | | | | | | `keys_to_names` is used only for `keys_to_names.keys`.
* | Fix formatting of `credentials` and `encrypted` [ci skip]yuuji.yaginuma2017-11-191-8/+8
| |
* | Fix "warning: assigned but unused variable - key"yuuji.yaginuma2017-11-181-1/+1
| | | | | | | | Ref: https://travis-ci.org/rails/rails/jobs/303840778#L1974
* | Deprecate an `after_bundle` callback in Rails plugin templatesyuuji.yaginuma2017-11-183-0/+40
| | | | | | | | | | | | | | | | | | Since fbd1e98cf983572ca9884f17f933ffe92833632a, Rails plugin does not run `bundle install` when generating. Therefore, `after_bundle` callback is not actually executed after `bundle`. Since there is a difference between the name and the actual behavior, I think that should be remove.
* | Merge pull request #31035 from BrentWheeldon/bmw-db-load-deadlockMatthew Draper2017-11-183-1/+74
|\ \ | |/ |/| Prevent deadlocks with load interlock and DB lock.
| * Prevent deadlocks with load interlock and DB lock.Brent Wheeldon2017-11-093-1/+74
| | | | | | | | | | | | | | | | | | | | This fixes an issue where competing threads deadlock each other. - Thread A holds the load interlock but is blocked on getting the DB lock - Thread B holds the DB lock but is blocked on getting the load interlock (for example when there is a `Model.transaction` block that needs to autoload) This solution allows for dependency loading in other threads while a thread is waiting to acquire the DB lock. Fixes #31019
* | Merge pull request #28742 from quixoten/stack_conn_poolMatthew Draper2017-11-172-6/+11
|\ \ | | | | | | Switch to LIFO for the connection pool
| * | Fix typosDevin Christensen2017-04-132-2/+2
| | |
| * | Improve documentation and add testDevin Christensen2017-04-132-7/+12
| | |
| * | Switch to LIFO for the connection poolDevin Christensen2017-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Using a FIFO for the connection pool can lead to issues when there are upstream components (pgbouncer, haproxy, etc.) that terminate connections that are idle after a period of time. Switching to a LIFO reduces the probability that a thread will checkout a connection that is about to be closed by an idle timeout in an upstream component.
* | | Merge pull request #28869 from eugeneius/query_cache_all_poolsMatthew Draper2017-11-172-6/+18
|\ \ \ | | | | | | | | Enable query cache on all connection pools
| * | | Enable query cache on all connection poolsEugene Kenny2017-04-242-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | Since the query cache no longer eagerly checks out a connection, we can enable it on all connection pools at the start of every request, and it will only take effect for requests that actually use those pools.
* | | | Merge pull request #30100 from kirs/doc-reloaderMatthew Draper2017-11-171-0/+3
|\ \ \ \ | | | | | | | | | | Document public hooks in AS::Reloader
| * | | | Document public hooks in AS::Reloader [ci skip]Kir Shatrov2017-08-141-0/+3
| | | | |
* | | | | Move back to resque-scheduler mainline now that ↵Jeremy Daer2017-11-162-12/+11
| | | | | | | | | | | | | | | | | | | | https://github.com/resque/resque-scheduler/pull/620 is merged
* | | | | Merge pull request #31169 from ydakuka/patch-1Ryuta Kamizono2017-11-171-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix links [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 11:47:19 +0000