ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bump oj to 3.3.10 

https://github.com/ohler55/oj/blob/v3.10.2/CHANGELOG.md

Change-Id: I8a1f29cb686a794c729a84966a1932242277ac4c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/227905
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: James Williams <jamesw@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
This commit is contained in:
Simon Williams 2020-02-25 13:38:12 -06:00
parent c1b312cfd2
commit f7bc9c4878
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.d/app.rb
View File

@ -93,7 +93,7 @@ gem 'net-ldap', '0.16.2', require: false
gem 'nokogiri', '1.10.8', require: false gem 'nokogiri', '1.10.8', require: false
gem 'oauth', '0.5.4', require: false gem 'oauth', '0.5.4', require: false
gem 'oauth2', '1.4.4', require: false gem 'oauth2', '1.4.4', require: false
gem 'oj', '3.3.9' gem 'oj', '3.10.2'
gem 'parallel', '1.19.1', require: false gem 'parallel', '1.19.1', require: false
gem 'ruby-progressbar', '1.10.1', require: false # used to show progress of S3Uploader gem 'ruby-progressbar', '1.10.1', require: false # used to show progress of S3Uploader
gem 'prawn-rails', '1.3.0' gem 'prawn-rails', '1.3.0'

4
config/initializers/json.rb
View File

@ -23,6 +23,10 @@ Oj.default_options = { mode: :rails, escape_mode: :xss_safe, bigdecimal_as_decim
ActiveSupport::JSON::Encoding.time_precision = 0 ActiveSupport::JSON::Encoding.time_precision = 0
# This overrides the behavior defined in:
# activesupport/lib/active_support/core_ext/object/json.rb. We use BigDecimal
# in quiz numerical questions. See specs around numerical question answers in
# spec/apis/v1/quizzes/quiz_submission_questions_api_spec.rb
class BigDecimal class BigDecimal
remove_method :as_json remove_method :as_json