From bcadedc2581fe223a9cee1f997e09e242178139f Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Sat, 12 May 2012 22:59:41 -0700
Subject: [PATCH] specify ruby 1.9.3 in bundler for heroku.  this requires a
 Successfully installed bundler-1.2.0.pre 1 gem installed Installing ri
 documentation for bundler-1.2.0.pre... Building YARD (yri) index for
 bundler-1.2.0.pre... Installing RDoc documentation for bundler-1.2.0.pre...
 [ci skip]

---
 .rvmrc  | 2 +-
 Gemfile | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.rvmrc b/.rvmrc
index 7b63509d5..01466e002 100644
--- a/.rvmrc
+++ b/.rvmrc
@@ -4,7 +4,7 @@ if [ -e '.rvmrc.local' ]; then
 elif [ -e '.rvmrc_custom' ] ; then
   source .rvmrc_custom;
 else
-  rvm --create use ruby-1.9.2-p290@diaspora
+  rvm --create use ruby-1.9.3-p125@diaspora
 fi
 
 if [ "$(gem --version)" != "1.8.17" ]; then
diff --git a/Gemfile b/Gemfile
index 2ca5f9b53..db5c45518 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,7 @@
 source 'http://rubygems.org'
 
+ruby '1.9.3'
+
 gem 'rails', '3.1.4'
 gem 'rails_autolink'
 gem 'bundler', '~> 1.1.0'