Skip to content

Commit

Permalink
Merge pull request huginn#3464 from jjeffers/rails-7.0
Browse files Browse the repository at this point in the history
Upgrade to Rails 7.0.1
  • Loading branch information
knu authored Dec 28, 2024
2 parents 4305c92 + 050c680 commit ea040bd
Show file tree
Hide file tree
Showing 15 changed files with 733 additions and 598 deletions.
28 changes: 14 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ end
# Optional libraries. To conserve RAM, comment out any that you don't need,
# then run `bundle` and commit the updated Gemfile and Gemfile.lock.
gem 'erector', github: 'dsander/erector', branch: 'rails6'
gem 'pirate_weather_forecast_ruby' # WeatherAgent
gem 'hipchat', '~> 1.6.0' # HipchatAgent
gem 'hipchat', '~> 1.6.0' # HipchatAgent
gem 'hypdf', bitbucket: 'knu/hypdf_gem', branch: 'uploadio_namespace' # PDFInfoAgent
gem 'mini_racer' # JavaScriptAgent
gem 'mqtt' # MQTTAgent
gem 'mini_racer' # JavaScriptAgent
gem 'mqtt' # MQTTAgent
gem 'net-ftp'
gem 'net-ftp-list' # FtpsiteAgent
gem 'net-ftp-list' # FtpsiteAgent
gem 'pirate_weather_forecast_ruby' # WeatherAgent
gem 'rturk', '~> 2.12.1' # HumanTaskAgent
gem 'slack-notifier', '~> 2.4.0' # SlackAgent
gem 'twilio-ruby', '~> 7.3.6' # TwilioAgent
Expand Down Expand Up @@ -119,11 +119,11 @@ gem 'kramdown'
gem 'liquid', '~> 5.5', '>= 5.5.1'
gem 'loofah', '~> 2.23', '>= 2.23.1'
gem 'mail', '>= 2.8.1'
gem 'mini_magick', ">= 5.0.1"
gem 'mini_magick', '>= 5.0.1'
gem 'multi_xml'
gem "nokogiri", ">= 1.16.7"
gem 'nokogiri', '>= 1.16.7'
gem 'omniauth'
gem 'rails', '~> 6.1.7', '>= 6.1.7.10'
gem 'rails', '~> 7.0.1'
gem 'rails-html-sanitizer', '~> 1.6', '>= 1.6.2'
gem 'rufus-scheduler', '~> 3.9', '>= 3.9.2', require: false
gem 'sassc-rails'
Expand Down Expand Up @@ -192,14 +192,14 @@ require 'rbconfig'
gem 'ffi', '>= 1.17.0' # required by typhoeus; 1.9.4 has fixes for *BSD.
gem 'tzinfo', '>= 2.0.6' # required by rails; 1.2.0 has support for *BSD and Solaris.
# Windows does not have zoneinfo files, so bundle the tzinfo-data gem.
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
# BSD systems require rb-kqueue for "listen" to avoid polling for changes.
gem 'rb-kqueue', '>= 0.2.8', require: /bsd|dragonfly/i === RbConfig::CONFIG['target_os']

on_heroku = ENV['ON_HEROKU'] ||
ENV['HEROKU_POSTGRESQL_ROSE_URL'] ||
ENV['HEROKU_POSTGRESQL_GOLD_URL'] ||
File.read(File.join(File.dirname(__FILE__), 'Procfile')) =~ /intended for Heroku/
ENV['HEROKU_POSTGRESQL_ROSE_URL'] ||
ENV['HEROKU_POSTGRESQL_GOLD_URL'] ||
File.read(File.join(File.dirname(__FILE__), 'Procfile')) =~ /intended for Heroku/

ENV['DATABASE_ADAPTER'] ||=
if on_heroku
Expand All @@ -213,9 +213,9 @@ if_true(ENV['DATABASE_ADAPTER'].strip == 'postgresql') do
end

if_true(ENV['DATABASE_ADAPTER'].strip == 'mysql2') do
gem 'mysql2', "~> 0.5", ">= 0.5.6"
gem 'mysql2', '~> 0.5', '>= 0.5.6'
end

GemfileHelper.parse_each_agent_gem(ENV['ADDITIONAL_GEMS']) do |args|
gem *args
gem(*args)
end
Loading

0 comments on commit ea040bd

Please sign in to comment.