Merge branch 'master' of git://github.com/diaspora/diaspora

.rvmrc

@@ -2,5 +2,5 @@
 if [ -e '.rvmrc_custom' ]; then
   source .rvmrc_custom;
 else
-  rvm --create use ree-1.8.7-2011.03@diaspora;
+  rvm --create use ree-1.8.7-2011.03@diaspora && rvm rubygems 1.8.12
 fi

Gemfile

@@ -19,16 +19,28 @@ gem 'omniauth-facebook'
 gem 'omniauth-tumblr'
 gem 'omniauth-twitter'
 
-gem 'twitter', '2.0.1'
+gem 'twitter', '2.0.2'
 
 # backups
-
 gem 'cloudfiles', '1.4.10', :require => false
 
-# chef
+# mail
+gem 'messagebus_ruby_api', '0.4.8'
 
-gem 'chef', '~> 0.10.4', :require => false
+
-gem 'ohai', '~> 0.6.10', :require => false
+# web sockets
+gem 'em-synchrony', :platforms => :ruby_19
+gem 'em-websocket'
+
+group :production do # we don't install these on travis to speed up test runs
+  # chef
+  gem 'chef', '~> 0.10.4', :require => false
+  gem 'ohai', '~> 0.6.10', :require => false
+
+  # reporting
+  gem 'hoptoad_notifier'
+  gem 'newrelic_rpm', :require => false
+end
 
 # configuration
 
@@ -76,15 +88,6 @@ gem 'resque-ensure-connected'
 gem 'resque-timeout', '1.0.0'
 gem 'SystemTimer', '1.2.3', :platforms => :ruby_18
 
-# reporting
-
-gem 'hoptoad_notifier'
-gem 'newrelic_rpm', :require => false
-
-#mail
-
-gem 'messagebus_ruby_api', '0.4.8'
-
 # tags
 
 gem 'acts-as-taggable-on', :git => 'git://github.com/diaspora/acts-as-taggable-on.git'
@@ -108,17 +111,12 @@ gem 'client_side_validations'
 gem 'faraday'
 gem 'faraday-stack'
 
-# web sockets
+# jazzy jasmine
 
-gem 'em-synchrony', :platforms => :ruby_19
+gem 'jasmine', '~> 1.1.2'
-gem 'em-websocket'
 
 ### GROUPS ####
 
-group :test, :development do
-  gem 'jasmine', '~> 1.1.2'
-end
-
 group :test do
   gem 'capybara', '~> 1.1.2'
   gem 'cucumber-rails', '1.2.1'

Gemfile.lock

@@ -307,7 +307,6 @@ GEM
     parallel (0.5.11)
     parallel_tests (0.6.11)
       parallel
-    pg (0.11.0)
     polyglot (0.3.3)
     rack (1.2.4)
     rack-mobile-detect (0.3.0)
@@ -409,7 +408,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (2.0.1)
+    twitter (2.0.2)
       activesupport (>= 2.3.9, < 4)
       faraday (~> 0.7)
       multi_json (~> 1.0)
@@ -491,7 +490,6 @@ DEPENDENCIES
   omniauth-tumblr
   omniauth-twitter
   parallel_tests
-  pg
   rails (= 3.0.11)
   rails-i18n
   redcarpet (= 2.0.0)
@@ -513,7 +511,7 @@ DEPENDENCIES
   sod!
   sqlite3
   thin (~> 1.3.1)
-  twitter (= 2.0.1)
+  twitter (= 2.0.2)
   typhoeus
   vanna!
   webmock