summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2016-09-16 19:55:00 +0200
committerAhmad Sherif <me@ahmadsherif.com>2016-09-16 20:07:03 +0200
commitf8cc5483af89550879fc3c800c2523ad8259130b (patch)
tree38b7146f5c12090202a0b562dbddf8538ad1ab21 /Gemfile.lock
parent6f0358107dda89aea1de3c5ce83012d56797c32e (diff)
downloadgitlab-ce-f8cc5483af89550879fc3c800c2523ad8259130b.tar.gz
Use oj gem for faster JSON processing
It's mainly intended to improve Elasticsearch indexing performance (through multi_json gem), but other gems could benefit from it too, like grape.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6fe761fe0b9..8e26429df14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -427,6 +427,7 @@ GEM
rack (>= 1.2, < 3)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
+ oj (2.17.4)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
@@ -904,6 +905,7 @@ DEPENDENCIES
nokogiri (~> 1.6.7, >= 1.6.7.2)
oauth2 (~> 1.2.0)
octokit (~> 4.3.0)
+ oj (~> 2.17.4)
omniauth (~> 1.3.1)
omniauth-auth0 (~> 1.4.1)
omniauth-azure-oauth2 (~> 0.0.6)