##// END OF EJS Templates
Gemfile: merge r15915, r15916, r15944, and r15945 from trunk to 3.2-stable (#24092)...
Toshi MARUYAMA -
r15565:df3ed1da95bf
parent child
Show More
@@ -5,6 +5,7 if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
5 5 end
6 6
7 7 gem "rails", "4.2.7.1"
8 gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
8 9 gem "jquery-rails", "~> 3.1.4"
9 10 gem "coderay", "~> 1.1.0"
10 11 gem "builder", ">= 3.0.4"
@@ -93,7 +94,7 else
93 94 end
94 95
95 96 group :development do
96 gem "rdoc", ">= 2.4.2"
97 gem "rdoc", "~> 4.3"
97 98 gem "yard"
98 99 end
99 100
@@ -104,7 +105,7 group :test do
104 105 gem "simplecov", "~> 0.9.1", :require => false
105 106 # For running UI tests
106 107 gem "capybara"
107 gem "selenium-webdriver"
108 gem "selenium-webdriver", "~> 2.53.4"
108 109 end
109 110
110 111 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
General Comments 0
You need to be logged in to leave comments. Login now