bump rails 5.2

Change-Id: I2de8a8facb68696da62917ed6dafeca946218d98
Reviewed-on: https://gerrit.instructure.com/198572
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
James Williams 2019-06-21 06:57:23 -06:00
parent cdead2524e
commit 0981b95b69
3 changed files with 5 additions and 5 deletions

View File

@ -18,7 +18,7 @@
if CANVAS_RAILS5_1
gem 'rails', '5.1.6.2'
else
gem 'rails', '5.2.2.1'
gem 'rails', '5.2.3'
end
gem 'loofah', '2.2.3'

View File

@ -428,12 +428,12 @@ module AccountReports::ReportHelper
class ExtendedCSV < CSV
def <<(row)
if @lineno % 1_000 == 0
if lineno % 1_000 == 0
Shackles.activate(:master) do
report = self.instance_variable_get(:@account_report).reload
updates = {}
updates[:current_line] = @lineno
updates[:progress] = (@lineno.to_f / report.total_lines * 100).to_i if report.total_lines
updates[:current_line] = lineno
updates[:progress] = (lineno.to_f / report.total_lines * 100).to_i if report.total_lines
report.update_attributes(updates)
if report.workflow_state == 'deleted'
report.workflow_state = 'aborted'

View File

@ -39,7 +39,7 @@ module Lti::Ims
it 'sets the Cache-control header' do
get url
expect(response.headers['Cache-Control']).to eq 'max-age=864000'
expect(response.headers['Cache-Control']).to include 'max-age=864000'
end
it 'returns well-formed public key jwks' do