Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.
RSpec/SpecFilePathFormat
test
Lint/EmptyBlock
rubocop:disable
Performance/MapMethodChain
RSpec/MetadataStyle
RSpec/MessageSpies
RSpec/HookArgument