diff --git a/Gemfile b/Gemfile index f5d88fb48..f12958ef0 100644 --- a/Gemfile +++ b/Gemfile @@ -45,10 +45,10 @@ end group :test do # shoulda的版本做了改动 #gem "shoulda", "~> 3.3.2" - gem "shoulda", "> 3.3.2" - gem "mocha", "~> 0.13.3" - gem 'capybara', '~> 2.0.0' - gem 'nokogiri', '< 1.6.0' + #gem "shoulda", "> 3.3.2" + #gem "mocha", "~> 0.13.3" + #gem 'capybara', '~> 2.0.0' + #gem 'nokogiri', '< 1.6.0' end platforms :mri, :mingw do @@ -56,7 +56,7 @@ platforms :mri, :mingw do # RMagick 2 supports ruby 1.9 # RMagick 1 would be fine for ruby 1.8 but Bundler does not support # different requirements for the same gem on different platforms - gem "rmagick", ">= 2.0.0" + #gem "rmagick", ">= 2.0.0" end end diff --git a/Gemfile.lock b/Gemfile.lock index 14f6aa047..189cbabce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,7 @@ DEPENDENCIES i18n (~> 0.6.0) jquery-rails (~> 2.0.2) mocha (~> 0.13.3) - mysql2 (~> 0.3.11) + mysql2 (= 0.3.11) net-ldap (~> 0.3.1) nokogiri (< 1.6.0) rack-mini-profiler!