Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ GEM
io-console (0.6.0)
irb (1.7.4)
reline (>= 0.3.6)
json (2.7.2)
json (2.9.0)
jsonapi-renderer (0.2.2)
jsonapi-serializable (0.3.1)
jsonapi-renderer (~> 0.2.0)
Expand Down Expand Up @@ -395,8 +395,8 @@ GEM
opentelemetry-semantic_conventions (1.10.0)
opentelemetry-api (~> 1.0)
ostruct (0.6.0)
parallel (1.24.0)
parser (3.3.1.0)
parallel (1.26.3)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
parslet (2.0.0)
Expand Down Expand Up @@ -445,7 +445,7 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
regexp_parser (2.9.2)
regexp_parser (2.9.3)
reline (0.3.8)
io-console (~> 0.5)
rescue_registry (1.0.0)
Expand Down Expand Up @@ -481,18 +481,17 @@ GEM
activesupport (>= 3.0.0)
mustache (~> 1.0, >= 0.99.4)
rspec (~> 3.0)
rubocop (1.63.5)
rubocop (1.69.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.36.2)
parser (>= 3.3.1.0)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
Expand Down Expand Up @@ -535,7 +534,9 @@ GEM
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
unicode-display_width (3.1.2)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uniform_notifier (1.16.0)
webrick (1.8.2)
websocket-driver (0.7.6)
Expand Down
4 changes: 2 additions & 2 deletions lib/deck_validation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ def expand_implied_ids
@snapshot_id = format.active_snapshot_id if @snapshot_id.nil?
active_snapshot = format.snapshot
unless active_snapshot.nil?
@card_pool_id = active_snapshot.card_pool_id if @card_pool_id.nil? # rubocop:disable Metrics/BlockNesting
@restriction_id = active_snapshot.restriction_id if @restriction_id.nil? # rubocop:disable Metrics/BlockNesting
@card_pool_id = active_snapshot.card_pool_id if @card_pool_id.nil?
@restriction_id = active_snapshot.restriction_id if @restriction_id.nil?
end
end
elsif !@card_pool_id.nil? && @format_id.nil?
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/cards.rake
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ namespace :cards do
new_card.num_printed_subroutines = num_printed_subroutines
end

if new_card.text&.include?(' can be advanced') && new_card.text&.match("#{new_card.title} can be advanced")
if new_card.text&.include?(' can be advanced') && new_card.text.match("#{new_card.title} can be advanced")
new_card.advanceable = true
end

Expand Down
Loading