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

rubocop: fix offenses that crept in 

Change-Id: I667cca8c711e4e3ef3f9946bf66c9534bf73b3fa
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/318433
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2023-05-17 13:08:14 -06:00
parent c3947f9d68
commit c5fb729287
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gemfile
View File

@ -43,16 +43,16 @@ if Plugin.installed?("bundler_lockfile_extensions")
current = rails_version == CANVAS_RAILS && include_plugins
add_lockfile(lockfile,
current: current,
prepare: prepare,
allow_mismatched_dependencies: rails_version != SUPPORTED_RAILS_VERSIONS.first,
enforce_pinned_additional_dependencies: include_plugins)
current: current,
prepare: prepare,
allow_mismatched_dependencies: rails_version != SUPPORTED_RAILS_VERSIONS.first,
enforce_pinned_additional_dependencies: include_plugins)
end
Dir["Gemfile.d/*.lock", "gems/*/Gemfile.lock", base: Bundler.root].each do |gem_lockfile_name|
return unless add_lockfile(gem_lockfile_name,
gemfile: gem_lockfile_name.sub(/\.lock$/, ""),
allow_mismatched_dependencies: false)
gemfile: gem_lockfile_name.sub(/\.lock$/, ""),
allow_mismatched_dependencies: false)
end
end
end

2
app/models/submission.rb
View File

@ -2710,7 +2710,7 @@ class Submission < ActiveRecord::Base
end
def refresh_comment_read_state
unread_comments = visible_submission_comments.left_joins(:viewed_submission_comments).where.not(author: user).where(viewed_submission_comments: { id: nil }).exists?
unread_comments = visible_submission_comments.where.missing(:viewed_submission_comments).where.not(author: user).exists?
if unread_comments
mark_item_unread("comment")