Merge pull request #22 from fs/update-api-taster

Update api_taster and switch it to fs/api_taster
fs · Oct 11, 2013 · 374947f · 374947f
2 parents 7beb9b8 + e673e63
commit 374947f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/Gemfile b/Gemfile
@@ -44,8 +44,7 @@ group :test do
 end
 
 group :development, :staging do
-  gem 'api_taster', github: 'vast/api_taster', branch: 'rails4'
-  # gem 'api_taster', path: '../api_taster' # for local development
+  gem 'api_taster', github: 'fs/api_taster'
 end
 
 group :development, :test, :staging do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,22 +1,21 @@
 GIT
-  remote: git://github.com/james2m/seedbank.git
-  revision: c7a272751336f0d17103028f45b88eac62cbedd7
-  specs:
-    seedbank (0.3.0.pre2)
-
-GIT
-  remote: git://github.com/vast/api_taster.git
-  revision: a1561f51645abe90d64b867b5b9329cee89f19da
-  branch: rails4
+  remote: git://github.com/fs/api_taster.git
+  revision: 751ec7872a9d9d44d49e7746a36b23c48552b5ad
   specs:
     api_taster (0.7.0)
       bootstrap-sass (~> 2.1)
       jquery-rails
-      rails (~> 4.0.0)
+      rails (>= 3.2)
       redcarpet
       remotipart (~> 1.0)
       sass-rails
 
+GIT
+  remote: git://github.com/james2m/seedbank.git
+  revision: c7a272751336f0d17103028f45b88eac62cbedd7
+  specs:
+    seedbank (0.3.0.pre2)
+
 GEM
   remote: https://rubygems.org/
   specs: