From e4d47d30de823c52e7f565cd2007918bb2858479 Mon Sep 17 00:00:00 2001
From: Nihad Abbasov <narkoz.2008@gmail.com>
Date: Tue, 29 May 2012 02:38:15 +0500
Subject: [PATCH] fix travis issues and run build against ruby 1.9.3

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f1ea16d8..0c03e389 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,15 @@
 env:
   - DB=mysql
   - DB=sqlite
-before_install: sudo apt-get install libicu-dev -y
+before_install:
+  - sudo apt-get install libicu-dev -y
+  - echo "yes" | gem uninstall json ffi
 branches:
   only:
     - 'master'
 rvm:
   - 1.9.2
+  - 1.9.3
 before_script:
   - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"