fef/nyastodon
1
1
Fork 0
forked from mirrors/catstodon
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
This commit is contained in:
Claire 2023-10-08 17:26:43 +02:00
commit 86c9c5afa0
15 changed files with 576 additions and 493 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/concerns/web_app_controller_concern.rb
View file

Internal server error - The gay git

500

Internal server error

Forgejo version: 9.0.3

 @ -4,11 +4,11 @@ module WebAppControllerConcern