10 files changed, 4 insertions, 43 deletions
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index fbbcbbcde..f303fc54d 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -17,7 +17,7 @@ Chewy.settings = {
 }
 
 # We use our own async strategy even outside the request-response
-# cycle, which takes care of checking if ElasticSearch is enabled
+# cycle, which takes care of checking if Elasticsearch is enabled
 # or not. However, mind that for the Rails console, the :urgent
 # strategy is set automatically with no way to override it.
 Chewy.root_strategy              = :custom_sidekiq
@@ -32,8 +32,8 @@ module Chewy
   end
 end
 
-# ElasticSearch uses Faraday internally. Faraday interprets the
+# Elasticsearch uses Faraday internally. Faraday interprets the
 # http_proxy env variable by default which leads to issues when
 # Mastodon is run with hidden services enabled, because
-# ElasticSearch is *not* supposed to be accessed through a proxy
+# Elasticsearch is *not* supposed to be accessed through a proxy
 Faraday.ignore_env_proxy = true
diff --git a/config/locales-glitch/en.yml b/config/locales-glitch/en.yml
index 6268727a7..5cc2625fc 100644
--- a/config/locales-glitch/en.yml
+++ b/config/locales-glitch/en.yml
@@ -1,8 +1,6 @@
 ---
 en:
   admin:
-    dashboard:
-      keybase: Keybase integration
     settings:
       enable_keybase:
         desc_html: Allow your users to prove their identity via keybase
diff --git a/config/locales-glitch/es.yml b/config/locales-glitch/es.yml
index 7e8de1560..ad942a0c0 100644
--- a/config/locales-glitch/es.yml
+++ b/config/locales-glitch/es.yml
@@ -1,8 +1,6 @@
 ---
 es:
   admin:
-    dashboard:
-      keybase: Integración con keybase
     settings:
       enable_keybase:
         desc_html: Permite a tus usuarixs comprobar su identidad por medio de keybase
@@ -22,4 +20,4 @@ es:
   generic:
     use_this: Usar
   settings:
-    flavours: Ediciones
\ No newline at end of file
+    flavours: Ediciones
diff --git a/config/locales-glitch/ja.yml b/config/locales-glitch/ja.yml
index 2be4e9ea0..3ecb46ccd 100644
--- a/config/locales-glitch/ja.yml
+++ b/config/locales-glitch/ja.yml
@@ -1,8 +1,6 @@
 ---
 ja:
   admin:
-    dashboard:
-      keybase: Keybase統合
     settings:
       enable_keybase:
         desc_html: Keybaseにより身元の証明が可能となります
diff --git a/config/locales-glitch/ko.yml b/config/locales-glitch/ko.yml
index ae7f091bb..aef10f677 100644
--- a/config/locales-glitch/ko.yml
+++ b/config/locales-glitch/ko.yml
@@ -1,8 +1,6 @@
 ---
 ko:
   admin:
-    dashboard:
-      keybase: 키베이스 연동
     settings:
       enable_keybase:
         desc_html: 사용자들이 키베이스를 통해 개인 신원을 증명할 수 있도록 허용
diff --git a/config/locales-glitch/zh-CN.yml b/config/locales-glitch/zh-CN.yml
index ea1db3eb9..37a8307e8 100644
--- a/config/locales-glitch/zh-CN.yml
+++ b/config/locales-glitch/zh-CN.yml
@@ -1,8 +1,6 @@
 ---
 zh-CN:
   admin:
-    dashboard:
-      keybase: Keybase 集成
     settings:
       enable_keybase:
         desc_html: 允许你的用户使用 Keybase 证明身份
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c98b82801..1aa96ba0f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -985,26 +985,6 @@ en:
       other: Something isn't quite right yet! Please review %{count} errors below
   html_validator:
     invalid_markup: 'contains invalid HTML markup: %{error}'
-  identity_proofs:
-    active: Active
-    authorize: Yes, authorize
-    authorize_connection_prompt: Authorize this cryptographic connection?
-    errors:
-      failed: The cryptographic connection failed. Please try again from %{provider}.
-      keybase:
-        invalid_token: Keybase tokens are hashes of signatures and must be 66 hex characters
-        verification_failed: Keybase does not recognize this token as a signature of Keybase user %{kb_username}. Please retry from Keybase.
-      wrong_user: Cannot create a proof for %{proving} while logged in as %{current}. Log in as %{proving} and try again.
-    explanation_html: Here you can cryptographically connect your other identities from other platforms, such as Keybase. This lets other people send you encrypted messages on those platforms and allows them to trust that the content you send them comes from you.
-    i_am_html: I am %{username} on %{service}.
-    identity: Identity
-    inactive: Inactive
-    publicize_checkbox: 'And toot this:'
-    publicize_toot: 'It is proven! I am %{username} on %{service}: %{url}'
-    remove: Remove proof from account
-    removed: Successfully removed proof from account
-    status: Verification status
-    view_proof: View proof
   imports:
     errors:
       over_rows_processing_limit: contains more than %{count} rows
@@ -1279,7 +1259,6 @@ en:
     edit_profile: Edit profile
     export: Data export
     featured_tags: Featured hashtags
-    identity_proofs: Identity proofs
     import: Import
     import_and_export: Import and export
     migrate: Account migration
diff --git a/config/navigation.rb b/config/navigation.rb
index 846d76c48..53ee3d6c1 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -7,7 +7,6 @@ SimpleNavigation::Configuration.run do |navigation|
     n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_url, if: -> { current_user.functional? } do |s|
       s.item :profile, safe_join([fa_icon('pencil fw'), t('settings.appearance')]), settings_profile_url
       s.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_url
-      s.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? }
     end
 
     n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, if: -> { current_user.functional? } do |s|
diff --git a/config/routes.rb b/config/routes.rb
index 09d625abd..19d87e6d5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,7 +25,6 @@ Rails.application.routes.draw do
   get '.well-known/nodeinfo', to: 'well_known/nodeinfo#index', as: :nodeinfo, defaults: { format: 'json' }
   get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger
   get '.well-known/change-password', to: redirect('/auth/edit')
-  get '.well-known/keybase-proof-config', to: 'well_known/keybase_proof_config#show'
 
   get '/nodeinfo/2.0', to: 'well_known/nodeinfo#show', as: :nodeinfo_schema
 
@@ -146,8 +145,6 @@ Rails.application.routes.draw do
       resource :confirmation, only: [:new, :create]
     end
 
-    resources :identity_proofs, only: [:index, :new, :create, :destroy]
-
     resources :applications, except: [:edit] do
       member do
         post :regenerate
@@ -334,9 +331,6 @@ Rails.application.routes.draw do
     # OEmbed
     get '/oembed', to: 'oembed#show', as: :oembed
 
-    # Identity proofs
-    get :proofs, to: 'proofs#index'
-
     # JSON / REST API
     namespace :v1 do
       resources :statuses, only: [:create, :show, :destroy] do
diff --git a/config/settings.yml b/config/settings.yml
index 953e7b3eb..094209822 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -33,7 +33,6 @@ defaults: &defaults
   system_emoji_font: false
   noindex: false
   hide_followers_count: false
-  enable_keybase: true
   flavour: 'glitch'
   skin: 'default'
   aggregate_reblogs: true