diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83008fb1b..ba5393b47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: database-password: 'root' database-port: '3306' docker-compose-file: 'docker-compose.ci.mysql.yml' - - ruby-version: 'jruby-9.4.2.0' - database-adapter: 'mariadb' + - ruby-version: 'jruby-9.4.15.0' + database-adapter: 'mysql2' database-user: 'root' database-password: 'root' database-port: '3306' @@ -36,7 +36,7 @@ jobs: database-password: 'postgres' database-port: '5432' docker-compose-file: 'docker-compose.ci.postgresql.yml' - - ruby-version: 'jruby-9.4.2.0' + - ruby-version: 'jruby-9.4.15.0' database-adapter: 'postgresql' database-user: 'postgres' database-password: 'postgres' diff --git a/Gemfile b/Gemfile index 7b809cb7f..db4304596 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '>= 3.1.0' gemspec -gem 'rails', '~> 7.0.1' +gem 'rails', '~> 7.2.0' # Lock i18n to 1.14.x for: https://github.com/ruby-i18n/i18n/issues/735 gem 'i18n', '~> 1.14.0' @@ -26,7 +26,7 @@ group :development do gem 'simplecov' if defined?(JRUBY_VERSION) - gem 'activerecord-jdbc-adapter', '~> 70.0' + gem 'activerecord-jdbc-adapter', '~> 72.0' # Add the drivers gem 'jdbc-mariadb' gem 'jdbc-postgres' diff --git a/README.md b/README.md index f9a7d6471..4c220121a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Kill Bill compatibility Dependencies ------------ -Ruby 3.2.2+ or JRuby 9.4.2.0+ required. +Ruby 3.1.0+ or JRuby 9.4.15.0+ required. Running Kaui locally --------------------- diff --git a/app/helpers/kaui/exception_helper.rb b/app/helpers/kaui/exception_helper.rb index 072fa1d05..bb53593af 100644 --- a/app/helpers/kaui/exception_helper.rb +++ b/app/helpers/kaui/exception_helper.rb @@ -21,7 +21,7 @@ def standardize_exception(exception) I18n.t('errors.messages.error_communicating_killbill') else # Show detailed error in development/test, or when KAUI_SHOW_ERROR_DETAILS is set (for Docker) - show_details = Rails.env.development? || Rails.env.test? || ENV['KAUI_SHOW_ERROR_DETAILS'].present? + show_details = Rails.env.local? || ENV['KAUI_SHOW_ERROR_DETAILS'].present? show_details ? exception.message : nil end end diff --git a/app/views/kaui/admin_allowed_users/_form.html.erb b/app/views/kaui/admin_allowed_users/_form.html.erb index 59cd35ba7..ff42ae7ca 100644 --- a/app/views/kaui/admin_allowed_users/_form.html.erb +++ b/app/views/kaui/admin_allowed_users/_form.html.erb @@ -1,7 +1,11 @@ <%= form_for @allowed_user, :url => @allowed_user.persisted? ? admin_allowed_user_path(@allowed_user.id) : admin_allowed_users_path, :method => @allowed_user.persisted? ? :put : :post, :html => {:class => 'form-horizontal'} do |f| %>
- <%= f.label ' ', :class => 'col-sm-3 control-label' %> + <%# Not associated with a real attribute - use label_tag instead of f.label, which under + Rails 7.2 raises NoMethodError (undefined method `humanize' for nil) for a blank name, + since ActiveModel::Translation#human_attribute_name only handles a blank *namespaced* + attribute (e.g. "foo."), not a plain blank string. %> + <%= label_tag nil, ' ', :class => 'col-sm-3 control-label' %>