aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #33748 from eileencodes/fix-erb-loading-issue-with-db-yamlEileen M. Uchitelle2018-08-293-16/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Drop load_database_yaml and fix testEileen Uchitelle2018-08-293-16/+8
* | | | | | | | | | | Merge pull request #33718 from kddeisz/permit-listMatthew Draper2018-08-2919-52/+63
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Permit list usage cleanup and clearer documentationKevin Deisz2018-08-2715-40/+41
| * | | | | | | | | | Convert remaining usage of whitelist and blacklistKevin Deisz2018-08-245-14/+14
| * | | | | | | | | | Deprecate usage of ActionView::Template::Handlers::ERB::escape_whitelistKevin Deisz2018-08-241-2/+12
| * | | | | | | | | | Convert over the rest of the blacklist referencesKevin Deisz2018-08-241-2/+2
| * | | | | | | | | | Convert over the rest of the whitelist referencesKevin Deisz2018-08-2413-25/+25
* | | | | | | | | | | Generate the same value as a label of view in system test templateyuuji.yaginuma2018-08-292-3/+3
* | | | | | | | | | | Add test to make sure the custom object key can't be serializedRafael Mendonça França2018-08-281-2/+4
* | | | | | | | | | | Focus search input after page load on /rails/info/routes (#33683)James Brooks2018-08-281-0/+3
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #33739 from tleneveu/edgeguides-https-linksRyuta Kamizono2018-08-283-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use the HTTPS protocol for links to Edges Guides [ci skip]tleneveu2018-08-283-4/+4
* | | | | | | | | | | Merge pull request #33689 from ypresto/ar-fix-dirty-in-aroundRyuta Kamizono2018-08-282-5/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Mutation tracker should be cleared before continuing around callbacksYuya Tanaka2018-08-282-5/+26
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Update the comments for TimeWithZone subtraction (#33721)Rob Race2018-08-281-2/+10
* | | | | | | | | | Merge pull request #33654 from kamipo/fix_numericality_validator_2Ryuta Kamizono2018-08-284-4/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix numericality validator to still use value before type cast except Active ...Ryuta Kamizono2018-08-244-4/+41
* | | | | | | | | | Call block to #redirect_to in controller context (#33735)speckins2018-08-272-1/+17
* | | | | | | | | | Add documentation for `:collation` column option (#33733)Nate Pinsky2018-08-271-0/+3
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #31972 from bogdanvlviv/update-form_helpers-guideRafael França2018-08-271-96/+118
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Update "Action View Form Helpers" guide [ci skip]bogdanvlviv2018-08-271-96/+118
|/ / / / / / / /
* | | | | | | | Merge pull request #33727 from bogdanvlviv/follow-up-33523Ryuta Kamizono2018-08-272-50/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Add `:namespace` option to the api docs of `form_with` [ci skip]bogdanvlviv2018-08-271-0/+3
| * | | | | | | | Follow up #33523 [ci skip]bogdanvlviv2018-08-271-50/+20
* | | | | | | | | Remove unused requiresRyuta Kamizono2018-08-251-3/+1
* | | | | | | | | Merge pull request #33723 from pinewong/patch-3Matthew Draper2018-08-251-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarify example of the test [ci skip] 黄松2018-08-251-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33661 from jychen7/33428-test-has-many-association-enumRyuta Kamizono2018-08-251-0/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add test case to test enum in has_manyRich2018-08-251-0/+22
| |/ / / / / / /
* | | | | | | | Merge pull request #33722 from robzolkos/docfix-mime-respondsRyuta Kamizono2018-08-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Format respond_to method as code in doc [ci skip]Rob Zolkos2018-08-251-1/+1
|/ / / / / / / /
* | / / / / / / Avoid `pg` 1.1.0 for nowyuuji.yaginuma2018-08-252-3/+3
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #33714 from cbothner/azure-service-swallowing-all-errorsGeorge Claghorn2018-08-242-5/+14
|\ \ \ \ \ \ \
| * | | | | | | Handle only specifically relevant Azure HTTPErrorsCameron Bothner2018-08-232-5/+14
|/ / / / / / /
* | | | | | | Revert "Merge pull request #33667 from cbothner/azure-service-swallowing-all-...George Claghorn2018-08-232-20/+7
* | | | | | | Merge pull request #33667 from cbothner/azure-service-swallowing-all-errorsGeorge Claghorn2018-08-232-7/+20
|\ \ \ \ \ \ \
| * | | | | | | Handle only specifically relevant Azure HTTPErrorsCameron Bothner2018-08-232-7/+20
|/ / / / / / /
* | | | | | | Merge pull request #33681 from minaslater/replace-white-and-blacklistAaron Patterson2018-08-239-40/+41
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] corrects more grammar awkwardness, replacing denylist with restrict...Mina Slater2018-08-229-37/+41
| * | | | | | | [ci skip] revert terminology related to syntaxMina Slater2018-08-221-1/+1
| * | | | | | | [ci skip] fixes a few more grammar issues, changing a to an before the word a...Mina Slater2018-08-224-12/+9
| * | | | | | | [ci skip] fixes awkward grammarMina Slater2018-08-226-12/+12
| * | | | | | | [ci skip] change all instances of blacklist and whitelist to denylist and all...Mina Slater2018-08-2111-40/+40
* | | | | | | | Merge pull request #31696 from BrentWheeldon/bmw-connection-pool-load-deadlockMatthew Draper2018-08-242-1/+41
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Prevent deadlocks when waiting for connection from pool.Brent Wheeldon2018-03-232-1/+41
* | | | | | | | Merge pull request #33703 from bogdanvlviv/follow-up-33659George Claghorn2018-08-235-6/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | DRY in `assert_broadcasts`bogdanvlviv2018-08-232-2/+13
| * | | | | | | | Simplify configuring of `ActionCable.server.config.logger` for actioncable testsbogdanvlviv2018-08-231-1/+1
| * | | | | | | | Set the test adapter for the test environment by default in `config/cable.yml`bogdanvlviv2018-08-231-1/+1