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/controllers
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
..
activitypub Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 2024-11-03 20:51:58 +01:00
admin Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
api Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
auth Fix various visual sign-up flow issues (#33206) 2024-12-09 08:23:19 +00:00
concerns Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
disputes Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
filters Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
oauth Fix logic in "last used at per application" oauth token list (#32912) 2024-11-15 15:52:37 +00:00
redirect Move redirect/base body class to view (#31796) 2024-09-12 13:31:50 +00:00
settings Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 2024-11-24 16:46:28 +01:00
well_known Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +00:00
about_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
accounts_controller.rb Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 2024-05-16 19:30:10 +02:00
application_controller.rb Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
authorize_interactions_controller.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
backups_controller.rb Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
custom_css_controller.rb Add scope `providing_styles` to `UserRole` (#29286) 2024-02-20 09:18:05 +00:00
emojis_controller.rb Refactor `Cache-Control` and `Vary` definitions (#24347) 2023-04-19 16:07:29 +02:00
filters_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
follower_accounts_controller.rb Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 2023-10-08 17:26:43 +02:00
following_accounts_controller.rb Fix Vary headers not being set on some redirects (#27272) 2023-10-05 09:50:08 +02:00
health_controller.rb Disable `Rails/ApplicationController` for `HealthController` (#28705) 2024-01-12 09:08:17 +00:00
home_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
instance_actors_controller.rb Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560) 2024-03-15 10:40:21 +00:00
intents_controller.rb Remove redundant `return` in `IntentsController` (#29099) 2024-02-06 12:56:22 +00:00
invites_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
mail_subscriptions_controller.rb Fix contrast between background and form elements on some pages (#31266) 2024-08-02 13:55:31 +00:00
manifests_controller.rb Fix some user-independent endpoints potentially reading session cookies (#24650) 2023-04-25 22:14:44 +02:00
media_controller.rb Add coverage for `media#player`, move body class to view (#31790) 2024-09-06 16:46:25 +00:00
media_proxy_controller.rb Add `OpenSSL::SSL::SSLError` to http connection errors wrapper (#32307) 2024-10-08 14:59:51 +00:00
privacy_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
relationships_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
remote_interaction_helper_controller.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
severed_relationships_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
shares_controller.rb Move shares/modal body class to layout (#31789) 2024-09-06 16:46:55 +00:00
statuses_cleanup_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
statuses_controller.rb Remove unused `statuses#embed` body class assignment (#31787) 2024-09-12 13:38:15 +00:00
tags_controller.rb Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00:00
terms_of_service_controller.rb Add terms of service (#33055) 2024-12-09 10:04:46 +00:00