Commit a4f7840e authored by Meghea Iulian's avatar Meghea Iulian Committed by Bjørn Forsman
Browse files

redmine: fix Gemfile

Correct the Gemfile dependecies according to the 5.0.5 Gemfile.
Make sure that `rexml` gem is always included.
parent 5fa2f209
Loading
Loading
Loading
Loading
+37 −33
Original line number Diff line number Diff line
source 'https://rubygems.org'

ruby '>= 2.7.0', '< 3.3.0'
ruby '>= 2.5.0', '< 3.2.0'
gem 'bundler', '>= 1.12.0'

gem 'rails', '6.1.7.3'
gem 'rouge', '~> 4.1.0'
gem 'rails', '6.1.7.2'
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.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', '~> 3.0.0'
gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0')
gem 'marcel'
gem 'mail', '~> 2.8.1'
gem 'nokogiri', '~> 1.14.0'
gem 'i18n', '~> 1.13.0'
gem 'rbpdf', '~> 1.21.1'
gem "mail", "~> 2.7.1"
gem 'csv', '~> 3.2.0'
gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.10')
gem "rexml"
gem 'i18n', '~> 1.10.0'
gem 'rbpdf', '~> 1.21.0'
gem 'addressable'
gem 'rubyzip', '~> 2.3.0'

#  Ruby Standard Gems
gem 'csv', '~> 3.2.6'
gem 'net-imap', '~> 0.3.4'
gem 'net-pop', '~> 0.1.2'
gem 'net-smtp', '~> 0.3.3'
gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0')
gem 'net-smtp', '~> 0.3.0'
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')

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@@ -30,10 +32,6 @@ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
gem 'rotp', '>= 5.0.0'
gem 'rqrcode'

# HTML pipeline and sanitization
gem "html-pipeline", "~> 2.13.2"
gem "sanitize", "~> 6.0"

# Optional gem for LDAP authentication
group :ldap do
  gem 'net-ldap', '~> 0.17.0'
@@ -41,17 +39,18 @@ end

# Optional gem for exporting the gantt to a PNG file
group :minimagick do
  gem 'mini_magick', '~> 4.12.0'
  gem 'mini_magick', '~> 4.11.0'
end

# Optional Markdown support
group :markdown do
  gem 'redcarpet', '~> 3.6.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 "commonmarker", '~> 0.23.8'
  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

@@ -71,18 +70,23 @@ end

group :test do
  gem "rails-dom-testing"
  gem 'mocha', '>= 1.4.0'
  gem 'simplecov', '~> 0.22.0', :require => false
  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: [:mri, :mingw, :x64_mingw, :mswin]
  # For running system tests
  gem 'puma'
  gem 'capybara', '~> 3.38.0'
  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.51.0', require: false
  gem 'rubocop-performance', '~> 1.17.1', require: false
  gem 'rubocop-rails', '~> 2.19.1', require: false
  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")
