aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 igorkasyanchuk/add_to_hash_and_to_h_for_sessio...Ryuta Kamizono2018-02-014-0/+11
|\
| * 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
* Merge pull request #31838 from bogdanvlviv/fix-value-of-as-attribute-for-link...Eileen M. Uchitelle2018-01-311-1/+1
|\
| * Fix `as` attribute value for preload linkbogdanvlviv2018-01-311-1/+1
|/
* Fix `Unknown migration version "6.0"`Yuji Yaginuma2018-01-311-1/+4
* Update default deprecation horizonYuji Yaginuma2018-01-311-1/+1
* Merge pull request #31834 from sotayamashita/fix/typoArun Agrawal2018-01-311-1/+1
|\
| * 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
* Merge pull request #31830 from rafaelfranca/disable-csp-by-defaultRafael França2018-01-301-10/+10
|\
| * Disable CSP by defaultRafael Mendonça França2018-01-301-10/+10
* | 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 middlewareclaudiob2018-01-301-0/+4
|/
* 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 readmeMike Fiedler2018-01-291-1/+1
* | Merge pull request #31815 from composerinteralia/make-request-idGeorge Claghorn2018-01-292-1/+6
|\ \
| * | Allow @ in X-Request-Id headerDaniel Colson2018-01-292-1/+6
* | | Merge pull request #31769 from justjake/patch-2Matthew Draper2018-01-301-1/+1
|\ \ \
| * | | yarnpkg: correct exec syntaxJake Teton-Landis2018-01-231-1/+2
* | | | Don't expose `attributes_with_uninitialized_key` utility methodRyuta Kamizono2018-01-301-5/+6
| |_|/ |/| |
* | | Merge pull request #31814 from fatkodima/index-nulls-orderRafael França2018-01-293-2/+40
|\ \ \
| * | | 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_sDaniel Colson2018-01-298-9/+9
* | | | | Merge pull request #31825 from mistydemeo/fix_post_documentationEileen M. Uchitelle2018-01-291-1/+1
|\ \ \ \ \
| * | | | | ActionController::TestCase: fix #post documentation [ci skip]Misty De Meo2018-01-291-1/+1
|/ / / / /
* / / / / Deprecate `expand_hash_conditions_for_aggregates`Ryuta Kamizono2018-01-293-0/+13
|/ / / /
* | | | Suppress expected exceptions by `report_on_exception` = `false`yuuji.yaginuma2018-01-291-0/+4
* | | | Fix the example of 'finding records by a value object' (#31818)Bogdan2018-01-291-2/+2
* | | | 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
* | | | 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)Beni Cherniavsky-Paskin2018-01-012-1/+16
* | | | | Merge pull request #31810 from shuheiktgw/add_tests_for_blobGeorge Claghorn2018-01-281-0/+12
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge pull request #31817 from composerinteralia/mediocre-jokeRichard Schneeman2018-01-281-1/+1
|\ \ \ \ \ \
| * | | | | | Remove joke in security guide [ci skip]Daniel Colson2018-01-281-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #31724 from orekyuu/fix-expand-composed-object-arrayRyuta Kamizono2018-01-293-3/+37
|\ \ \ \ \ \
| * | | | | | Allow expanding an array of `composed_of` objectsRyuta Kamizono2018-01-292-9/+6
| * | | | | | Fix not expanded problem when passing an Array object as argument to the wher...orekyuu2018-01-263-3/+40