diff --git a/www/redmine50/files/patch-Gemfile b/www/redmine50/files/patch-Gemfile index 55e7c3ee8080..126a1f19666f 100644 --- a/www/redmine50/files/patch-Gemfile +++ b/www/redmine50/files/patch-Gemfile @@ -1,126 +1,130 @@ --- Gemfile.orig 2023-03-07 15:50:05.013891000 +0100 +++ Gemfile 2023-03-08 09:01:06.479289000 +0100 @@ -3,24 +3,24 @@ gem 'bundler', '>= 1.12.0' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '6.1.7.2' +gem 'rails', '>=6.1.6' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') -gem 'rouge', '~> 3.28.0' +gem 'rouge', '>= 3.28.0' gem 'request_store', '~> 1.5.0' gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0') gem 'marcel' -gem "mail", "~> 2.7.1" +gem "mail", ">= 2.7" gem 'csv', '~> 3.2.0' -gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.10') +gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '>= 1.13.9') gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0') -gem 'i18n', '~> 1.10.0' -gem 'rbpdf', '~> 1.21.0' +gem 'i18n', '>= 1.10.0' +gem 'rbpdf', '>= 1.21.0' gem 'addressable' gem 'rubyzip', '~> 2.3.0' gem 'net-smtp', '~> 0.3.0' -gem 'net-imap', '~> 0.2.2' +gem 'net-imap', '>= 0.2.2' gem 'net-pop', '~> 0.1.1' # Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590 gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0') -@@ -37,82 +37,6 @@ end - gem 'net-ldap', '~> 0.17.0' +@@ -34,85 +34,9 @@ group :ldap do + + # Optional gem for LDAP authentication + group :ldap do +- gem 'net-ldap', '~> 0.17.0' ++ gem 'net-ldap', '>= 0.17.0' end -# Optional gem for exporting the gantt to a PNG file -group :minimagick do - gem 'mini_magick', '~> 4.11.0' -end - -# Optional Markdown support, not for JRuby -# ToDo: Remove common_mark group when common_mark is decoupled from markdown. See defect (#36892) for more details. -gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark] - -# Optional CommonMark support, not for JRuby -group :common_mark do - gem "html-pipeline", "~> 2.13.2" - gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8') - gem "sanitize", "~> 6.0" - gem 'deckar01-task_list', '2.3.2' -end - -# Include database gems for the adapters found in the database -# configuration file -require 'erb' -require 'yaml' -database_file = File.join(File.dirname(__FILE__), "config/database.yml") -if File.exist?(database_file) - yaml_config = ERB.new(IO.read(database_file)).result - database_config = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(yaml_config) : YAML.load(yaml_config) - adapters = database_config.values.map {|c| c['adapter']}.compact.uniq - if adapters.any? - adapters.each do |adapter| - case adapter - when 'mysql2' - gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] - when /postgresql/ - gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw] - when /sqlite3/ - gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] - when /sqlserver/ - gem "tiny_tds", "~> 2.1.2", :platforms => [:mri, :mingw, :x64_mingw] - gem "activerecord-sqlserver-adapter", "~> 6.1.0", :platforms => [:mri, :mingw, :x64_mingw] - else - warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems") - end - end - else - warn("No adapter found in config/database.yml, please configure it first") - end -else - warn("Please configure your config/database.yml first") -end - -group :development do - gem 'listen', '~> 3.3' - gem "yard" -end - -group :test do - gem "rails-dom-testing" - gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0') - gem 'simplecov', '~> 0.21.2', :require => false - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] - # For running system tests - gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0') - gem 'capybara', (if Gem.ruby_version < Gem::Version.new('2.6') - '~> 3.35.3' - elsif Gem.ruby_version < Gem::Version.new('2.7') - '~> 3.36.0' - else - '~> 3.38.0' - end) - gem "selenium-webdriver", "~> 3.142.7" - gem 'webdrivers', '4.6.1', require: false - # RuboCop - gem 'rubocop', '~> 1.26.0' - gem 'rubocop-performance', '~> 1.13.0' - gem 'rubocop-rails', '~> 2.14.0' -end - local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile @@ -121,4 +45,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file +end + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| + self.instance_eval(Bundler.read_file(bundle)) end