From 3c2bee2a53d138b2ed9b2f3eb3d72f9ab2c2699b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Tue, 15 Mar 2016 20:53:49 +0100
Subject: [PATCH] Bump oj

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 09217dbcd33..c0c398e7754 100644
--- a/Gemfile
+++ b/Gemfile
@@ -81,7 +81,7 @@ gem 'sys-filesystem', '~> 1.1.4', require: false
 # See: config/initializers/rabl_hack.rb
 gem 'rabl', '0.9.3'
 gem 'multi_json', '~> 1.11.0'
-gem 'oj', '~> 2.11.4'
+gem 'oj', '~> 2.14.6'
 
 gem 'delayed_job_active_record', '~> 4.0.2'
 gem 'daemons'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9446bf33d4c..4323935dd22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -331,7 +331,7 @@ GEM
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
     non-stupid-digest-assets (1.0.4)
-    oj (2.11.5)
+    oj (2.14.6)
     parallel (1.6.1)
     parallel_tests (2.1.2)
       parallel
@@ -608,7 +608,7 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri (~> 1.6.7)
   non-stupid-digest-assets
-  oj (~> 2.11.4)
+  oj (~> 2.14.6)
   omniauth!
   openproject-translations!
   parallel_tests (~> 2.1.2)