AkkomaGang/masto-fe
2
2
Fork 1
Code Issues 3 Pull requests Projects Releases Wiki Activity
masto-fe/app/models/concerns
History
Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
..
account_associations.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
account_avatar.rb Add WebP support (#9879) 2019-02-02 12:25:04 +01:00
account_counters.rb Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
account_finder_concern.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00
account_header.rb Add WebP support (#9879) 2019-02-02 12:25:04 +01:00
account_interactions.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
attachmentable.rb Fix support for MP4 files that are actually M4V files (#11210) 2019-06-30 16:10:43 +02:00
cacheable.rb Fix cache_associated no longer working (#7320) 2018-05-03 10:41:41 +02:00
domain_normalizable.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
expireable.rb Fix poll update handler calling method was that was not available (#10246) 2019-03-12 22:58:59 +01:00
ldap_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
omniauthable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
paginable.rb Fix timeline pagination (#8827) 2018-09-29 19:03:33 +02:00
pam_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
redisable.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
relationship_cacheable.rb Cache relationships in API (#6482) 2018-02-18 03:14:46 +01:00
remotable.rb Fix nil host in remotable (#8508) 2018-08-29 21:13:49 +02:00
status_threading_concern.rb Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
user_roles.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00