cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/3345'

Browse source
This commit is contained in:
Tom Hughes 2022-02-13 18:39:21 +00:00
commit 53aa7259bb
12 changed files with 281 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -87,7 +87,7 @@ class User < ApplicationRecord
scope :active, -> { where(:status => %w[active confirmed]) }
scope :identifiable, -> { where(:data_public => true) }
has_one_attached :avatar
has_one_attached :avatar, :service => Settings.avatar_storage
validates :display_name, :presence => true, :length => 3..255,
:exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended]