Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
2019-03-14 17:14:05 +01:00
parent fa75324059 874bd3ac0c
commit 07eb31eeac
103 changed files with 523 additions and 434 deletions
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@ -65,7 +65,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
  end

  def registrations
-    Setting.open_registrations && !Rails.configuration.x.single_user_mode
+    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
  end

  private