Merged r19628 from trunk to 4.0-stable (#30285).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19630 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index f1009ae6f6e6a008605f9f42f3574d70380c6226..c36c262889832bb6248176d153a8623daa7306a5 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -65,8 +65,8 @@ if File.exist?(database_file)
       when /sqlite3/
         gem "sqlite3", "~>1.3.12", :platforms => [:mri, :mingw, :x64_mingw]
       when /sqlserver/
-        gem "tiny_tds", "~> 1.0.5", :platforms => [:mri, :mingw, :x64_mingw]
-        gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
+        gem "tiny_tds", "~> 2.1.2", :platforms => [:mri, :mingw, :x64_mingw]
+        gem "activerecord-sqlserver-adapter", "~> 5.2.1", :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