Mastodon

History

Claire 555e33a392 Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict because of our different theming systems.
  Updated accordingly, along with `app/helpers/theme_helper.rb`
  and `app/helpers/theme_helper_spec.rb`.

2024-05-01 18:38:55 +02:00

about

…

accounts

Avoid unnecessary i-var for account rss page url generation (#28092 )

2023-11-28 08:19:08 +00:00

admin

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

2024-05-01 17:22:02 +02:00

admin_mailer

Add list of pending releases directly in mail notifications for version updates (#29436 )

2024-03-26 14:45:19 +00:00

application

Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream

2024-05-01 17:30:52 +02:00

auth

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

custom_css

Spec coverage for custom css endpoint (#28706 )

2024-01-12 09:19:25 +00:00

disputes/strikes

Add coverage/bugfix for invalid appeal submission (#28703 )

2024-01-12 09:21:00 +00:00

errors

Use ENV.fetch in views, fixes rubocop haml-lint issue (#27527 )

2023-10-24 09:30:14 +00:00

filters

Fix haml-lint LineLength cops in app/views/admin (#28680 )

2024-03-15 11:19:00 +00:00

follower_accounts

…

following_accounts

…

home

…

invites

Fix haml-lint InstanceVariables rule for invites/_form (#26064 )

2023-09-28 15:40:28 +02:00

kaminari

…

layouts

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

2024-05-01 18:38:55 +02:00

mail_subscriptions

Fix LineLength haml-lint in t usage (#28686 )

2024-01-11 09:32:32 +00:00

media

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

notification_mailer

Update follow and follow_request emails (#28755 )

2024-01-17 14:37:04 +00:00

oauth

Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053 )

2023-11-30 15:43:26 +00:00

privacy

…

redirects

Add confirmation when redirecting logged-out requests to permalink (#27792 )

2024-01-24 10:49:19 +00:00

relationships

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

remote_interaction_helper

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

settings

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

severed_relationships

Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately (#29714 )

2024-03-22 15:44:31 +00:00

shared

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

statuses

Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream

2023-10-25 19:59:17 +02:00

statuses_cleanup

Fix haml-lint LineLength cops in app/views/admin (#28680 )

2024-03-15 11:19:00 +00:00