Permalink
Browse files

Merge remote-tracking branch 'origin/pull/106/head'

  • Loading branch information...
2 parents 0e42c69 + 05d8170 commit 542f3911e58fdecc3ead1e68c87efed9d81f9981 @schacon schacon committed Jun 12, 2012
Showing with 9 additions and 6 deletions.
  1. +9 −6 Gemfile
View
@@ -7,22 +7,18 @@ gem 'rails', '3.2.2'
gem 'json'
gem 'thin'
-gem 'faraday'
gem 'yajl-ruby', '~> 1.1.0'
gem 'excon', '~> 0.9.4'
-gem 'heroku'
gem 'haml'
gem 'tilt'
gem 'rest-client'
gem 'netrc'
-gem 'launchy'
gem 'rubyzip'
gem 'octokit'
gem 'dalli'
gem 'diff-lcs'
gem 'redcarpet'
gem 'nestful'
-gem "awesome_print"
gem 'newrelic_rpm'
gem 'exceptional'
@@ -42,13 +38,20 @@ group :production do
gem "pg"
end
-group :development do
+group :development, :test do
+ gem 'faraday'
+ gem "awesome_print"
gem "sqlite3"
gem "sqlite3-ruby"
+ gem 'factory_girl_rails'
+end
+
+group :development do
+ gem 'heroku'
gem "shotgun"
gem "taps"
end
group :test do
- gem 'factory_girl_rails'
+ gem 'launchy'
end

0 comments on commit 542f391

Please sign in to comment.