File tree 4 files changed +5
-11
lines changed
4 files changed +5
-11
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"postgresql" : [" 13" ],
3
- "ruby" : [" 2.7 " , " 3.0" ],
3
+ "ruby" : [" 3.0" ],
4
4
"node" : [" 18" ]
5
5
}
Original file line number Diff line number Diff line change @@ -208,14 +208,14 @@ def ipaddr
208
208
def cidr
209
209
return if mask . nil?
210
210
IPAddr . new ( mask ) . to_i . to_s ( 2 ) . count ( "1" )
211
- rescue invalid_address_error
211
+ rescue IPAddr :: InvalidAddressError
212
212
nil
213
213
end
214
214
215
215
def cidr = ( cidr )
216
216
return if cidr . nil?
217
217
self [ :mask ] = IPAddr . new ( in_mask , family ) . mask ( cidr ) . to_s
218
- rescue invalid_address_error
218
+ rescue IPAddr :: InvalidAddressError
219
219
nil
220
220
end
221
221
@@ -438,10 +438,4 @@ def new_network_type(args)
438
438
raise ::Foreman ::Exception . new N_ ( "unknown network_type" )
439
439
end
440
440
end
441
-
442
- def invalid_address_error
443
- # IPAddr::InvalidAddressError is undefined for ruby 1.9
444
- return IPAddr ::InvalidAddressError if IPAddr . const_defined? ( 'InvalidAddressError' )
445
- ArgumentError
446
- end
447
441
end
Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ class Application < Rails::Application
161
161
# Disable fieldWithErrors divs
162
162
config . action_view . field_error_proc = proc { |html_tag , instance | html_tag . to_s . html_safe }
163
163
164
- # Configure the default encoding used in templates for Ruby 1.9.
164
+ # Configure the default encoding used in templates
165
165
config . encoding = "utf-8"
166
166
167
167
# Configure sensitive parameters which will be filtered from the log file.
Original file line number Diff line number Diff line change 2
2
3
3
unless File . exist? ( File . expand_path ( '../Gemfile.in' , __dir__ ) )
4
4
ENV [ 'BUNDLE_GEMFILE' ] ||= File . expand_path ( '../Gemfile' , __dir__ )
5
- # Set up boootsnap on Ruby 2.7+ in development and test env with Bundler enabled and development/test group
5
+ # Set up boootsnap in development and test env with Bundler enabled and development/test group
6
6
early_env = ENV [ "RAILS_ENV" ] || ENV [ "RACK_ENV" ] || "development"
7
7
require 'active_support/dependencies'
8
8
require ( 'bootsnap/setup' ) if %w[ development test ] . include? ( early_env ) && File . exist? ( ENV [ 'BUNDLE_GEMFILE' ] ) && !Gem ::Specification . stubs_for ( "bootsnap" ) . empty?
You can’t perform that action at this time.
0 commit comments