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/‎.github/workflows/check-i18n.yml‎
Lines changed: 20 additions & 20 deletions b/‎.github/workflows/check-i18n.yml‎
Lines changed: 20 additions & 20 deletions
diff --git a/‎.gitignore‎
Lines changed: 3 additions & 0 deletions b/‎.gitignore‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 42 additions & 5 deletions b/‎CHANGELOG.md‎
Lines changed: 42 additions & 5 deletions
diff --git a/‎Dockerfile‎
Lines changed: 1 addition & 1 deletion b/‎Dockerfile‎
Lines changed: 1 addition & 1 deletion
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
@@ -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,7 +1,7 @@
 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.
   - name: Bug Bounty Program
     url: https://app.intigriti.com/programs/mastodon/mastodonio/detail
 
@@ -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
@@ -2,9 +2,9 @@ name: Check i18n
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 env:
   RAILS_ENV: test
@@ -14,21 +14,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libicu-dev libidn11-dev
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-          bundler-cache: true
-      - name: Check locale file normalization
-        run: bundle exec i18n-tasks check-normalized
-      - name: Check for unused strings
-        run: bundle exec i18n-tasks unused -l en
-      - name: Check for wrong string interpolations
-        run: bundle exec i18n-tasks check-consistent-interpolations
-      - name: Check that all required locale files exist
-        run: bundle exec rake repo:check_locales_files
+    - uses: actions/checkout@v2
+    - name: Install system dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libicu-dev libidn11-dev
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.0'
+        bundler-cache: true
+    - name: Check locale file normalization
+      run: bundle exec i18n-tasks check-normalized
+    - name: Check for unused strings
+      run: bundle exec i18n-tasks unused -l en
+    - name: Check for wrong string interpolations
+      run: bundle exec i18n-tasks check-consistent-interpolations
+    - name: Check that all required locale files exist
+      run: bundle exec rake repo:check_locales_files
@@ -66,3 +66,6 @@ yarn-debug.log
 
 # Ignore Docker option files
 docker-compose.override.yml
+
+# Ignore Docker compose files
+docker-compose.yml
@@ -49,7 +49,7 @@ ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin"
 
 RUN npm install -g npm@9 && \
 	npm install -g yarn && \
-	gem install bundler && \
+	gem install bundler -v 2.3.0 && \
 	apt-get update && \
 	apt-get install -y --no-install-recommends git libicu-dev libidn11-dev \
 	libpq-dev shared-mime-info
 
@@ -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": {
 
@@ -164,5 +164,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
@@ -22,6 +22,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!
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": {`