diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-04 16:36:19 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-04 16:36:19 -0600 |
| commit | a6fb1c58eead1357a307813c69f798f32bcf7cae (patch) | |
| tree | d56d2721705d86a925279a737943cbaa28a60979 /app/controllers/admin | |
| parent | 530fcc1c14d2b7a38c1b734c0b18955f109f0f20 (diff) | |
| parent | 38e0133e1b01c21a710111097102a6eb205b9b9b (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/controllers/admin')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 487282dc3..a6214dc3f 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -19,6 +19,7 @@ module Admin min_invite_role activity_api_enabled peers_api_enabled + show_known_fediverse_at_about_page ).freeze BOOLEAN_SETTINGS = %w( @@ -28,6 +29,7 @@ module Admin show_staff_badge activity_api_enabled peers_api_enabled + show_known_fediverse_at_about_page ).freeze UPLOAD_SETTINGS = %w( |