This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/settings
Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
..
aliases Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
applications Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
deletes Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
exports Change user backups to use expiring URLs for download when possible (#24136) 2023-03-16 22:46:52 +01:00
featured_tags Fix styling of featured tags in light theme (#23252) 2023-01-25 16:28:29 +01:00
flavours Fix settings/flavours 2019-03-16 16:21:20 +01:00
imports Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
login_activities Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
migration/redirects Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
migrations Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
preferences Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
profiles Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
shared 2FA controller cleanup (#2296) 2017-04-22 04:23:17 +02:00
two_factor_authentication Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
two_factor_authentication_methods Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00