aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge pull request #31814 from fatkodima/index-nulls-orderRafael França2018-01-293-2/+40
|\ \ \ | | | | | | | | Dump correctly index nulls order for PostgreSQL
| * | | Dump correctly index nulls order for postgresqlfatkodima2018-01-283-2/+40
| | | |
* | | | Merge pull request #31821 from composerinteralia/extra-to_sGeorge Claghorn2018-01-298-9/+9
|\ \ \ \ | | | | | | | | | | Avoid extra calls to to_s
| * | | | Avoid extra calls to to_sDaniel Colson2018-01-298-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With #31615 `type_for_attribute` accepts either a symbol as well as a string. `has_attribute?` and `attribute_alias` also accept either. Since these methods call `to_s` on the argument, we no longer need to do that at the call site.
* | | | | Merge pull request #31825 from mistydemeo/fix_post_documentationEileen M. Uchitelle2018-01-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | ActionController::TestCase: fix #post documentation
| * | | | | ActionController::TestCase: fix #post documentation [ci skip]Misty De Meo2018-01-291-1/+1
|/ / / / / | | | | | | | | | | | | | | | Fixes #31823.
* / / / / Deprecate `expand_hash_conditions_for_aggregates`Ryuta Kamizono2018-01-293-0/+13
|/ / / / | | | | | | | | | | | | | | | | This can not expand an array of aggregated objects correctly, and is no longer used internally since 159b21b5.
* | | | Suppress expected exceptions by `report_on_exception` = `false`yuuji.yaginuma2018-01-291-0/+4
| | | | | | | | | | | | | | | | | | | | This suppresses `Timeout::Error` exceptions. Ref: https://travis-ci.org/rails/rails/jobs/334622442#L1089-L1110
* | | | Fix the example of 'finding records by a value object' (#31818)Bogdan2018-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example was added in abdf546ad6d02ecb95766e73cd3c645a48c954de but was inconsistent with `composed_of :balance` definition in the 'Customer'. [Ryuta Kamizono & bogdanvlviv] [ci skip]
* | | | Extract `discard_remaining_results` for mysql2 adapterRyuta Kamizono2018-01-292-4/+6
| | | |
* | | | Revert "Merge pull request #23256 from pauloancheta/master"Ryuta Kamizono2018-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 755f7b58953c25790eea0574ff8928033ded2d88, reversing changes made to 35db4603095e8ccc0a92d925a42d4b3d9462580f. Originally `mapping: %w(balance amount)` is correct mapping example. Closes #31346. [Ryuta Kamizono & bogdanvlviv] [ci skip]
* | | | Remove unused/missing `to_money` converter in the test/docRyuta Kamizono2018-01-292-3/+2
| | | |
* | | | Merge pull request #31615 from cben/type_for_attribute-symbolRyuta Kamizono2018-01-292-1/+16
|\ \ \ \ | | | | | | | | | | Allow type_for_attribute(:symbol)
| * | | | Allow type_for_attribute(:symbol)Beni Cherniavsky-Paskin2018-01-012-1/+16
| | | | | | | | | | | | | | | | | | | | Closes #31611.
* | | | | Merge pull request #31810 from shuheiktgw/add_tests_for_blobGeorge Claghorn2018-01-281-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Added tests for ActiveStorage::Blob#image? and ActiveStorage::Blob#video?
| * | | | | Add a test for ActiveStorage::Blob#image? and ActiveStorage::Blob#video?Shuhei Kitagawa2018-01-291-0/+12
| | | | | |
* | | | | | Fix expanding an array of `composed_of` objects which have multiple mappingsRyuta Kamizono2018-01-295-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #31724. If `composed_of` objects have multiple mappings, array predicate handler can not correctly handle the expanded condition. We need to handle it like polymorphic association objects.
* | | | | | Merge pull request #31817 from composerinteralia/mediocre-jokeRichard Schneeman2018-01-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove joke in security guide [ci skip]
| * | | | | | Remove joke in security guide [ci skip]Daniel Colson2018-01-281-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | I think this is a joke, although not a great one. It's mildly unprofessional, so I think we should get rid of it.
* | | | | | Merge pull request #31724 from orekyuu/fix-expand-composed-object-arrayRyuta Kamizono2018-01-293-3/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix not expanded problem when passing an Array object as argument to the where method using composed_of column.
| * | | | | | Allow expanding an array of `composed_of` objectsRyuta Kamizono2018-01-292-9/+6
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 02:11:43 +0000