Merge pull request #3201 from manyfold3d/use-federails-main

Go back to federails main
manyfold3d · Nov 19, 2024 · 35bde52 · 35bde52
2 parents eb687f9 + 18d533b
commit 35bde52
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -146,7 +146,7 @@ gem "better_content_security_policy", "~> 0.1.4"
 gem "devise_zxcvbn", "~> 6.0"
 
 gem "ransack", "~> 4.2"
-gem "federails", git: "https://gitlab.com/experimentslabs/federails.git", branch: "custom-actor-content"
+gem "federails", git: "https://gitlab.com/experimentslabs/federails.git"
 gem "caber"
 
 gem "nanoid", "~> 2.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,8 +9,7 @@ GIT
 
 GIT
   remote: https://gitlab.com/experimentslabs/federails.git
-  revision: 1c5dc0d225a0c17dad71aef4cca718a3a17001c7
-  branch: custom-actor-content
+  revision: 1c121af7556d2575a24409b6ebc10ee99e3e142a
   specs:
     federails (0.2.0)
       faraday

diff --git a/db/migrate/20240727113215_create_federails_actors.federails.rb b/db/migrate/20240727113215_create_federails_actors.federails.rb
@@ -12,7 +12,7 @@ def change
       t.string :followings_url
       t.string :profile_url
 
-      t.references :user, null: true, foreign_key: {to_table: Federails.configuration.user_table}
+      t.references :user, null: true, foreign_key: {to_table: "users"}
 
       t.timestamps
       t.index :federated_url, unique: true

diff --git a/db/migrate/20240731165646_change_actor_entity_rel_to_polymorphic.federails.rb b/db/migrate/20240731165646_change_actor_entity_rel_to_polymorphic.federails.rb
@@ -1,11 +1,11 @@
 # This migration comes from federails (originally 20240731145400)
 class ChangeActorEntityRelToPolymorphic < ActiveRecord::Migration[7.0]
   def change
-    remove_foreign_key :federails_actors, column: :user_id, to_table: Federails::Configuration.user_table
+    remove_foreign_key :federails_actors, column: :user_id, to_table: "users"
     remove_index :federails_actors, :user_id, unique: true
     change_table :federails_actors do |t|
       t.rename :user_id, :entity_id
-      t.string :entity_type, null: true, default: Federails::Configuration.user_class&.demodulize
+      t.string :entity_type, null: true
       t.index [:entity_type, :entity_id], name: "index_federails_actors_on_entity", unique: true
     end
   end