tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes
This commit is contained in:
Thibaut Girka
2018-05-27 13:20:15 +02:00
parent c2e528916c 63c7b91572
commit 659b8a12ec
51 changed files with 716 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/user.rb
View File

@ -65,6 +65,7 @@ class User < ApplicationRecord
validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
validates_with BlacklistedEmailValidator, if: :email_changed?
validates_with EmailMxValidator, if: :email_changed?
scope :recent, -> { order(id: :desc) }
scope :admins, -> { where(admin: true) }