aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* RedisCacheStore: fix `#write_multi` mset serializationfatkodima2018-02-042-1/+18
| | | | | Closes #31886 Fixes #31884
* Make test runner work with AR test toolyuuji.yaginuma2018-02-041-0/+7
| | | | | | | | | | | Since #29572, test runner will be loaded as minitest's plugin. Therefore, if specify a value in `Minitest.extensions` before the Minitest initialization process, the extension will not load and the test runner will not work. https://github.com/seattlerb/minitest/blob/44eee51ed9716c789c7cea8a90c131cf736b8915/lib/minitest.rb#L86 Also, load processing of adapter is done before minitest option processing, so set the adapter in the file so that the `-a` option works.
* Prefer `@connection.abandon_results!` than `@connection.next_result while ↵Ryuta Kamizono2018-02-041-1/+1
| | | | @connection.more_results?`
* Add nodoc to `migrations_paths` and `migration_context` in `AbstractAdapter`Ryuta Kamizono2018-02-041-2/+2
| | | | | | These are internally used only. [ci skip]
* Merge pull request #31878 from timdiggins/corrections-to-31755Ryuta Kamizono2018-02-041-6/+6
|\ | | | | | | | | Correct capitalization of "Rails" in guide text [ci skip]
| * Correct capitalization of "Rails" in the guide text.Tim Diggins2018-02-031-6/+6
|/ | | | correction to #31755 as per https://github.com/rails/rails/pull/31755#discussion_r165819798
* Merge pull request #28171 from sorra/fresh-thread-tagged-loggingRyuta Kamizono2018-02-031-1/+2
|\ | | | | Improve test for TaggedLogging "keeps each tag in their own thread"
| * Merge branch 'master' into fresh-thread-tagged-loggingDongqing Hu2017-02-2610-9/+65
| |\
| * | Improve test for TaggedLogging "keeps each tag in their own thread"Dongqing Hu2017-02-261-1/+2
| | |
* | | Add nodoc to `CredentialsGenerator` and `MasterKeyGenerator` [ci skip]yuuji.yaginuma2018-02-032-2/+2
| | | | | | | | | | | | These classes are internally used only.
* | | Merge pull request #31868 from y-yagi/fix-build-failures-on-travisEileen M. Uchitelle2018-02-021-1/+1
|\ \ \ | | | | | | | | Fix build failures on Travis
| * | | Avoid bundle clean before cachingyuuji.yaginuma2018-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure cause, but due to the influence of `gem clean`, the expected gem seems not to be installed correctly. In order to avoid a test failure due to this, I fixed that `gem clean` not be executed. Ref: https://github.com/travis-ci/travis-ci/issues/2518#issuecomment-121168856 This is a workaround. If Travis fixes something, please revert this.
* | | | Merge pull request #31276 from freeletics/fix-generators-listEileen M. Uchitelle2018-02-023-18/+5
|\ \ \ \ | | | | | | | | | | Removed "private" generators from command list.
| * | | | Removed "private" generators from command list.Wojciech Wnętrzak2018-02-023-18/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Appropriate way to handle encrypted command is by `bin/rails credentials` and `bin/rails encrypted` It was displayed on `bin/rails generate` command: ``` Please choose a generator below. Rails: application_record assets channel controller encrypted_file encryption_key_file generator ... ```
* | | | Merge pull request #31854 from huacnlee/allow-more-options-for-service-urlGeorge Claghorn2018-02-012-2/+23
|\ \ \ \ | |/ / / |/| | | Allow ActiveStorage::Blob#service_url to pass addition options to service.url
| * | | Allow `ActiveStorage::Blob#service_url` to pass addition options to ↵Jason Lee2018-02-012-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `service.url`. Because there have some service needs more parameters for file URL: https://www.alibabacloud.com/help/doc-detail/44687.htm ```rb class AliyunService < Service def url(key, options = {}) image_process = options[:oss_process] || "image/resize,w_800" "http://image-demo.oss-cn-hangzhou.aliyuncs.com/example.jpg?x-oss-process=#{image_process}" end end ``` Use case: ```erb <%= image_tag @user.avatar.service_url(oss_process: "image/resize,m_fill,h_100,w_100" %> ```
* | | | PERF: Recover marshaling dump/load performance (#31827)Ryuta Kamizono2018-02-022-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PERF: Recover marshaling dump/load performance This performance regression which is described in #30680 was caused by f0ddf87 due to force materialized `LazyAttributeHash`. Since 95b86e5, default proc has been removed in the class, so it is no longer needed that force materialized. Avoiding force materialized will recover marshaling dump/load performance. Benchmark: https://gist.github.com/blimmer/1360ea51cd3147bae8aeb7c6d09bff17 Before: ``` it took 0.6248569069430232 seconds to unmarshal the objects Total allocated: 38681544 bytes (530060 objects) allocated memory by class ----------------------------------- 12138848 Hash 10542384 String 7920000 ActiveModel::Attribute::Uninitialized 5600000 ActiveModel::Attribute::FromDatabase 1200000 Foo 880000 ActiveModel::LazyAttributeHash 400000 ActiveModel::AttributeSet 80 Integer 72 ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer 40 ActiveModel::Type::String 40 ActiveRecord::Type::DateTime 40 Object 40 Range allocated objects by class ----------------------------------- 250052 String 110000 ActiveModel::Attribute::Uninitialized 70001 Hash 70000 ActiveModel::Attribute::FromDatabase 10000 ActiveModel::AttributeSet 10000 ActiveModel::LazyAttributeHash 10000 Foo 2 Integer 1 ActiveModel::Type::String 1 ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer 1 ActiveRecord::Type::DateTime 1 Object 1 Range ``` After: ``` it took 0.1660824950085953 seconds to unmarshal the objects Total allocated: 13883811 bytes (220090 objects) allocated memory by class ----------------------------------- 5743371 String 4940008 Hash 1200000 Foo 880000 ActiveModel::LazyAttributeHash 720000 Array 400000 ActiveModel::AttributeSet 80 ActiveModel::Attribute::FromDatabase 80 Integer 72 ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer 40 ActiveModel::Type::String 40 ActiveModel::Type::Value 40 ActiveRecord::Type::DateTime 40 Object 40 Range allocated objects by class ----------------------------------- 130077 String 50004 Hash 10000 ActiveModel::AttributeSet 10000 ActiveModel::LazyAttributeHash 10000 Array 10000 Foo 2 Integer 1 ActiveModel::Attribute::FromDatabase 1 ActiveModel::Type::String 1 ActiveModel::Type::Value 1 ActiveRecord::ConnectionAdapters::SQLite3Adapter::SQLite3Integer 1 ActiveRecord::Type::DateTime 1 Object 1 Range ``` Fixes #30680. * Keep the `@delegate_hash` to avoid to lose any mutations that have been made to the record
* | | | Merge pull request #31859 from bogdanvlviv/add-changelog-entry-for-31844Rafael França2018-02-011-0/+4
|\ \ \ \ | | | | | | | | | | Add changelog entry for #31844
| * | | | Add changelog entry for #31844bogdanvlviv2018-02-011-0/+4
| | | | |
* | | | | Merge pull request #31855 from renchap/fix-activestorage-json-coderGeorge Claghorn2018-02-011-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | ActiveStorage: use the full class name for the JSON coder
| * | | | Use the full class name for the JSON coder, as there may be anotherRenaud Chaput2018-02-011-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | `JSON` constant defined. For example when using the `representable` gem: https://github.com/trailblazer/representable/issues/224
* | | | Merge pull request #31853 from simi/patch-2Ryuta Kamizono2018-02-011-9/+9
|\ \ \ \ | |/ / / |/| | | Update to latest rubies (2.2.9, 2.3.8 and 2.4.3) on Travis CI.
| * | | Update to latest rubies (2.2.9, 2.3.8 and 2.4.3) on Travis CI.Josef Šimánek2018-02-011-9/+9
|/ / /
* | | Merge pull request #31844 from ↵Ryuta Kamizono2018-02-014-0/+11
|\ \ \ | | | | | | | | | | | | | | | | igorkasyanchuk/add_to_hash_and_to_h_for_session_and_cookies Consistent behavior for session and cookies with to_h and to_hash method
| * | | Consistent behavior for session and cookies with to_h and to_hash methodIgor Kasyanchuk2018-01-314-0/+11
| | | |
* | | | Correct orientation detectionGeorge Claghorn2018-01-312-3/+3
| | | |
* | | | Swap encoded image width and height if angle is 90 or 270 degreesGeorge Claghorn2018-01-313-3/+26
|/ / /
* | | Revert "Merge pull request #31447 from fatkodima/redis_cache-connection_pool"George Claghorn2018-01-315-104/+24
| | | | | | | | | | | | | | | This reverts commit ac74e2c521f6ddc0eac02d74a1313261bcc1d60f, reversing changes made to ffdb06136152b3c5f7f4a93ca5928e16e755d228.
* | | Merge pull request #31838 from ↵Eileen M. Uchitelle2018-01-311-1/+1
|\ \ \ | | | | | | | | | | | | | | | | bogdanvlviv/fix-value-of-as-attribute-for-link-type-preload Fix `as` attribute value for preload link
| * | | Fix `as` attribute value for preload linkbogdanvlviv2018-01-311-1/+1
|/ / / | | | | | | | | | | | | | | | `as` attribute value should be `style` for stylesheet preload link See https://w3c.github.io/preload/#as-attribute
* | | Fix `Unknown migration version "6.0"`Yuji Yaginuma2018-01-311-1/+4
| | |
* | | Update default deprecation horizonYuji Yaginuma2018-01-311-1/+1
| | | | | | | | | | | | Because the master branch is already 6.0.
* | | Merge pull request #31834 from sotayamashita/fix/typoArun Agrawal2018-01-311-1/+1
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoSam Yamashita2018-01-311-1/+1
| | | |
* | | | Fix `RuntimeError: Unknown version "6.0"`Yuji Yaginuma2018-01-311-0/+3
|/ / /
* | | Start Rails 6.0 development!!!Rafael Mendonça França2018-01-3027-1928/+89
| | | | | | | | | | | | :tada::tada::tada:
* | | Merge pull request #31830 from rafaelfranca/disable-csp-by-defaultRafael França2018-01-301-10/+10
|\ \ \ | | | | | | | | Disable CSP by default
| * | | Disable CSP by defaultRafael Mendonça França2018-01-301-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, to be able to use webpacker and webconsole we were defining an used default in the script-src policy. White we don't implement the automatic nonce approach defined in https://github.com/rails/rails/issues/31689 it is better to not have any default configuration in Rails 5.2.
* | | | Add Rack::TempfileReaper to tests and docsGeorge Claghorn2018-01-302-2/+9
| | | |
* | | | Add Rack::TempfileReaper to the default middleware stackGeorge Claghorn2018-01-301-0/+1
|/ / /
* | | Merge pull request #31828 from claudiob/doc-cspClaudio B2018-01-301-0/+4
|\ \ \ | | | | | | | | Add ContentSecurityPolicy to list of middleware
| * | | Add ContentSecurityPolicy to list of middlewareclaudiob2018-01-301-0/+4
|/ / / | | | | | | | | | | | | Document in the guides the new middleware added in #31162 [ci skip]
* | | Remove unused `require "active_record/tasks/database_tasks"`Ryuta Kamizono2018-01-301-1/+0
| | |
* | | Merge pull request #31826 from miketheman/patch-1George Claghorn2018-01-291-1/+1
|\ \ \ | | | | | | | | Update rails-ujs readme
| * | | Update rails-ujs readmeMike Fiedler2018-01-291-1/+1
| | | | | | | | | | | | Link to W3C reference was broken, this uses the latest URL, along with HTTPS.
* | | | Merge pull request #31815 from composerinteralia/make-request-idGeorge Claghorn2018-01-292-1/+6
|\ \ \ \ | | | | | | | | | | Allow @ in X-Request-Id header
| * | | | Allow @ in X-Request-Id headerDaniel Colson2018-01-292-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes sense to be as strict as possible with headers from the outside world, but allowing @ to support Apache's mod_unique_id (see #31644) seems OK to me
* | | | | Merge pull request #31769 from justjake/patch-2Matthew Draper2018-01-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | yarnpkg: correct exec syntax
| * | | | | yarnpkg: correct exec syntaxJake Teton-Landis2018-01-231-1/+2
| | | | | | | | | | | | | | | | | | Previous change didn’t expand this array of arguments
* | | | | | Don't expose `attributes_with_uninitialized_key` utility methodRyuta Kamizono2018-01-301-5/+6
| |_|/ / / |/| | | | | | | | | | | | | | It is not a test case.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 07:40:11 +0000