mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/views
History
Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 		2024-12-25 18:01:37 +01:00
..
about Fix titles being escaped twice (#32889) 2024-11-14 13:28:00 +00:00
accounts Fix titles being escaped twice (#32889) 2024-11-14 13:28:00 +00:00
admin Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
admin_mailer Change hashtag trends to be stored in the database instead of redis (#32837) 2024-12-04 11:59:17 +00:00
application Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
auth Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
custom_css Spec coverage for custom css endpoint (#28706) 2024-01-12 09:19:25 +00:00
disputes/strikes Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
errors Use existing config access to `local_domain` value (#30509) 2024-06-03 09:15:58 +00:00
filters Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00: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 Add `copyable_input` helper method to wrap shared options (#32119) 2024-10-02 14:45:54 +00:00
kaminari Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
layouts Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream 2024-09-12 20:05:08 +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 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 2024-09-06 19:25:31 +02:00
notification_mailer Mailer header partial access cleanup (#32585) 2024-10-28 13:41:56 +00:00
oauth Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
privacy Fix titles being escaped twice (#32889) 2024-11-14 13:28:00 +00:00
redirects Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
relationships Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 2024-11-24 16:46:28 +01: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 '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
severed_relationships Wrap datetime in `time` element with attrs (#32177) 2024-10-01 12:45:58 +00:00
shared Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
shares Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
statuses Fix titles being escaped twice (#32889) 2024-11-14 13:28:00 +00:00
statuses_cleanup Disable irrelevant fields unless cleanup is enabled (#26562) 2024-08-04 08:57:46 +00:00
tags Add rel alternate rss/json links to tags show html page (#33179) 2024-12-05 11:34:49 +00:00
terms_of_service Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
user_mailer Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
well_known/host_meta Rubocop fix: `Perfomance/UnfreezeString` (#26217) 2023-07-28 23:11:05 +02:00