Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
	app/controllers/auth/confirmations_controller.rb

4 files changed, 19 insertions, 2 deletions

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b283f94f0..2691b9ed9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -265,12 +265,18 @@ en:
       unresolved: Unresolved
       view: View
     settings:
+      activity_api_enabled:
+        desc_html: Counts of locally posted statuses, active users, and new registrations in weekly buckets
+        title: Publish aggregate statistics about user activity
       bootstrap_timeline_accounts:
         desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins.
         title: Default follows for new users
       contact_information:
         email: Business e-mail
         username: Contact username
+      peers_api_enabled:
+        desc_html: Domain names this instance has encountered in the fediverse
+        title: Publish list of discovered instances
       registrations:
         closed_message:
           desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 31c946c00..2edb7ffd7 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -265,12 +265,18 @@ ko:
       unresolved: 미해결
       view: 표시
     settings:
+      activity_api_enabled:
+        desc_html: 주별 로컬에 게시 된 글, 활성 사용자 및 새로운 가입자 수
+        title: 유저 활동에 대한 통계 발행
       bootstrap_timeline_accounts:
         desc_html: 콤마로 여러 유저명을 구분. 로컬의 잠기지 않은 계정만 가능합니다. 비워 둘 경우 모든 로컬 관리자가 기본으로 사용 됩니다.
         title: 새 유저가 팔로우 할 계정들
       contact_information:
         email: 공개할 메일 주소를 입력
         username: 아이디를 입력
+      peers_api_enabled:
+        desc_html: 이 인스턴스가 페디버스에서 만났던 도메인 네임들
+        title: 발견 된 인스턴스들의 리스트 발행
       registrations:
         closed_message:
           desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다. <br>HTML 태그를 사용할 수 있습니다.
diff --git a/config/routes.rb b/config/routes.rb
index 5b0ee9324..f45684519 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -255,7 +255,11 @@ Rails.application.routes.draw do
 
       resources :apps, only: [:create]
 
-      resource :instance,      only: [:show]
+      resource :instance, only: [:show] do
+        resources :peers, only: [:index], controller: 'instances/peers'
+        resource :activity, only: [:show], controller: 'instances/activity'
+      end
+
       resource :domain_blocks, only: [:show, :create, :destroy]
 
       resources :follow_requests, only: [:index] do
diff --git a/config/settings.yml b/config/settings.yml
index dbc5f6a26..507b7c066 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -49,7 +49,8 @@ defaults: &defaults
     - webmaster
     - administrator
   bootstrap_timeline_accounts: ''
-
+  activity_api_enabled: true
+  peers_api_enabled: true
 development:
   <<: *defaults