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

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:
Brian Palmer 2013-05-30 14:35:01 -06:00
parent 1d09cef4ea
commit b00422f01b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -41,7 +41,7 @@ gem 'highline', '1.6.1'
gem 'i18n', CANVAS_RAILS3 ? '0.5.0' : '0.6.0' gem 'i18n', CANVAS_RAILS3 ? '0.5.0' : '0.6.0'
gem 'icalendar', '1.1.5' gem 'icalendar', '1.1.5'
gem 'jammit', '0.6.0' gem 'jammit', '0.6.0'
gem 'json', '1.5.5' gem 'json', '1.8.0'
# native xml parsing, diigo # native xml parsing, diigo
gem 'libxml-ruby', '2.6.0', :require => 'xml/libxml' 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 gem 'macaddr', '1.0.0' # macaddr 1.2.0 tries to require 'systemu' which isn't a dependency