From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 20 Mar 2019 12:54:00 +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=1d6152f4404d40a6113bad2e70326fb5c2145ef4;p=mastodon.git

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

Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
---

1d6152f4404d40a6113bad2e70326fb5c2145ef4
diff --cc Gemfile.lock
index 45370d154,71b5f3a9d..5df1dc0ad
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -258,10 -257,7 +257,9 @@@ GE
      highline (2.0.0)
      hiredis (0.6.3)
      hkdf (0.3.0)
 +    html2text (0.2.1)
 +      nokogiri (~> 1.6)
      htmlentities (4.3.4)
-     http-2 (0.10.1)
      http (3.3.0)
        addressable (~> 2.3)
        http-cookie (~> 1.0)
diff --cc config/locales/en.yml
index 81059b163,ba42e7ce1..7e1d92884
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -839,7 -850,7 +854,8 @@@ en
      edit_profile: Edit profile
      export: Data export
      featured_tags: Featured hashtags
 +    flavours: Flavours
+     identity_proofs: Identity proofs
      import: Import
      migrate: Account migration
      notifications: Notifications
diff --cc config/navigation.rb
index e730edfa2,07aec4b9d..86c2572d7
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@@ -14,14 -14,9 +14,15 @@@ SimpleNavigation::Configuration.run do 
        settings.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
        settings.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url
        settings.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url
+       settings.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}
      end
  
 +    primary.item :flavours, safe_join([fa_icon('paint-brush fw'), t('settings.flavours')]), settings_flavours_url do |flavours|
 +      Themes.instance.flavours.each do |flavour|
 +        flavours.item flavour.to_sym, safe_join([fa_icon('star fw'), t("flavours.#{flavour}.name", default: flavour)]), settings_flavour_url(flavour)
 +      end
 +    end
 +
      primary.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url
      primary.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}
      primary.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: proc { Setting.min_invite_role == 'user' }