github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

DEV: Update oj gem (#15713)

Browse Source 
https://github.com/ohler55/oj/issues/699 was fixed back in September 2021.
This commit is contained in:
Jarek Radosz 2022-01-31 23:45:52 +01:00 committed by GitHub
parent b1d7a8c3e2
commit fb25333b7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -105,9 +105,7 @@ gem 'omniauth-oauth2', require: false
gem 'omniauth-google-oauth2'
# Pinning oj until https://github.com/ohler55/oj/issues/699 is resolved.
# Segfaults and stuck processes after upgrading.
gem 'oj', '3.13.2'
gem 'oj'
gem 'pg'
gem 'mini_sql'

4
Gemfile.lock
View File

@ -265,7 +265,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
oj (3.13.2)
oj (3.13.11)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
@ -558,7 +558,7 @@ DEPENDENCIES
multi_json
mustache
nokogiri
oj (= 3.13.2)
oj
omniauth
omniauth-facebook
omniauth-github