Mercurial > hg > soundsoftware-site

diff Gemfile @ 1297:0a574315af3e redmine-2.2-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "redmine-2.2"
author Chris Cannam
date Fri, 14 Jun 2013 09:07:32 +0100
parents c2e85aec91b2 3e4c3460b6ca
children 4f746d8966dd 46a444fa87bc
line wrap: on
line diff
--- a/Gemfile	Tue May 21 18:15:48 2013 +0100
+++ b/Gemfile	Fri Jun 14 09:07:32 2013 +0100
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.12'
+gem "rails", "3.2.13"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem "coderay", "~> 1.0.6"
@@ -79,7 +79,7 @@
   platforms = [:mri_19]
   platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7"
   gem "test-unit", :platforms => platforms
-  gem "mocha", "0.12.3"
+  gem "mocha", "~> 0.13.3"
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")