Merge branch 'remove-oj' into 'master'

Remove oj as we're not using it See merge request gitlab-org/gitlab-ce!17863

Merge branch 'remove-oj' into 'master'
9dbc60b8 · Robert Speicher · 051e5e99 · 30442f67 · 9dbc60b8 · 9dbc60b8
Commit 9dbc60b8 authored Mar 19, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

Gemfile Gemfile +0 -3

Gemfile.lock Gemfile.lock +0 -2

No files found.
--- 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'


--- 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)