Use shoulda-matchers (instead of shoudla)

2 files changed, 2 insertions, 11 deletions

diff --git a/Gemfile b/Gemfile
index d012d1d8f..986e81a1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,7 +67,7 @@ group :test, :development do
   gem "rspec-rails"
   gem "remarkable", "~> 4.0.0.alpha4"           
   gem "remarkable_activerecord", "~> 4.0.0.alpha4" 
-  gem "shoulda", :git => 'git://github.com/thoughtbot/shoulda.git'
+  gem "shoulda-matchers"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index f7298e6f3..b5fc3e90e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,14 +60,6 @@ GIT
       rgeo (~> 0.3.13)
 
 GIT
-  remote: git://github.com/thoughtbot/shoulda.git
-  revision: 269edccc7df8f2eb94a96a6a6d248a5960d7fe1f
-  specs:
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.0)
-
-GIT
   remote: git://sim.dryade.priv/user_interface
   revision: 6931e642037ffef9d3818669a5f5167a0298b30b
   specs:
@@ -305,7 +297,6 @@ GEM
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    shoulda-context (1.0.0)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
     spoon (0.0.1)
@@ -385,7 +376,7 @@ DEPENDENCIES
   rspec
   rspec-rails
   sass-rails (~> 3.2.3)
-  shoulda!
+  shoulda-matchers
   sqlite3
   squeel
   therubyracer