From 26b92a925fb7b2071d741fa7a473caf4ddd821aa Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Mon, 23 Jun 2014 17:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B5=8B=E8=AF=95gem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile      | 10 +++++-----
 Gemfile.lock |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

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!