+101 −101
Original line number Diff line number Diff line
GEM
  remote: https://rubygems.org/
  specs:
    actioncable (6.1.7.3)
      actionpack (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    actioncable (6.1.7.2)
      actionpack (= 6.1.7.2)
      activesupport (= 6.1.7.2)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
    actionmailbox (6.1.7.3)
      actionpack (= 6.1.7.3)
      activejob (= 6.1.7.3)
      activerecord (= 6.1.7.3)
      activestorage (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    actionmailbox (6.1.7.2)
      actionpack (= 6.1.7.2)
      activejob (= 6.1.7.2)
      activerecord (= 6.1.7.2)
      activestorage (= 6.1.7.2)
      activesupport (= 6.1.7.2)
      mail (>= 2.7.1)
    actionmailer (6.1.7.3)
      actionpack (= 6.1.7.3)
      actionview (= 6.1.7.3)
      activejob (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    actionmailer (6.1.7.2)
      actionpack (= 6.1.7.2)
      actionview (= 6.1.7.2)
      activejob (= 6.1.7.2)
      activesupport (= 6.1.7.2)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
    actionpack (6.1.7.3)
      actionview (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    actionpack (6.1.7.2)
      actionview (= 6.1.7.2)
      activesupport (= 6.1.7.2)
      rack (~> 2.0, >= 2.0.9)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
@@ -30,34 +30,34 @@ GEM
    actionpack-xml_parser (2.0.1)
      actionpack (>= 5.0)
      railties (>= 5.0)
    actiontext (6.1.7.3)
      actionpack (= 6.1.7.3)
      activerecord (= 6.1.7.3)
      activestorage (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    actiontext (6.1.7.2)
      actionpack (= 6.1.7.2)
      activerecord (= 6.1.7.2)
      activestorage (= 6.1.7.2)
      activesupport (= 6.1.7.2)
      nokogiri (>= 1.8.5)
    actionview (6.1.7.3)
      activesupport (= 6.1.7.3)
    actionview (6.1.7.2)
      activesupport (= 6.1.7.2)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    activejob (6.1.7.3)
      activesupport (= 6.1.7.3)
    activejob (6.1.7.2)
      activesupport (= 6.1.7.2)
      globalid (>= 0.3.6)
    activemodel (6.1.7.3)
      activesupport (= 6.1.7.3)
    activerecord (6.1.7.3)
      activemodel (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    activestorage (6.1.7.3)
      actionpack (= 6.1.7.3)
      activejob (= 6.1.7.3)
      activerecord (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    activemodel (6.1.7.2)
      activesupport (= 6.1.7.2)
    activerecord (6.1.7.2)
      activemodel (= 6.1.7.2)
      activesupport (= 6.1.7.2)
    activestorage (6.1.7.2)
      actionpack (= 6.1.7.2)
      activejob (= 6.1.7.2)
      activerecord (= 6.1.7.2)
      activesupport (= 6.1.7.2)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
    activesupport (6.1.7.3)
    activesupport (6.1.7.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@@ -84,9 +84,9 @@ GEM
    css_parser (1.14.0)
      addressable
    csv (3.2.6)
    date (3.3.3)
    deckar01-task_list (2.3.2)
      html-pipeline
    digest (3.1.1)
    docile (1.4.0)
    erubi (1.12.0)
    ffi (1.15.5)
@@ -96,33 +96,30 @@ GEM
      activesupport (>= 2)
      nokogiri (>= 1.4)
    htmlentities (4.3.4)
    i18n (1.13.0)
    i18n (1.10.0)
      concurrent-ruby (~> 1.0)
    json (2.6.3)
    listen (3.8.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    loofah (2.21.3)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.8.1)
    mail (2.7.1)
      mini_mime (>= 0.1.1)
      net-imap
      net-pop
      net-smtp
    marcel (1.0.2)
    matrix (0.4.2)
    method_source (1.0.0)
    mini_magick (4.12.0)
    mini_magick (4.11.0)
    mini_mime (1.1.2)
    mini_portile2 (2.8.2)
    minitest (5.18.0)
    mocha (2.0.2)
    minitest (5.18.1)
    mocha (2.0.4)
      ruby2_keywords (>= 0.0.5)
    mysql2 (0.5.5)
    net-imap (0.3.4)
      date
    net-imap (0.2.3)
      digest
      net-protocol
      strscan
    net-ldap (0.17.1)
    net-pop (0.1.2)
      net-protocol
@@ -131,45 +128,46 @@ GEM
    net-smtp (0.3.3)
      net-protocol
    nio4r (2.5.9)
    nokogiri (1.14.4)
    nokogiri (1.13.10)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    nokogiri (1.14.4-x86_64-linux)
    nokogiri (1.13.10-x86_64-linux)
      racc (~> 1.4)
    parallel (1.23.0)
    parser (3.2.2.1)
    parser (3.2.2.3)
      ast (~> 2.4.1)
      racc
    pg (1.4.6)
    public_suffix (5.0.1)
    puma (6.2.2)
    puma (6.3.0)
      nio4r (~> 2.0)
    racc (1.6.2)
    racc (1.7.1)
    rack (2.2.7)
    rack-test (2.1.0)
      rack (>= 1.3)
    rails (6.1.7.3)
      actioncable (= 6.1.7.3)
      actionmailbox (= 6.1.7.3)
      actionmailer (= 6.1.7.3)
      actionpack (= 6.1.7.3)
      actiontext (= 6.1.7.3)
      actionview (= 6.1.7.3)
      activejob (= 6.1.7.3)
      activemodel (= 6.1.7.3)
      activerecord (= 6.1.7.3)
      activestorage (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    rails (6.1.7.2)
      actioncable (= 6.1.7.2)
      actionmailbox (= 6.1.7.2)
      actionmailer (= 6.1.7.2)
      actionpack (= 6.1.7.2)
      actiontext (= 6.1.7.2)
      actionview (= 6.1.7.2)
      activejob (= 6.1.7.2)
      activemodel (= 6.1.7.2)
      activerecord (= 6.1.7.2)
      activestorage (= 6.1.7.2)
      activesupport (= 6.1.7.2)
      bundler (>= 1.15.0)
      railties (= 6.1.7.3)
      railties (= 6.1.7.2)
      sprockets-rails (>= 2.0.0)
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.5.0)
      loofah (~> 2.19, >= 2.19.1)
    railties (6.1.7.3)
      actionpack (= 6.1.7.3)
      activesupport (= 6.1.7.3)
    railties (6.1.7.2)
      actionpack (= 6.1.7.2)
      activesupport (= 6.1.7.2)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
@@ -182,8 +180,8 @@ GEM
      htmlentities
      rbpdf-font (~> 1.19.0)
    rbpdf-font (1.19.1)
    redcarpet (3.6.0)
    regexp_parser (2.8.0)
    redcarpet (3.5.1)
    regexp_parser (2.8.1)
    request_store (1.5.1)
      rack (>= 1.4)
    rexml (3.2.5)
@@ -194,30 +192,29 @@ GEM
      railties (>= 5.1, < 7.1)
      roadie (~> 5.0)
    rotp (6.2.2)
    rouge (4.1.1)
    rouge (3.28.0)
    rqrcode (2.2.0)
      chunky_png (~> 1.0)
      rqrcode_core (~> 1.0)
    rqrcode_core (1.2.0)
    rubocop (1.51.0)
      json (~> 2.3)
    rubocop (1.26.1)
      parallel (~> 1.10)
      parser (>= 3.2.0.0)
      parser (>= 3.1.0.0)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 1.8, < 3.0)
      rexml (>= 3.2.5, < 4.0)
      rubocop-ast (>= 1.28.0, < 2.0)
      rexml
      rubocop-ast (>= 1.16.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 3.0)
    rubocop-ast (1.28.1)
      unicode-display_width (>= 1.4.0, < 3.0)
    rubocop-ast (1.29.0)
      parser (>= 3.2.1.0)
    rubocop-performance (1.17.1)
    rubocop-performance (1.13.3)
      rubocop (>= 1.7.0, < 2.0)
      rubocop-ast (>= 0.4.0)
    rubocop-rails (2.19.1)
    rubocop-rails (2.14.2)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.33.0, < 2.0)
      rubocop (>= 1.7.0, < 2.0)
    ruby-progressbar (1.13.0)
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
@@ -227,7 +224,7 @@ GEM
    selenium-webdriver (3.142.7)
      childprocess (>= 0.5, < 4.0)
      rubyzip (>= 1.2.2)
    simplecov (0.22.0)
    simplecov (0.21.2)
      docile (~> 1.1)
      simplecov-html (~> 0.11)
      simplecov_json_formatter (~> 0.1)
@@ -240,8 +237,9 @@ GEM
      actionpack (>= 5.2)
      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
    strscan (3.0.6)
    thor (1.2.2)
    timeout (0.3.2)
    timeout (0.4.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    unicode-display_width (2.4.2)
@@ -264,43 +262,45 @@ PLATFORMS
DEPENDENCIES
  actionpack-xml_parser
  addressable
  bundler (>= 1.12.0)
  capybara (~> 3.38.0)
  commonmarker (~> 0.23.8)
  csv (~> 3.2.6)
  csv (~> 3.2.0)
  deckar01-task_list (= 2.3.2)
  ffi
  html-pipeline (~> 2.13.2)
  i18n (~> 1.13.0)
  i18n (~> 1.10.0)
  listen (~> 3.3)
  mail (~> 2.8.1)
  mail (~> 2.7.1)
  marcel
  mini_magick (~> 4.12.0)
  mini_magick (~> 4.11.0)
  mini_mime (~> 1.1.0)
  mocha (>= 1.4.0)
  mysql2 (~> 0.5.0)
  net-imap (~> 0.3.4)
  net-imap (~> 0.2.2)
  net-ldap (~> 0.17.0)
  net-pop (~> 0.1.2)
  net-smtp (~> 0.3.3)
  nokogiri (~> 1.14.0)
  net-pop (~> 0.1.1)
  net-smtp (~> 0.3.0)
  nokogiri (~> 1.13.10)
  pg (~> 1.4.2)
  puma
  rails (= 6.1.7.3)
  rails (= 6.1.7.2)
  rails-dom-testing
  rbpdf (~> 1.21.1)
  redcarpet (~> 3.6.0)
  rbpdf (~> 1.21.0)
  redcarpet (~> 3.5.1)
  request_store (~> 1.5.0)
  rexml
  roadie-rails (~> 3.0.0)
  rotp (>= 5.0.0)
  rouge (~> 4.1.0)
  rouge (~> 3.28.0)
  rqrcode
  rubocop (~> 1.51.0)
  rubocop-performance (~> 1.17.1)
  rubocop-rails (~> 2.19.1)
  rubocop (~> 1.26.0)
  rubocop-performance (~> 1.13.0)
  rubocop-rails (~> 2.14.0)
  rubyzip (~> 2.3.0)
  sanitize (~> 6.0)
  selenium-webdriver (~> 3.142.7)
  simplecov (~> 0.22.0)
  simplecov (~> 0.21.2)
  tzinfo-data
  webdrivers (= 4.6.1)
  webrick
+91 −91

File changed.

Preview size limit exceeded, changes collapsed.