aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/option_merger_test.rb
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-12-14 09:58:33 -0500
committerGitHub <noreply@github.com>2017-12-14 09:58:33 -0500
commit659c516bef2781cc66865fc78ed5dce682566d26 (patch)
treeeb5ac2568af824f216769496d1a698ee2ae3136c /activesupport/test/option_merger_test.rb
parent4bd28efc189cf58891ece9d57d44994039054ca0 (diff)
parent82822a34217503336d51b7baab82cd18cf71e435 (diff)
downloadrails-659c516bef2781cc66865fc78ed5dce682566d26.tar.gz
rails-659c516bef2781cc66865fc78ed5dce682566d26.tar.bz2
rails-659c516bef2781cc66865fc78ed5dce682566d26.zip
Merge pull request #31289 from witlessbird/fips-compatibility
Initial support for running Rails on FIPS-certified systems
Diffstat (limited to 'activesupport/test/option_merger_test.rb')
0 files changed, 0 insertions, 0 deletions