Skip to content

Commit 65bbc15

Browse files
committed
Merge remote-tracking branch 'origin/master' into spassky
2 parents 221a0b0 + bc2db90 commit 65bbc15

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ minimum_version =
1313
when "7.1"
1414
"~>7.1.4"
1515
when "7.2"
16-
"~>7.2.1"
16+
"~>7.2.3"
1717
end
1818

1919
gem "activesupport", minimum_version

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ManageIQ::Gems::Pending
22

33
[![Gem Version](https://badge.fury.io/rb/manageiq-gems-pending.svg)](http://badge.fury.io/rb/manageiq-gems-pending)
4-
[![CI](https://github.com/ManageIQ/manageiq-gems-pending/actions/workflows/ci.yaml/badge.svg?branch=spassky)](https://github.com/ManageIQ/manageiq-gems-pending/actions/workflows/ci.yaml)
4+
[![CI](https://github.com/ManageIQ/manageiq-gems-pending/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/ManageIQ/manageiq-gems-pending/actions/workflows/ci.yaml)
55
[![Code Climate](https://codeclimate.com/github/ManageIQ/manageiq-gems-pending.svg)](https://codeclimate.com/github/ManageIQ/manageiq-gems-pending)
66
[![Test Coverage](https://codeclimate.com/github/ManageIQ/manageiq-gems-pending/badges/coverage.svg)](https://codeclimate.com/github/ManageIQ/manageiq-gems-pending/coverage)
77

lib/gems/pending/util/mount/miq_generic_mount_session.rb

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,22 +90,16 @@ def mount_share
9090
@mnt_point = settings_mount_point || Dir.mktmpdir("miq_")
9191
end
9292

93-
def get_ping_depot_options
94-
@@ping_depot_options ||= begin
95-
opts = ::VMDB::Config.new("vmdb").config[:log][:collection] if defined?(::VMDB) && defined?(::VMDB::CONFIG)
96-
opts = {:ping_depot => false}
97-
opts
98-
end
93+
private def ping_depot_options
94+
@ping_depot_options ||= {:ping_depot => false, :ping_depot_timeout => 20}
9995
end
10096

10197
def ping_timeout
102-
get_ping_depot_options
103-
@@ping_timeout ||= (@@ping_depot_options[:ping_depot_timeout] || 20)
98+
@ping_timeout ||= (ping_depot_options[:ping_depot_timeout] || 20)
10499
end
105100

106101
def do_ping?
107-
get_ping_depot_options
108-
@@do_ping ||= @@ping_depot_options[:ping_depot] == true
102+
@do_ping ||= ping_depot_options[:ping_depot] == true
109103
end
110104

111105
def pingable?

manageiq-gems-pending.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
4343
s.add_development_dependency "ftpd", "~> 2.1.0"
4444
s.add_development_dependency "manageiq-style", ">= 1.5.4"
4545

46-
s.add_development_dependency "rack", "~> 3.1.17" # this ensures manageiq-style's rack requirement is safe
46+
s.add_development_dependency "rack", "~> 3.1.19" # this ensures manageiq-style's rack requirement is safe CVE-2025-61919 https://github.com/advisories/GHSA-6xw4-3v39-52mm
4747
s.add_development_dependency "rake", ">= 12.3.3"
4848
s.add_development_dependency "rspec", "~> 3.13"
4949
s.add_development_dependency "simplecov", ">= 0.21.2"

0 commit comments

Comments
 (0)