From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 14 Mar 2019 16:14:05 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=07eb31eeacc4e0364b839233a41fa65eb3c650ce;p=mastodon.git

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

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
---

07eb31eeacc4e0364b839233a41fa65eb3c650ce
diff --cc app/views/admin/settings/edit.html.haml
index e3ceb4344,d9b4bf01b..9995e0b2a
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@@ -6,8 -6,11 +6,11 @@@
    .fields-group
      = f.input :site_title, wrapper: :with_label, label: t('admin.settings.site_title')
  
-   .fields-group
-     = f.input :flavour_and_skin, collection: Themes.instance.flavours_and_skins, group_label_method: lambda { |(flavour, _)| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, include_blank: false, as: :grouped_select, label_method: :last, value_method: lambda { |value| value.join('/') }, group_method: :last
+   .fields-row
+     .fields-row__column.fields-row__column-6.fields-group
 -      = f.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
++      = f.input :flavour_and_skin, collection: Themes.instance.flavours_and_skins, group_label_method: lambda { |(flavour, _)| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, include_blank: false, as: :grouped_select, label_method: :last, value_method: lambda { |value| value.join('/') }, group_method: :last
+     .fields-row__column.fields-row__column-6.fields-group
+       = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, label: t('admin.settings.registrations_mode.title'), include_blank: false, label_method: lambda { |mode| I18n.t("admin.settings.registrations_mode.modes.#{mode}") }
  
    .fields-row
      .fields-row__column.fields-row__column-6.fields-group