diff options
author | ThibG <thib@sitedethib.com> | 2018-08-17 18:09:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 18:09:30 +0200 |
commit | 32075fe27f699d5a586e6ecf26c172550f9d4086 (patch) | |
tree | 61f48fa2dee608f72990f76a8f0497d670339252 /db/migrate/20180528141303_fix_accounts_unique_index.rb | |
parent | 4a6bc2482a26aa0441485ca360a3d3c0eeea7fe4 (diff) | |
parent | a16ff45d81d77d93f33ad57e746c780392ab1a1c (diff) |
Merge pull request #642 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'db/migrate/20180528141303_fix_accounts_unique_index.rb')
-rw-r--r-- | db/migrate/20180528141303_fix_accounts_unique_index.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/db/migrate/20180528141303_fix_accounts_unique_index.rb b/db/migrate/20180528141303_fix_accounts_unique_index.rb index 624ea229e..bd4e158b7 100644 --- a/db/migrate/20180528141303_fix_accounts_unique_index.rb +++ b/db/migrate/20180528141303_fix_accounts_unique_index.rb @@ -6,6 +6,10 @@ class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2] def local? domain.nil? end + + def acct + local? ? username : "#{username}@#{domain}" + end end disable_ddl_transaction! |