diff --git a/Gemfile b/Gemfile index ad6fe10cade..9d460c91e28 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/app/models/submission.rb b/app/models/submission.rb index 940d09d44c9..b879c541705 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -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")