Skip to content

Commit f7363b4

Browse files
committed
Log logger gem if needed
This soon won't be needed, as 6.1 is out of support and 7.0 is about to be.
1 parent b990a30 commit f7363b4

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# yarn lockfile v1
33

44

5-
lastUpdateCheck 1741566858991
5+
lastUpdateCheck 1741731093687

Gemfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ eval File.read(gems), binding, gems # rubocop: disable Security/Eval
33

44
require "#{__dir__}/lib/bootstrap_form/version"
55

6-
gem "rails", BootstrapForm::REQUIRED_RAILS_VERSION
7-
gem "sprockets-rails", require: "sprockets/railtie"
8-
96
gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
107
gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
118
gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
9+
gem "rails", BootstrapForm::REQUIRED_RAILS_VERSION
10+
gem "sprockets-rails", require: "sprockets/railtie"
1211
gem "sqlite3", "~> 1.4"

gemfiles/common.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ end
1919

2020
group :development, :test do
2121
gem "debug"
22-
gem "pry-byebug"
2322
gem "ostruct" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.5.0")
23+
gem "pry-byebug"
2424
end
2525

2626
group :ci do

lib/bootstrap_form/components/labels.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def label_layout_classes(custom_label_col, group_layout)
4343
end
4444

4545
def label_text(name, options)
46-
label = options[:text] || object&.class&.try(:human_attribute_name, name)&.html_safe # rubocop:disable Rails/OutputSafety Style/SafeNavigationChainLength
46+
label = options[:text] || object&.class&.try(:human_attribute_name, name)&.html_safe # rubocop:disable Rails/OutputSafety, Style/SafeNavigationChainLength
4747
if label_errors && error?(name)
4848
(" ".html_safe + get_error_messages(name)).prepend(label)
4949
else

test/test_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
require "diffy"
44
require "nokogiri"
55
require "equivalent-xml"
6+
require "logger" if Gem.loaded_specs["rails"].version < Gem::Version.new("7.1.0.rc1")
67

78
require_relative "../demo/config/environment"
89
require "rails/test_help"

0 commit comments

Comments
 (0)