summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-03-19 13:42:30 +0000
committerLin Jen-Shin <godfat@godfat.org>2018-03-19 13:42:30 +0000
commit30442f67babbacd97b9a838dbf5420011e9f741f (patch)
tree1793dd0808a5edcb4bd208083b780e00eba6a62a
parente9da2b0c752b00e0af941bf1e33278a7d38cfeb9 (diff)
downloadgitlab-ce-30442f67babbacd97b9a838dbf5420011e9f741f.tar.gz
Remove oj as we're not using it
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock2
2 files changed, 0 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index dcd5f5ee049..2a68053f7f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -235,9 +235,6 @@ gem 'mousetrap-rails', '~> 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
-# Faster JSON
-gem 'oj', '~> 2.17.4'
-
# Faster blank
gem 'fast_blank'
diff --git a/Gemfile.lock b/Gemfile.lock
index 618fbf4b3e7..a75e3866b26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -523,7 +523,6 @@ GEM
rack (>= 1.2, < 3)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- oj (2.17.5)
omniauth (1.4.3)
hashie (>= 1.2, < 4)
rack (>= 1.6.2, < 3)
@@ -1106,7 +1105,6 @@ DEPENDENCIES
nokogiri (~> 1.8.2)
oauth2 (~> 1.4)
octokit (~> 4.8)
- oj (~> 2.17.4)
omniauth (~> 1.4.2)
omniauth-auth0 (~> 1.4.1)
omniauth-authentiq (~> 0.3.1)