Maintenance: Bump rubocop-rails from 2.11.3 to 2.12.1
This commit is contained in:
parent
3b0a373de0
commit
58028f7081
4 changed files with 4 additions and 8 deletions
|
@ -516,7 +516,7 @@ GEM
|
||||||
rubocop-performance (1.11.5)
|
rubocop-performance (1.11.5)
|
||||||
rubocop (>= 1.7.0, < 2.0)
|
rubocop (>= 1.7.0, < 2.0)
|
||||||
rubocop-ast (>= 0.4.0)
|
rubocop-ast (>= 0.4.0)
|
||||||
rubocop-rails (2.11.3)
|
rubocop-rails (2.12.1)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
rack (>= 1.1)
|
rack (>= 1.1)
|
||||||
rubocop (>= 1.7.0, < 2.0)
|
rubocop (>= 1.7.0, < 2.0)
|
||||||
|
|
|
@ -67,7 +67,7 @@ module KnowledgeBaseHelper
|
||||||
def canonical_link_tag(knowledge_base, *objects)
|
def canonical_link_tag(knowledge_base, *objects)
|
||||||
path = kb_public_system_path(*objects)
|
path = kb_public_system_path(*objects)
|
||||||
|
|
||||||
tag :link, rel: 'canonical', href: knowledge_base.canonical_url(path)
|
tag.link(rel: 'canonical', href: knowledge_base.canonical_url(path))
|
||||||
end
|
end
|
||||||
|
|
||||||
def kb_public_system_path(*objects)
|
def kb_public_system_path(*objects)
|
||||||
|
|
|
@ -38,7 +38,8 @@ module CanBePublished
|
||||||
|
|
||||||
belongs_to local, class_name: 'User', inverse_of: remote, optional: true
|
belongs_to local, class_name: 'User', inverse_of: remote, optional: true
|
||||||
|
|
||||||
User.has_many remote, class_name: model_name, inverse_of: local, foreign_key: "#{local}_id"
|
# Deletion of users is handled in User.destroy_move_dependency_ownership and resets fields to user_id: 1, so skip dependent: here.
|
||||||
|
User.has_many remote, class_name: model_name, inverse_of: local, foreign_key: "#{local}_id" # rubocop:disable Rails/HasManyOrHasOneDependent
|
||||||
User.association_attributes_ignored remote
|
User.association_attributes_ignored remote
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,4 @@
|
||||||
RSpec.configure do |config|
|
RSpec.configure do |config|
|
||||||
# make usage of time travel helpers possible
|
# make usage of time travel helpers possible
|
||||||
config.include ActiveSupport::Testing::TimeHelpers
|
config.include ActiveSupport::Testing::TimeHelpers
|
||||||
|
|
||||||
# avoid stuck time issues
|
|
||||||
config.after do
|
|
||||||
travel_back
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue