From c8c49ccb7a04026dc1e720bb84fb4ba7dc77b9e8 Mon Sep 17 00:00:00 2001
From: Steve Kenworthy <steveyken@gmail.com>
Date: Fri, 20 Dec 2013 23:21:35 +0800
Subject: [PATCH] Add ruby2 support and maintain ruby 1.9 compatibility

---
 .travis.yml          | 1 +
 Gemfile.lock         | 1 -
 fat_free_crm.gemspec | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1caaed7595..1e8419d708 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
 
 env:
   - DB=mysql
diff --git a/Gemfile.lock b/Gemfile.lock
index b764d60019..3ebf34dee9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -339,7 +339,6 @@ DEPENDENCIES
   premailer
   prototype-rails
   pry-rails
-  psych (~> 1)
   quiet_assets
   rails (~> 3.2.12)
   rails3-jquery-autocomplete
diff --git a/fat_free_crm.gemspec b/fat_free_crm.gemspec
index 354b82cef2..52ac660270 100644
--- a/fat_free_crm.gemspec
+++ b/fat_free_crm.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'responds_to_parent',  '>= 1.1.0'
   gem.add_dependency 'rails3-jquery-autocomplete'
   gem.add_dependency 'valium'
-  gem.add_dependency 'psych', '~> 1'
+  gem.add_dependency 'psych', '~> 1'        if RUBY_VERSION.to_f < 2.0
 
   # FatFreeCRM has released it's own versions of the following gems:
   #-----------------------------------------------------------------