diff --git a/Gemfile.lock b/Gemfile.lock
index 208a19d2b..7c9c66285 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -516,7 +516,7 @@ GEM
     rubocop-performance (1.11.5)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.11.3)
+    rubocop-rails (2.12.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
diff --git a/app/helpers/knowledge_base_helper.rb b/app/helpers/knowledge_base_helper.rb
index aaf302758..b88eceeef 100644
--- a/app/helpers/knowledge_base_helper.rb
+++ b/app/helpers/knowledge_base_helper.rb
@@ -67,7 +67,7 @@ module KnowledgeBaseHelper
   def canonical_link_tag(knowledge_base, *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
 
   def kb_public_system_path(*objects)
diff --git a/app/models/concerns/can_be_published.rb b/app/models/concerns/can_be_published.rb
index 8a898cd31..906317101 100644
--- a/app/models/concerns/can_be_published.rb
+++ b/app/models/concerns/can_be_published.rb
@@ -38,7 +38,8 @@ module CanBePublished
 
       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
     end
 
diff --git a/spec/support/time_helper.rb b/spec/support/time_helper.rb
index 93a9d4945..02a5b95c7 100644
--- a/spec/support/time_helper.rb
+++ b/spec/support/time_helper.rb
@@ -3,9 +3,4 @@
 RSpec.configure do |config|
   # make usage of time travel helpers possible
   config.include ActiveSupport::Testing::TimeHelpers
-
-  # avoid stuck time issues
-  config.after do
-    travel_back
-  end
 end