stsecurity
diff --git a/‎.github/ISSUE_TEMPLATE/3.support.md‎
Lines changed: 10 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE/3.support.md‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/config.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/ISSUE_TEMPLATE/config.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/build-image.yml‎
Lines changed: 40 additions & 0 deletions b/‎.github/workflows/build-image.yml‎
Lines changed: 40 additions & 0 deletions
diff --git a/‎app.json‎
Lines changed: 1 addition & 1 deletion b/‎app.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/controllers/admin/accounts_controller.rb‎
Lines changed: 14 additions & 0 deletions b/‎app/controllers/admin/accounts_controller.rb‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎app/controllers/admin/instances_controller.rb‎
Lines changed: 9 additions & 0 deletions b/‎app/controllers/admin/instances_controller.rb‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎app/controllers/admin/sign_in_token_authentications_controller.rb‎
Lines changed: 27 additions & 0 deletions b/‎app/controllers/admin/sign_in_token_authentications_controller.rb‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎app/controllers/api/v1/admin/accounts_controller.rb‎
Lines changed: 2 additions & 0 deletions b/‎app/controllers/api/v1/admin/accounts_controller.rb‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎app/controllers/api/v1/admin/reports_controller.rb‎
Lines changed: 2 additions & 0 deletions b/‎app/controllers/api/v1/admin/reports_controller.rb‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎app/javascript/mastodon/locales/da.json‎
Lines changed: 3 additions & 3 deletions b/‎app/javascript/mastodon/locales/da.json‎
Lines changed: 3 additions & 3 deletions
@@ -0,0 +1,10 @@
+---
+name: Support
+about: Ask for help with your deployment
+title: DO NOT CREATE THIS ISSUE
+---
+
+We primarily use GitHub as a bug and feature tracker. For usage questions, troubleshooting of deployments and other individual technical assistance, please use one of the resources below:
+
+- https://discourse.joinmastodon.org
+- #mastodon on irc.freenode.net
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: GitHub Discussions
-    url: https://github.com/mastodon/mastodon/discussions
+    url: https://github.com/stsecurity/mastodon/discussions
     about: Please ask and answer questions here.
@@ -0,0 +1,40 @@
+name: Build container image
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "*"
+  pull_request:
+    paths:
+      - .github/workflows/build-image.yml
+      - Dockerfile
+jobs:
+  build-image:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - uses: docker/metadata-action@v3
+        id: meta
+        with:
+          images: tootsuite/mastodon
+          flavor: |
+            latest=auto
+          tags: |
+            type=edge,branch=main
+            type=semver,pattern={{ raw }}
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=registry,ref=tootsuite/mastodon:latest
+          cache-to: type=inline
@@ -1,7 +1,7 @@
 {
   "name": "Mastodon",
   "description": "A GNU Social-compatible microblogging server",
-  "repository": "https://github.com/mastodon/mastodon",
+  "repository": "https://github.com/stsecurity/mastodon",
   "logo": "https://github.com/mastodon.png",
   "env": {
     "HEROKU": {
 
@@ -171,5 +171,19 @@ def action_from_button
         'reject'
       end
     end
+
+    def form_account_batch_params
+      params.require(:form_account_batch).permit(:action, account_ids: [])
+    end
+
+    def action_from_button
+      if params[:suspend]
+        'suspend'
+      elsif params[:approve]
+        'approve'
+      elsif params[:reject]
+        'reject'
+      end
+    end
   end
 end
@@ -28,6 +28,15 @@ def destroy
       redirect_to admin_instances_path, notice: I18n.t('admin.instances.destroyed_msg', domain: @instance.domain)
     end
 
+    def destroy
+      authorize :instance, :destroy?
+
+      Admin::DomainPurgeWorker.perform_async(@instance.domain)
+
+      log_action :destroy, @instance
+      redirect_to admin_instances_path, notice: I18n.t('admin.instances.destroyed_msg', domain: @instance.domain)
+    end
+
     def clear_delivery_errors
       authorize :delivery, :clear_delivery_errors?
       @instance.delivery_failure_tracker.clear_failures!
 
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Admin
+  class SignInTokenAuthenticationsController < BaseController
+    before_action :set_target_user
+
+    def create
+      authorize @user, :enable_sign_in_token_auth?
+      @user.update(skip_sign_in_token: false)
+      log_action :enable_sign_in_token_auth, @user
+      redirect_to admin_account_path(@user.account_id)
+    end
+
+    def destroy
+      authorize @user, :disable_sign_in_token_auth?
+      @user.update(skip_sign_in_token: true)
+      log_action :disable_sign_in_token_auth, @user
+      redirect_to admin_account_path(@user.account_id)
+    end
+
+    private
+
+    def set_target_user
+      @user = User.find(params[:user_id])
+    end
+  end
+end
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Api::V1::Admin::AccountsController < Api::BaseController
+  protect_from_forgery with: :exception
+
   include Authorization
   include AccountableConcern
 
 
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Api::V1::Admin::ReportsController < Api::BaseController
+  protect_from_forgery with: :exception
+
   include Authorization
   include AccountableConcern
 
 
@@ -301,7 +301,7 @@
   "emoji_button.not_found": "Ingen matchende emojis fundet",
   "emoji_button.objects": "Objekter",
   "emoji_button.people": "Personer",
-  "emoji_button.recent": "Oftest brugt",
+  "emoji_button.recent": "De sædvanlige",
   "emoji_button.search": "Søg...",
   "emoji_button.search_results": "Søgeresultater",
   "emoji_button.symbols": "Symboler",
@@ -405,7 +405,7 @@
   "hashtag.column_header.tag_mode.none": "uden {additional}",
   "hashtag.column_settings.select.no_options_message": "Ingen forslag fundet",
   "hashtag.column_settings.select.placeholder": "Angiv hashtags…",
-  "hashtag.column_settings.tag_mode.all": "Alle disse",
+  "hashtag.column_settings.tag_mode.all": "Allesammen",
   "hashtag.column_settings.tag_mode.any": "Nogle af disse",
   "hashtag.column_settings.tag_mode.none": "Ingen af disse",
   "hashtag.column_settings.tag_toggle": "Inkludér ekstra tags for denne kolonne",
@@ -918,7 +918,7 @@
   "time_remaining.days": "{number, plural, one {# dag} other {# dage}} tilbage",
   "time_remaining.hours": "{number, plural, one {# time} other {# timer}} tilbage",
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutter}} tilbage",
-  "time_remaining.moments": "Få øjeblikke tilbage",
+  "time_remaining.moments": "Et øjeblik tilbage",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} tilbage",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} {days, plural, one {den seneste dag} other {de seneste {days} dage}}",
   "trends.trending_now": "Trender lige nu",
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Mastodon",`
`3`	`3`	`"description": "A GNU Social-compatible microblogging server",`
`4`		`- "repository": "https://github.com/mastodon/mastodon",`
	`4`	`+ "repository": "https://github.com/stsecurity/mastodon",`
`5`	`5`	`"logo": "https://github.com/mastodon.png",`
`6`	`6`	`"env": {`
`7`	`7`	`"HEROKU": {`