Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-23 15:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
This commit is contained in:
Claire
2025-05-28 18:41:47 +02:00
parent a76647c406 ca41a95872
commit b627aee45f
48 changed files with 588 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/api/v1/accounts_controller.rb
View File

@@ -10,6 +10,7 @@ class Api::V1::AccountsController < Api::BaseController
before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:create]
before_action :require_user!, except: [:index, :show, :create]
before_action :require_client_credentials!, only: [:create]
before_action :set_account, except: [:index, :create]
before_action :set_accounts, only: [:index]
before_action :check_account_approval, except: [:index, :create]