update the json gem
this removes some deprecation warnings Change-Id: If593236c67620c6e9126130128c38ed2564656bc Reviewed-on: https://gerrit.instructure.com/21070 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Cody Cutrer <cody@instructure.com> Product-Review: Brian Palmer <brianp@instructure.com> QA-Review: Brian Palmer <brianp@instructure.com>
This commit is contained in:
parent
1d09cef4ea
commit
b00422f01b
2
Gemfile
2
Gemfile
|
@ -41,7 +41,7 @@ gem 'highline', '1.6.1'
|
|||
gem 'i18n', CANVAS_RAILS3 ? '0.5.0' : '0.6.0'
|
||||
gem 'icalendar', '1.1.5'
|
||||
gem 'jammit', '0.6.0'
|
||||
gem 'json', '1.5.5'
|
||||
gem 'json', '1.8.0'
|
||||
# native xml parsing, diigo
|
||||
gem 'libxml-ruby', '2.6.0', :require => 'xml/libxml'
|
||||
gem 'macaddr', '1.0.0' # macaddr 1.2.0 tries to require 'systemu' which isn't a dependency
|
||||
|
|
Loading…
Reference in New Issue