djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-27 10:30:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
86c9c5afa0
tootlab-mastodon/app/views
History
Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 
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.
2023-10-08 17:26:43 +02:00
..
about Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts Fix haml-lint Rubocop Style/SlicingWithRange cop (#25947) 2023-07-17 18:18:13 +02:00
admin Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 2023-10-08 17:21:12 +02:00
admin_mailer Add timezone to datetimes in e-mails (#26822) 2023-09-06 17:25:39 +02:00
application Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
auth Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 2023-10-08 17:21:12 +02:00
custom_css Add role badges to the WebUI (#25649) 2023-07-27 16:05:24 +02:00
disputes/strikes Fix haml-lint Rubocop Rails/* cops (#26042) 2023-10-03 15:00:40 +02:00
errors Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
filters Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
follower_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
invites Fix haml-lint InstanceVariables rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
kaminari Fix missing translation in pagination gap tags (#24262) 2023-03-29 13:54:33 +02:00
layouts Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
mail_subscriptions Add unsubscribe link to e-mails (#25378) 2023-06-12 14:22:46 +02:00
media Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream 2023-07-30 13:42:06 +02:00
notification_mailer Add timezone to datetimes in e-mails (#26822) 2023-09-06 17:25:39 +02:00
oauth Add role badges to the WebUI (#25649) 2023-07-27 16:05:24 +02:00
privacy Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
remote_interaction_helper Fix interaction modal being broken because of glitch-soc's theming system 2023-07-30 16:45:50 +02:00
settings Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 2023-10-08 17:26:43 +02:00
shared Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 2023-10-08 16:48:19 +02:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 2023-10-08 17:21:12 +02:00
statuses_cleanup Fix haml-lint Rubocop lambda cop (#25946) 2023-07-17 15:07:29 +02:00
tags Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
user_mailer Fix haml-lint Rubocop Rails/* cops (#26042) 2023-10-03 15:00:40 +02:00
well_known/host_meta Rubocop fix: Perfomance/UnfreezeString (#26217) 2023-07-28 23:11:05 +02:00