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

upgrade parallel gem and dependency 

refs CNVS-34084

test plan: things that run in parallel should work, like:
- s3uploader
- asset rake tasks

Change-Id: I4e320af66c3db5620b24eb366a5d23f0c79db046
Reviewed-on: https://gerrit.instructure.com/98557
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
This commit is contained in:
Simon Williams 2016-12-28 15:28:11 -07:00
parent ff89447dd5
commit e37980ea85
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.d/app.rb
View File

@ -73,8 +73,8 @@ gem 'netaddr', '1.5.0', require: false
gem 'nokogiri', '1.6.6.2.20150813143452', require: false, github: 'codekitchen/nokogiri', ref: 'd47e53f885'
# oauth gem, with rails3 fixes rolled in
gem 'oauth-instructure', '0.4.10', require: false
gem 'parallel', '1.6.2', require: false
gem 'ruby-progressbar', '1.7.5', require: false #used to show progress of S3Uploader
gem 'parallel', '1.10.0', require: false
gem 'ruby-progressbar', '1.8.1', require: false #used to show progress of S3Uploader
gem 'retriable', '1.4.1'
gem 'rake', '12.0.0'
gem 'ratom-nokogiri', '0.10.4', require: false