Gemfile: merge r15915, r15916, r15944, and r15945 from trunk to 3.3-stable (#24092)

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

diff --git a/Gemfile b/Gemfile
index 3a4572eb072df7e38d6461e477ab9a4532f03865..260df09349e8be66a963e0d321e1252d05130e7b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
 end
 
 gem "rails", "4.2.7.1"
+gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
 gem "jquery-rails", "~> 3.1.4"
 gem "coderay", "~> 1.1.1"
 gem "builder", ">= 3.0.4"
@@ -93,7 +94,7 @@ else
 end
 
 group :development do
-  gem "rdoc", ">= 2.4.2"
+  gem "rdoc", "~> 4.3"
   gem "yard"
 end
 
@@ -104,7 +105,7 @@ group :test do
   gem "simplecov", "~> 0.9.1", :require => false
   # For running UI tests
   gem "capybara"
-  gem "selenium-webdriver"
+  gem "selenium-webdriver", "~> 2.53.4"
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")