metu.life

History

Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		4 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
accounts	…
admin	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
admin_mailer	…
application	…
auth	Add e-mail-based sign in challenge for users with disabled 2FA (#14013 )	4 years ago
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	Pagination improvements (#1445 )	8 years ago
layouts	…
media	…
notification_mailer	…
oauth	…
public_timelines	…
relationships	…
remote_follow	…
remote_interaction	…
settings	…
shared	…
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tags	…
user_mailer	Add e-mail-based sign in challenge for users with disabled 2FA (#14013 )	4 years ago
well_known/host_meta	…