monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers
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
..
activitypub Fix caching headers in ActivityPub endpoints (#11331) 2019-07-17 00:00:39 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
concerns Add ActivityPub secure mode (#11269) 2019-07-11 20:11:09 +02:00
oauth Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
settings Add option to disable real-time updates in web UI (#9984) 2019-07-16 16:11:50 +02:00
well_known Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
about_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
account_follow_controller.rb Restful refactor of accounts/ routes (#2133) 2017-04-19 13:52:37 +02:00
account_unfollow_controller.rb Restful refactor of accounts/ routes (#2133) 2017-04-19 13:52:37 +02:00
accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
authorize_interactions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
custom_css_controller.rb Fix custom CSS controller (#11336) 2019-07-17 17:14:25 +02:00
directories_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:02:54 +01:00
emojis_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
following_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
home_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
instance_actors_controller.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00
intents_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
invites_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
manifests_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
media_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
media_proxy_controller.rb Change domain blocks to automatically support subdomains (#11138) 2019-06-22 00:13:10 +02:00
public_timelines_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
relationships_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
remote_follow_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
remote_interaction_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
shares_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00