From 10ba09f5466fe3d34a5ed78202c35f4e4f9d30e6 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 17 Aug 2016 17:56:23 +0200 Subject: Upgrade to Rails 5.0.0.1 --- app/models/account.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/models/account.rb') diff --git a/app/models/account.rb b/app/models/account.rb index f61f4c765..cc050dfa3 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -1,10 +1,10 @@ -class Account < ActiveRecord::Base +class Account < ApplicationRecord include Targetable # Local users has_one :user, inverse_of: :account - validates :username, uniqueness: { scope: :domain, case_sensitive: false }, if: 'local?' - validates :username, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?' + validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: false }, if: 'local?' + validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?' # Avatar upload has_attached_file :avatar, styles: { large: '300x300#', medium: '96x96#', small: '48x48#' }, default_url: 'avatars/missing.png' -- cgit