Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from huginn:master #53

Merged
merged 3 commits into from
Oct 10, 2024
Merged

[pull] master from huginn:master #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6a7cf4
Update dependency puma to v6.4.3 [SECURITY] (#3443)
renovate[bot] Oct 7, 2024
dcd91d6
Update dependency mini_magick to v5 (#3428)
renovate[bot] Oct 7, 2024
ae9b78a
Update patch updated gems (#3427)
renovate[bot] Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ end
gem 'ace-rails-ap'
gem 'bootsnap', require: false
gem 'bootstrap-kaminari-views', '~> 0.0.5'
gem 'bundler', '>= 2.5.14'
gem 'bundler', '>= 2.5.21'
gem 'coffee-rails', '~> 5'
gem 'daemons', '~> 1.4.1'
gem 'delayed_job'
gem 'delayed_job_active_record'
gem 'devise', '~> 4.9', '>= 4.9.4'
gem 'em-http-request', '~> 1.1.7'
gem 'execjs'
gem 'faraday', '~> 1.10', '>= 1.10.3'
gem 'faraday', '~> 1.10', '>= 1.10.4'
gem 'faraday_middleware'
gem 'feedjira', '~> 3.2', '>= 3.2.3'
gem 'font-awesome-sass', '~> 4.7.0'
Expand All @@ -113,23 +113,23 @@ gem 'json', '~> 2.7', '>= 2.7.2'
gem 'jsonpath', '~> 1.1', '>= 1.1.5'
gem 'kaminari', '~> 1.2', '>= 1.2.2'
gem 'kramdown'
gem 'liquid', '~> 5.5'
gem 'liquid', '~> 5.5', '>= 5.5.1'
gem 'loofah', '~> 2.22'
gem 'mail', '>= 2.8.1'
gem 'mini_magick', ">= 4.12.0"
gem 'mini_magick', ">= 5.0.1"
gem 'multi_xml'
gem "nokogiri", ">= 1.16.6"
gem "nokogiri", ">= 1.16.7"
gem 'omniauth'
gem 'rails', '~> 6.1.7', '>= 6.1.7.8'
gem 'rails-html-sanitizer', '~> 1.6'
gem 'rufus-scheduler', '~> 3.9', '>= 3.9.1', require: false
gem 'rufus-scheduler', '~> 3.9', '>= 3.9.2', require: false
gem 'sass-rails', '>= 6.0'
gem 'select2-rails'
gem 'spectrum-rails'
gem 'sprockets'
gem 'terser'
gem 'typhoeus', '~> 1.4.1'
gem 'uglifier', '~> 4.2.0'
gem 'uglifier', '~> 4.2.1'

group :development do
gem 'better_errors'
Expand Down Expand Up @@ -202,7 +202,7 @@ ENV['DATABASE_ADAPTER'] ||=
end

if_true(ENV['DATABASE_ADAPTER'].strip == 'postgresql') do
gem 'pg', '~> 1.5', '>= 1.5.6'
gem 'pg', '~> 1.5', '>= 1.5.8'
end

if_true(ENV['DATABASE_ADAPTER'].strip == 'mysql2') do
Expand Down
52 changes: 26 additions & 26 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ GEM
evernote-thrift
oauth (>= 0.4.1)
execjs (2.9.1)
faraday (1.10.3)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -290,7 +290,7 @@ GEM
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
Expand All @@ -307,7 +307,7 @@ GEM
font-awesome-sass (4.7.0)
sass (>= 3.2)
formatador (1.1.0)
fugit (1.11.0)
fugit (1.11.1)
et-orbi (~> 1, >= 1.2.11)
raabro (~> 1.4)
gems (1.2.0)
Expand Down Expand Up @@ -477,7 +477,7 @@ GEM
libv8-node (16.10.0.0-arm64-darwin)
libv8-node (16.10.0.0-x86_64-darwin)
libv8-node (16.10.0.0-x86_64-linux)
liquid (5.5.0)
liquid (5.5.1)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand Down Expand Up @@ -505,7 +505,7 @@ GEM
mimemagic (0.4.3)
nokogiri (~> 1)
rake
mini_magick (4.12.0)
mini_magick (5.0.1)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
mini_racer (0.6.3)
Expand Down Expand Up @@ -536,17 +536,17 @@ GEM
net-protocol
net-ssh (7.1.0)
netrc (0.11.0)
nio4r (2.7.1)
nokogiri (1.16.6)
nio4r (2.7.3)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.6-aarch64-linux)
nokogiri (1.16.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm64-darwin)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-darwin)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
Expand Down Expand Up @@ -593,7 +593,7 @@ GEM
parallel (1.23.0)
parser (3.2.2.1)
ast (~> 2.4.1)
pg (1.5.6)
pg (1.5.8)
pirate_weather_forecast_ruby (0.1.0)
faraday
hashie
Expand All @@ -603,10 +603,10 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.5)
puma (6.4.2)
puma (6.4.3)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.8.0)
racc (1.8.1)
rack (2.2.9)
rack-livereload (0.5.1)
rack
Expand Down Expand Up @@ -729,8 +729,8 @@ GEM
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
rufus-scheduler (3.9.1)
fugit (~> 1.1, >= 1.1.6)
rufus-scheduler (3.9.2)
fugit (~> 1.1, >= 1.11.1)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand Down Expand Up @@ -810,7 +810,7 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
uglifier (4.2.0)
uglifier (4.2.1)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
Expand Down Expand Up @@ -858,7 +858,7 @@ DEPENDENCIES
binding_of_caller
bootsnap
bootstrap-kaminari-views (~> 0.0.5)
bundler (>= 2.5.14)
bundler (>= 2.5.21)
capistrano
capistrano-bundler
capistrano-rails
Expand All @@ -875,7 +875,7 @@ DEPENDENCIES
erector!
evernote_oauth
execjs
faraday (~> 1.10, >= 1.10.3)
faraday (~> 1.10, >= 1.10.4)
faraday_middleware
feedjira (~> 3.2, >= 3.2.3)
ffi (>= 1.16.3)
Expand All @@ -901,25 +901,25 @@ DEPENDENCIES
kaminari (~> 1.2, >= 1.2.2)
kramdown
letter_opener_web (~> 2.0)
liquid (~> 5.5)
liquid (~> 5.5, >= 5.5.1)
listen (~> 3.9.0)
loofah (~> 2.22)
mail (>= 2.8.1)
mini_magick (>= 4.12.0)
mini_magick (>= 5.0.1)
mini_racer
mqtt
multi_xml
mysql2 (~> 0.5, >= 0.5.6)
net-ftp
net-ftp-list
nokogiri (>= 1.16.6)
nokogiri (>= 1.16.7)
omniauth
omniauth-dropbox-oauth2!
omniauth-evernote
omniauth-google-oauth2 (>= 0.8.2)
omniauth-tumblr
omniauth-twitter
pg (~> 1.5, >= 1.5.6)
pg (~> 1.5, >= 1.5.8)
pirate_weather_forecast_ruby
puma
rack-livereload
Expand All @@ -937,7 +937,7 @@ DEPENDENCIES
rubocop
rubocop-performance
rubocop-rspec
rufus-scheduler (~> 3.9, >= 3.9.1)
rufus-scheduler (~> 3.9, >= 3.9.2)
sass-rails (>= 6.0)
select2-rails
selenium-webdriver
Expand All @@ -958,7 +958,7 @@ DEPENDENCIES
typhoeus (~> 1.4.1)
tzinfo (>= 2.0.6)
tzinfo-data
uglifier (~> 4.2.0)
uglifier (~> 4.2.1)
unicorn
unicorn-rails
vcr
Expand All @@ -971,4 +971,4 @@ RUBY VERSION
ruby 3.2.4p170

BUNDLED WITH
2.5.14
2.5.21
Loading