Mercurial > hg > soundsoftware-site
comparison Gemfile @ 1297:0a574315af3e redmine-2.2-integration
Merge from branch "redmine-2.2"
author | Chris Cannam |
---|---|
date | Fri, 14 Jun 2013 09:07:32 +0100 |
parents | c2e85aec91b2 3e4c3460b6ca |
children | 4f746d8966dd 46a444fa87bc |
comparison
equal
deleted
inserted
replaced
1293:b7af3c2d1f0c | 1297:0a574315af3e |
---|---|
1 source 'http://rubygems.org' | 1 source 'http://rubygems.org' |
2 | 2 |
3 gem 'rails', '3.2.12' | 3 gem "rails", "3.2.13" |
4 gem "jquery-rails", "~> 2.0.2" | 4 gem "jquery-rails", "~> 2.0.2" |
5 gem "i18n", "~> 0.6.0" | 5 gem "i18n", "~> 0.6.0" |
6 gem "coderay", "~> 1.0.6" | 6 gem "coderay", "~> 1.0.6" |
7 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] | 7 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] |
8 gem "builder", "3.0.0" | 8 gem "builder", "3.0.0" |
77 # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7. | 77 # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7. |
78 # It seems to need test-unit explicitely. | 78 # It seems to need test-unit explicitely. |
79 platforms = [:mri_19] | 79 platforms = [:mri_19] |
80 platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7" | 80 platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7" |
81 gem "test-unit", :platforms => platforms | 81 gem "test-unit", :platforms => platforms |
82 gem "mocha", "0.12.3" | 82 gem "mocha", "~> 0.13.3" |
83 end | 83 end |
84 | 84 |
85 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") | 85 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") |
86 if File.exists?(local_gemfile) | 86 if File.exists?(local_gemfile) |
87 puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v` | 87 puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v` |