monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views
History
Claire dd2a991e24 Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
  Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
  Glitch-soc had extra menu items, ported the changes for them too.
 		2024-08-08 19:30:16 +02:00
..
about
…
accounts
…
admin Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 2024-08-08 19:30:16 +02:00
admin_mailer Fix string interpolation for software updates admin mailer (#30035) 2024-04-23 12:54:52 +00:00
application Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
auth Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream 2024-07-24 20:07:37 +02:00
custom_css Spec coverage for custom css endpoint (#28706) 2024-01-12 09:19:25 +00:00
disputes/strikes
…
errors Use existing config access to `local_domain` value (#30509) 2024-06-03 09:15:58 +00:00
filters Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
follower_accounts
…
following_accounts
…
home
…
invites
…
kaminari
…
layouts Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
mail_subscriptions Migrate `form_tag` to `form_with` in admin and auth views (#30692) 2024-06-14 09:49:10 +00:00
media Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
notification_mailer
…
oauth Enable OAuth PKCE Extension (#31129) 2024-07-26 08:53:10 +00:00
privacy
…
redirects Add `noindex` meta tag and `rel=canonical` link to redirect interstitials (#30651) 2024-06-11 15:29:45 +00:00
relationships Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 2024-06-17 18:30:28 +02:00
remote_interaction_helper Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
settings Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 2024-08-08 19:30:16 +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 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
shares Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
statuses
…
statuses_cleanup Disable irrelevant fields unless cleanup is enabled (#26562) 2024-08-04 08:57:46 +00:00
tags
…
user_mailer Use partial collection render for welcome mailer features (#29843) 2024-04-04 16:13:10 +00:00
well_known/host_meta
…
.rubocop.yml
…