Compare commits

..

No commits in common. "ae1fa38314aea9bef84e0d7524bafdc2a798a96e" and "553fb82adc627f2c9c7738d18a50827fbe3897ca" have entirely different histories.

3 changed files with 3 additions and 14 deletions

View File

@ -105,10 +105,6 @@ module Announcement
puts ['there_was_no_show_option_method',e]
end
if File.basename($0) != 'rake'
gem_root = Announcement::Engine.root
require File.join(gem_root, 'app/models/bulletin_feed')
require File.join(gem_root, 'app/models/bulletin_feed_cache')
require File.join(gem_root, 'app/models/anns_cache')
begin
avoid_page_cache AnnsCache
avoid_page_cache BulletinFeedCache

View File

@ -7,9 +7,10 @@ module Announcement
require File.join(gem_root, 'app/models/bulletin')
require File.join(gem_root, 'app/models/bulletin_feed')
require File.join(gem_root, 'app/models/bulletin_feed_cache')
require File.join(gem_root, 'app/models/anns_cache')
setting = AnnouncementSetting.first || AnnouncementSetting.create
require File.join(Announcement::Engine.root, 'app/models/anns_cache')
setting = AnnouncementSetting.first
if !setting.migrate_flag.include?("v1")
Bulletin.all.pluck(:id, :title).each do |id, title_translations|

View File

@ -211,21 +211,13 @@ else
gem 'rss'
#parser
if RUBY_VERSION.to_f >= 3.0
if RUBY_VERSION.to_f >= 3.2
gem 'multi_xml'
else
gem 'multi_xml', '0.6.0'
end
gem 'public_suffix'
gem 'nokogiri', '~> 1.16', '>= 1.16.2'
gem 'json'
gem 'set'
else
gem 'multi_xml', '0.6.0'
gem 'public_suffix', '5.0.5'
gem 'nokogiri', '~> 1.8.5'
gem 'json', '2.6.1'
gem 'set', '1.0.4'
end
gem 'actionpack-page_caching'