diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-16 19:11:37 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-16 19:11:37 +0000 |
| commit | 1c2aa4f879bdcbfca6c2dd5e52ec486f9995801b (patch) | |
| tree | 38b7146f5c12090202a0b562dbddf8538ad1ab21 | |
| parent | 6f0358107dda89aea1de3c5ce83012d56797c32e (diff) | |
| parent | f8cc5483af89550879fc3c800c2523ad8259130b (diff) | |
| download | gitlab-ce-1c2aa4f879bdcbfca6c2dd5e52ec486f9995801b.tar.gz | |
Merge branch 'feature/use-oj-gem' into 'master'
Use oj gem for faster JSON processing
See merge request !6395
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 20948a8db5e..44ea3d6e01d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -168,6 +168,7 @@ v 8.11.5 - Scope webhooks/services that will run for confidential issues - Remove gitorious from import_sources - Fix confidential issues being exposed as public using gitlab.com export + - Use oj gem for faster JSON processing v 8.11.4 - Fix resolving conflicts on forks. !6082 @@ -206,6 +206,9 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.3' +# Faster JSON +gem 'oj', '~> 2.17.4' + # Parse time & duration gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' 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) |