aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #36860 from cpruitt/update-gemspec-rails-html-sanitizer-ve...HEADmasterEileen M. Uchitelle2019-08-051-1/+1
|\
| * Update rails-html-sanitizer to 1.1.0 in actionview.gemspecCliff Pruitt2019-08-051-1/+1
|/
* Merge pull request #36823 from abhaynikam/add-multiple-database-guide-entry-t...Eileen M. Uchitelle2019-08-051-0/+3
|\
| * Added multiple database Active Record guide entry to the release notes [ci skip]Abhay Nikam2019-08-011-0/+3
* | Merge pull request #36857 from akshaymohite/correct-config-option-in-release-...Vipul A M2019-08-051-1/+1
|\ \
| * | Corrected deperecation config option path for active_record.sqlite3.represent...Akshay Mohite2019-08-051-1/+1
|/ /
* | Remove unused requireKasper Timm Hansen2019-08-051-1/+0
* | Merge pull request #36537 from quadule/fix-cookie-rotation-hash-pollutionKasper Timm Hansen2019-08-052-2/+19
|\ \
| * | Prevent serialized hash from being used as optionsMilo Winningham2019-06-221-2/+6
| * | Add test for cookie being modified by rotationMilo Winningham2019-06-221-0/+13
* | | Use newly released rails-html-sanitizerKasper Timm Hansen2019-08-051-1/+1
* | | Update sanitizer in ActionView::Helpers::SanitizeHelperJuanito Fatas2019-08-053-22/+18
* | | handle passing in primary key to unique_by, and handle primary keys missing i...Lachlan Sylvester2019-08-052-2/+22
* | | Use Thread.pass instead of Kernel.sleep to trigger race conditionGuilherme Mansur2019-08-052-21/+12
* | | Able to initalize default value for thread_mattr_*Guilherme Mansur2019-08-053-16/+46
* | | Mention how to use webpacker in updated Rails apps [ci skip]Prathamesh Sonpatki2019-08-041-0/+14
* | | Merge pull request #36845 from eileencodes/fix-pg-closed-connectionEileen M. Uchitelle2019-08-041-6/+11
|\ \ \
| * | | Fix `PG::ConnectionBad` error when running fixtureseileencodes2019-08-021-6/+11
* | | | Merge pull request #36854 from eugeneius/media_type_instead_of_content_typeKasper Timm Hansen2019-08-046-4/+49
|\ \ \ \
| * | | | Use media_type instead of content_type internallyEugene Kenny2019-08-046-4/+49
* | | | | Revise flow to what was described in 03e44f9Kasper Timm Hansen2019-08-044-38/+47
* | | | | Revise credentials diffing flow to use a separate diff commandKasper Timm Hansen2019-08-045-105/+79
|/ / / /
* | | | Extract diffing to separate credentials:diff commandKasper Timm Hansen2019-08-043-51/+43
* | | | Commands already make fileutils available.Kasper Timm Hansen2019-08-031-2/+0
* | | | Rename to Diffing and move module into credentials commandKasper Timm Hansen2019-08-033-59/+54
* | | | Merge pull request #36849 from yahonda/use_assert_nily-yagi2019-08-031-2/+2
|\ \ \ \
| * | | | Address `DEPRECATED: Use assert_nil if expecting nil`Yasuo Honda2019-08-031-2/+2
|/ / / /
* | | | Merge pull request #36846 from SGourshete/masterVipul A M2019-08-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | typo in word compatibily - autoloading and reloading constants guideSwapnil Gourshete2019-08-031-1/+1
|/ / /
* | | 1.hour needs core_ext to workRafael Mendonça França2019-08-021-0/+2
* | | Merge pull request #36843 from eileencodes/add-ability-to-unset-preventing-wr...Eileen M. Uchitelle2019-08-023-7/+43
|\ \ \
| * | | Add ability to unset preventing writeseileencodes2019-08-023-7/+43
|/ / /
* | | Merge pull request #36814 from eileencodes/introduce-invalid-configuration-errorEileen M. Uchitelle2019-08-022-3/+23
|\ \ \
| * | | Introduce InvalidConfigurationErroreileencodes2019-08-012-3/+23
* | | | This test needs integer core ext for timeRafael Mendonça França2019-08-021-0/+1
* | | | ConditionalGet needs time core_extRafael Mendonça França2019-08-021-0/+1
* | | | Require time extensions in the job that depends on timeRafael Mendonça França2019-08-021-0/+1
* | | | Require integer conversion for this testRafael Mendonça França2019-08-021-0/+1
* | | | Revert "No such class since 8d2866bb80fbe81acb04f5b0c44f152f571fb29f"Rafael Mendonça França2019-08-0250-57/+57
* | | | Revert "MethodCallAssertions is a regular player of the team ActiveSupport::T...Rafael Mendonça França2019-08-0211-3/+28
* | | | Revert "You give jruby_skip & rubinius_skip a good name"Rafael Mendonça França2019-08-028-20/+78
* | | | Missing require AS/core_ext/date/conversionsAkira Matsuda2019-08-022-0/+2
* | | | hash_conversion itself does not at all depend on time extensionsAkira Matsuda2019-08-021-1/+0
* | | | Add *_previously_was attribute methods when dirty tracking (#36836)David Heinemeier Hansson2019-08-013-1/+19
* | | | Merge pull request #36837 from composerinteralia/no-colorRyuta Kamizono2019-08-021-5/+0
|\ \ \ \
| * | | | Remove duplicate method definitionDaniel Colson2019-08-011-5/+0
* | | | | Lazily evaluate FileUpdateCheckerSharedTests when being includedAkira Matsuda2019-08-021-195/+199
* | | | | No such class since 8d2866bb80fbe81acb04f5b0c44f152f571fb29fAkira Matsuda2019-08-0250-57/+57
|/ / / /
* | | | Merge pull request #36821 from rails/virtual-attribute-typeRyuta Kamizono2019-08-021-0/+84
|\ \ \ \
| * | | | Add tests for selecting aggregatesGodfrey Chan2019-08-011-0/+84