Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update api_taster and switch it to fs/api_taster #22

Merged
merged 1 commit into from
Oct 11, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 9 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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:
Expand Down