diff options
| author | Go MAEDA <maeda@farend.jp> | 2022-07-19 16:01:55 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2022-07-19 16:01:55 +0000 |
| commit | 593922581347b897d552783ba0b79e59b7f90261 (patch) | |
| tree | a6014cfcb8e0bfe140ca577935e48efe2c27ebac /Gemfile | |
| parent | 3d075236209bc836a868a993fb36e105564926a1 (diff) | |
| download | redmine-593922581347b897d552783ba0b79e59b7f90261.tar.gz redmine-593922581347b897d552783ba0b79e59b7f90261.zip | |
Merged r21718 from trunk to 5.0-stable (#37452).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21720 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '6.1.6' +gem 'rails', '6.1.6.1' 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' @@ -22,6 +22,8 @@ gem 'rubyzip', '~> 2.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] |