nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8425 from jhass/8424_fix_yaml_load

Browse source 
Use YAML.unsafe_load_file when available in bundler helper
This commit is contained in:
Benjamin Neff 2023-06-12 01:49:21 +02:00
commit 9cdfd3a55b
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -53,7 +53,7 @@ We recommend setting up new pods using Ruby 3.0, and updating existing pods to t
* Drop `strip_exif` flag and always remove exif data from uploaded images [#8417](https://github.com/diaspora/diaspora/pull/8417)
* Replace `apparition` with `cuprite` [#8418](https://github.com/diaspora/diaspora/pull/8418)
* Remove `i18n-inflector-rails` for translations [#8420](https://github.com/diaspora/diaspora/pull/8420)
* Update carrierwave and add ruby 3.0 support [#8423](https://github.com/diaspora/diaspora/pull/8423)
* Add ruby 3.0 support [#8423](https://github.com/diaspora/diaspora/pull/8423)
## Bug fixes
* Fix multiple photos upload progress bar [#7655](https://github.com/diaspora/diaspora/pull/7655)

13
config/bundler_helper.rb
View file

@ -19,8 +19,19 @@ module BundlerHelper
end
private_class_method def self.parse_value_from_yaml_file(file, *keys)
parse_yaml_file(file).dig(*keys)
end
private_class_method def self.parse_yaml_file(file)
path = File.join(__dir__, file)
YAML.load_file(path).dig(*keys) if File.file?(path)
return {} unless File.file?(path)
if YAML.respond_to?(:unsafe_load_file)
YAML.unsafe_load_file(path)
else
YAML.load_file(path)
end
end
private_class_method def self.parse_value_from_toml_file(file, key)