Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 16:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
This commit is contained in:
Claire
2023-10-24 19:31:14 +02:00
parent 69ea596e55 379115e601
commit e25cc4deb7
25 changed files with 382 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/auth/passwords_controller.rb
View File

@@ -1,6 +1,7 @@
# frozen_string_literal: true
class Auth::PasswordsController < Devise::PasswordsController
skip_before_action :check_self_destruct!
before_action :check_validity_of_reset_password_token, only: :edit
before_action :set_pack
before_action :set_body_classes