--- Gemfile.orig 2013-09-14 06:48:49.000000000 +0000 +++ Gemfile 2013-10-28 18:11:49.154289224 +0000 @@ -1,11 +1,11 @@ source 'https://rubygems.org' -gem "rails", "3.2.13" -gem "jquery-rails", "~> 2.0.2" +gem "rails", "3.2.15" +gem "jquery-rails", "~> 3.0" gem "i18n", "~> 0.6.0" -gem "coderay", "~> 1.0.9" +gem "coderay", "~> 1.1.0" gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] -gem "builder", "3.0.0" +gem "builder", "~> 3.0.0" # Optional gem for LDAP authentication group :ldap do @@ -14,7 +14,7 @@ # Optional gem for OpenID authentication group :openid do - gem "ruby-openid", "~> 2.2.3", :require => "openid" + gem "ruby-openid", "~> 2.2", :require => "openid" gem "rack-openid" end @@ -46,10 +46,10 @@ adapters.each do |adapter| case adapter when 'mysql2' - gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw] + gem "mysql2", "~> 0.3", :platforms => [:mri, :mingw] gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when 'mysql' - gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] + gem "mysql", "~> 2.8", :platforms => [:mri, :mingw] gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when /postgresql/ gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw] @@ -71,18 +71,6 @@ warn("Please configure your config/database.yml first") end -group :development do - gem "rdoc", ">= 2.4.2" - gem "yard" -end - -group :test do - gem "shoulda", "~> 3.3.2" - gem "mocha", "~> 0.13.3" - gem 'capybara', '~> 2.0.0' - gem 'nokogiri', '< 1.6.0' -end - local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`