aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Stop setting a default Capybara app hostGeorge Claghorn2019-07-246-38/+43
* Merge pull request #36756 from seejohnrun/env-urls-with-multiple-databasesEileen M. Uchitelle2019-07-242-12/+42
|\
| * Fix multiple database support for DATABASE_URL env variableJohn Crepezzi2019-07-242-12/+42
* | Merge pull request #36753 from cmrd-senya/36752-make-rails-logger-fiber-safeRafael França2019-07-243-1/+78
|\ \
| * | Make ActiveSupport::Logger Fiber-safeSenya2019-07-243-1/+78
* | | Merge pull request #36562 from colszowka/patch-1Rafael França2019-07-241-0/+2
|\ \ \
| * | | Add warning about using UUIDs with activestorageChristoph Olszowka2019-06-271-0/+2
* | | | Merge pull request #36564 from rodrei/docs-active-starage-warningRafael França2019-07-242-0/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Update docs with warning on AS Content-Disposition override [ci skip]Rodrigo Pavano2019-06-271-0/+4
| * | | Updated ActiveStorage docs by adding missing config [ci skip]Rodrigo Pavano2019-06-271-0/+2
| |/ /
* | | Merge pull request #36580 from Shopify/schema-cache-deuplication-from-databaseRafael França2019-07-241-5/+15
|\ \ \
| * | | Also deduplicate schema cache structure when they are read from the databaseJean Boussier2019-07-011-5/+15
* | | | Merge pull request #36524 from okuramasafumi/add-middleware-command-to-comman...Rafael França2019-07-241-0/+2
|\ \ \ \
| * | | | Add some commands to misc section in CLI guideOKURA Masafumi2019-06-201-0/+2
* | | | | Merge pull request #36715 from peterzhu2118/azure-content-typeEileen M. Uchitelle2019-07-242-2/+16
|\ \ \ \ \
| * | | | | Add content_type to upload in AzurePeter Zhu2019-07-242-2/+16
* | | | | | Merge pull request #36671 from wjessop/do_not_validate_non_dirty_association_...Eileen M. Uchitelle2019-07-245-1/+37
|\ \ \ \ \ \
| * | | | | | Don't validate non dirty association targetsWill Jessop2019-07-155-1/+37
* | | | | | | Merge pull request #34218 from eliotsykes/filter-common-sensitive-paramsRafael França2019-07-241-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Add common sensitive names to generated filter parametersEliot Sykes2018-11-201-1/+3
| * | | | | | | Add secret to generated filter parametersEliot Sykes2018-11-201-1/+1
* | | | | | | | Merge pull request #36434 from Edouard-chin/ec-securecompare-rotationRafael França2019-07-242-0/+96
|\ \ \ \ \ \ \ \
| * | | | | | | | Introduce a new ActiveSupport::SecureCompareRotator class:Edouard CHIN2019-06-062-0/+96
* | | | | | | | | Merge pull request #36467 from spk/add-doc-host-protocol-asset_pathRafael França2019-07-241-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation on actionview asset_path with host and protocolLaurent Arnoud2019-06-121-0/+2
* | | | | | | | | | Merge pull request #36749 from sergey-alekseev/patch-1Rafael França2019-07-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix a typo in 5_2_release_notes.mdSergey Alekseev2019-07-241-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #36741 from Edouard-chin/ec-system-test-url-optionsEileen M. Uchitelle2019-07-242-5/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Define the `url_options` needed for SytemTest inside the route proxy:Edouard CHIN2019-07-242-5/+52
* | | | | | | | | | | Merge pull request #36744 from freeletics/fix-db-prepareEileen M. Uchitelle2019-07-242-3/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed db:prepare task to not touch schema when dump_schema_after_migration is...Wojciech Wnętrzak2019-07-242-3/+20
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #36746 from abhaynikam/36738-followup-to-fix-typo-in-depre...Ryuta Kamizono2019-07-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed the typo in the deprecation error messages. Followup #36738Abhay Nikam2019-07-231-1/+1
* | | | | | | | | | | | Fix broken rdoc for UrlHelper [ci skip]Ryuta Kamizono2019-07-241-6/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #36370 from ptoomey3/masterRafael França2019-07-232-1/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update activesupport/test/parameter_filter_test.rb Patrick Toomey2019-07-231-1/+0
| * | | | | | | | | | | Use style consistent with surrounding codePatrick Toomey2019-05-311-3/+1
| * | | | | | | | | | | Fix typoPatrick Toomey2019-05-311-1/+1
| * | | | | | | | | | | Recursively process arrays consistentlyPatrick Toomey2019-05-311-1/+8
| * | | | | | | | | | | Add failing test for array values and procsPatrick Toomey2019-05-311-0/+8
* | | | | | | | | | | | Merge pull request #36738 from Edouard-chin/ec-errors-to_hash-stringRafael França2019-07-232-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Modify behaviour of `AM::Errors#to_h`:Edouard CHIN2019-07-232-4/+9
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #36665 from jmschneider/masterRafael Mendonça França2019-07-233-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Make currency symbols optional for money column type in PostgreSQLJoel Schneider2019-07-123-2/+10
* | | | | | | | | | | | Merge pull request #36542 from spk/add-pidfile-option-to-puma-confRafael França2019-07-231-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add pidfile option to puma config templateLaurent Arnoud2019-06-231-0/+3
* | | | | | | | | | | | | Merge pull request #36642 from wagenet/fix-disk-service-hostRafael França2019-07-232-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix host for ActiveStorage DiskServicePeter Wagenet2019-07-092-3/+13
* | | | | | | | | | | | | Merge pull request #36733 from ch3rub1m/fix-cache-timestamp-format-guideRafael França2019-07-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix cache_timestamp_format default value in guidesch3rub1m2019-07-231-1/+1