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

bundle update rubocop 

Change-Id: I6e4b876b20c72038862ab32294df49950402f899
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/328928
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>
Migration-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2023-09-28 08:23:31 -06:00
parent b1ecb34c6c
commit ee75c847da
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.d/rubocop.rb.lock
View File

@ -101,7 +101,7 @@ GEM
rake (13.0.6) rake (13.0.6)
regexp_parser (2.8.1) regexp_parser (2.8.1)
rexml (3.2.6) rexml (3.2.6)
rubocop (1.56.3) rubocop (1.56.4)
base64 (~> 0.1.1) base64 (~> 0.1.1)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)

2
Gemfile.lock
View File

@ -931,7 +931,7 @@ GEM
rspec-core (>= 2, < 4, != 2.12.0) rspec-core (>= 2, < 4, != 2.12.0)
rss (0.3.0) rss (0.3.0)
rexml rexml
rubocop (1.56.3) rubocop (1.56.4)
base64 (~> 0.1.1) base64 (~> 0.1.1)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)

2
app/controllers/external_tools_controller.rb
View File

@ -654,7 +654,7 @@ class ExternalToolsController < ApplicationController
# Verify the resource link was intended for the domain it's being # Verify the resource link was intended for the domain it's being
# launched from # launched from
if params[:url] && !resource_link&.current_external_tool(@context) if params[:url] && !resource_link&.current_external_tool(@context)
&.matches_host?(params[:url]) &.matches_host?(params[:url])
nil nil
else else
resource_link resource_link

2
app/models/speed_grader/assignment.rb
View File

@ -605,7 +605,7 @@ module SpeedGrader
group_id = group_id =
current_user current_user
.get_preference(:gradebook_settings, course.global_id) .get_preference(:gradebook_settings, course.global_id)
&.dig("filter_rows_by", "student_group_id") &.dig("filter_rows_by", "student_group_id")
# If we selected a group that is now deleted, don't use it # If we selected a group that is now deleted, don't use it
Group.active.where(id: group_id).exists? ? group_id : nil Group.active.where(id: group_id).exists? ? group_id : nil

6
db/migrate/20200914184302_invalidate_built_in_role_caches.rb
View File

@ -37,9 +37,9 @@ class InvalidateBuiltInRoleCaches < ActiveRecord::Migration[5.2]
if Shard.current.default? if Shard.current.default?
# will clear cached role overrides everywhere # will clear cached role overrides everywhere
Account.site_admin Account.site_admin
&.delay_if_production(priority: Delayed::LOWER_PRIORITY, &.delay_if_production(priority: Delayed::LOWER_PRIORITY,
singleton: "clear_downstream_role_caches:#{Account.site_admin&.global_id}") singleton: "clear_downstream_role_caches:#{Account.site_admin&.global_id}")
&.clear_downstream_caches(:role_overrides) &.clear_downstream_caches(:role_overrides)
end end
end end
end end

2
gems/rubocop-canvas/Gemfile.lock
View File

@ -123,7 +123,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0) rspec-support (~> 3.12.0)
rspec-support (3.12.1) rspec-support (3.12.1)
rubocop (1.56.3) rubocop (1.56.4)
base64 (~> 0.1.1) base64 (~> 0.1.1)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)

4
lib/lti/context_tool_finder.rb
View File

@ -54,8 +54,8 @@ module Lti
# parameter # parameter
def single_shard_scope def single_shard_scope
scopes(include_federated_parent: false).first scopes(include_federated_parent: false).first
&.order(ContextExternalTool.best_unicode_collation_key("context_external_tools.name")) &.order(ContextExternalTool.best_unicode_collation_key("context_external_tools.name"))
&.order(Arel.sql("context_external_tools.id")) &.order(Arel.sql("context_external_tools.id"))
end end
# If exclude_admin_visibility is true, does not return any tools where the options[:type] # If exclude_admin_visibility is true, does not return any tools where the options[:type]