From: Tom Hughes Date: Wed, 22 Dec 2021 15:36:25 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/3404' X-Git-Tag: live~2370 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0ca2e10b1d42fc08ca024364be06955af71ed932?hp=5a70476d38447d7b57d9bb96b55097d9d0873e3a Merge remote-tracking branch 'upstream/pull/3404' --- diff --git a/app/models/user.rb b/app/models/user.rb index 1bb532152..8c75b4ef4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -45,7 +45,6 @@ class User < ApplicationRecord require "digest" - require "xml/libxml" has_many :traces, -> { where(:visible => true) } has_many :diary_entries, -> { order(:created_at => :desc) }