about summary refs log tree commit diff
path: root/app/models/form
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-02-04 16:36:19 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-02-04 16:36:19 -0600
commita6fb1c58eead1357a307813c69f798f32bcf7cae (patch)
treed56d2721705d86a925279a737943cbaa28a60979 /app/models/form
parent530fcc1c14d2b7a38c1b734c0b18955f109f0f20 (diff)
parent38e0133e1b01c21a710111097102a6eb205b9b9b (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb
Diffstat (limited to 'app/models/form')
-rw-r--r--app/models/form/admin_settings.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index dd629279c..32922e7f1 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -34,6 +34,8 @@ class Form::AdminSettings
     :activity_api_enabled=,
     :peers_api_enabled,
     :peers_api_enabled=,
+    :show_known_fediverse_at_about_page,
+    :show_known_fediverse_at_about_page=,
     to: Setting
   )
 end