From dc05c52e5a25b43c49246a952607551bf0d96f29 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 8 Jul 2017 16:33:37 +0000 Subject: [PATCH] Ruby 1.9.3 no longer supported (#25538). git-svn-id: http://svn.redmine.org/redmine/trunk@16778 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 33a953d50..aa49e527b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,11 +5,10 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0') end gem "rails", "4.2.8" -gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" gem "jquery-rails", "~> 3.1.4" gem "coderay", "~> 1.1.1" gem "request_store", "1.0.5" -gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99") +gem "mime-types", "~> 3.0" gem "protected_attributes" gem "actionpack-xml_parser" gem "roadie-rails", "~> 1.1.1" @@ -18,7 +17,6 @@ gem "mimemagic" gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8") gem "i18n", "~> 0.7.0" -gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" # Request at least rails-html-sanitizer 1.0.3 because of security advisories gem "rails-html-sanitizer", ">= 1.0.3" @@ -66,10 +64,9 @@ if File.exist?(database_file) when /postgresql/ gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] when /sqlite3/ - gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"), - :platforms => [:mri, :mingw, :x64_mingw] + gem "sqlite3", "~>1.3.12", :platforms => [:mri, :mingw, :x64_mingw] when /sqlserver/ - gem "tiny_tds", (RUBY_VERSION >= "2.0" ? "~> 1.0.5" : "~> 0.7.0"), :platforms => [:mri, :mingw, :x64_mingw] + gem "tiny_tds", "~> 1.0.5", :platforms => [:mri, :mingw, :x64_mingw] gem "activerecord-sqlserver-adapter", :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") -- 2.39.5