diff Gemfile @ 1516:b450a9d58aed redmine-2.4

Update to Redmine SVN revision 13356 on 2.4-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:28:31 +0100
parents e248c7af89ec
children dffacf8a6908 2e8063097240
line wrap: on
line diff
--- a/Gemfile	Mon Mar 17 08:54:02 2014 +0000
+++ b/Gemfile	Tue Sep 09 09:28:31 2014 +0100
@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem "rails", "3.2.17"
+gem "rails", "3.2.19"
+gem "rake", "~> 10.1.1"
 gem "jquery-rails", "~> 2.0.2"
 gem "coderay", "~> 1.1.0"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
@@ -77,7 +78,7 @@
 
 group :test do
   gem "shoulda", "~> 3.3.2"
-  gem "mocha", ">= 0.14", :require => 'mocha/api'
+  gem "mocha", "~> 1.0.0", :require => 'mocha/api'
   if RUBY_VERSION >= '1.9.3'
     gem "capybara", "~> 2.1.0"
     gem "selenium-webdriver"