diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-19 15:12:31 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-19 15:12:31 +0000 |
| commit | 9dbc60b85cf3e9eb9041b205cd51580353c473d9 (patch) | |
| tree | 91a47c928c7cf9a233a9a2d40a0fd966b8139a4a | |
| parent | 051e5e99dfd38704d7fbaef291fc6e9b737723f8 (diff) | |
| parent | 30442f67babbacd97b9a838dbf5420011e9f741f (diff) | |
| download | gitlab-ce-9dbc60b85cf3e9eb9041b205cd51580353c473d9.tar.gz | |
Merge branch 'remove-oj' into 'master'
Remove oj as we're not using it
See merge request gitlab-org/gitlab-ce!17863
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 0 insertions, 5 deletions
@@ -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 10fc33637f0..da691a4e79d 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) |