Project

General

Profile

Feature #36205 ยป 36205-v2.patch

Go MAEDA, 2021-11-20 10:00

View differences:

Gemfile
1 1
source 'https://rubygems.org'
2 2

  
3
ruby '>= 2.5.0', '< 3.1.0'
3
ruby '>= 2.5.0', '< 3.2.0'
4 4
gem 'bundler', '>= 1.12.0'
5 5

  
6 6
gem 'rails', '6.1.4.1'
......
26 26
gem 'rotp'
27 27
gem 'rqrcode'
28 28

  
29
unless Gem.ruby_version.release < Gem::Version.new('3.1.0')
30
  gem 'net-smtp', '~> 0.3.0'
31
  gem 'net-imap', '~> 0.2.2'
32
  gem 'net-pop', '~> 0.1.1'
33
end
34

  
29 35
# Optional gem for LDAP authentication
30 36
group :ldap do
31 37
  gem 'net-ldap', '~> 0.17.0'
......
97 103
  gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
98 104
  # For running system tests
99 105
  gem 'puma'
100
  gem 'capybara', '~> 3.35.3'
106
  gem 'capybara', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 3.35.3' : '~> 3.36.0')
101 107
  gem "selenium-webdriver", "~> 3.142.7"
102 108
  gem 'webdrivers', '4.6.1', require: false
103 109
  # RuboCop
app/models/setting.rb
106 106
    v = read_attribute(:value)
107 107
    # Unserialize serialized settings
108 108
    if available_settings[name]['serialized'] && v.is_a?(String)
109
      v = YAML::load(v)
109
      v = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(v) : YAML.load(v)
110 110
      v = force_utf8_strings(v)
111 111
    end
112 112
    v = v.to_sym if available_settings[name]['format'] == 'symbol' && !v.blank?
doc/INSTALL
7 7

  
8 8
== Requirements
9 9

  
10
* Ruby 2.5, 2.6, 2.7, 3.0
10
* Ruby 2.5, 2.6, 2.7, 3.1
11 11
* Bundler >= 1.12.0
12 12

  
13 13
* A database:
    (1-1/1)