mirrors
/
hometown
mirror of https://github.com/hometown-fork/hometown.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing stray bad merge

This commit is contained in:
Darius Kazemi 2022-05-08 13:18:47 -07:00
parent 390635e922
commit 9fb28f4258
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/migrate/20190715164535_add_instance_actor.rb
View File

@ -2,8 +2,6 @@ class AddInstanceActor < ActiveRecord::Migration[5.2]
class Account < ApplicationRecord class Account < ApplicationRecord
# Dummy class, to make migration possible across version changes # Dummy class, to make migration possible across version changes
validates :username, uniqueness: { scope: :domain, case_sensitive: false } validates :username, uniqueness: { scope: :domain, case_sensitive: false }
<<<<<<< HEAD
=======
before_create :generate_keys before_create :generate_keys
@ -12,7 +10,6 @@ class AddInstanceActor < ActiveRecord::Migration[5.2]
self.private_key = keypair.to_pem self.private_key = keypair.to_pem
self.public_key = keypair.public_key.to_pem self.public_key = keypair.public_key.to_pem
end end
>>>>>>> hometown-dev-3.5.2
end end
def up def up