..
activitypub
Do not try fetching keys of unknown accounts on a Delete from them ( #10326 )
2019-03-20 17:20:16 +01:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-26 16:01:59 +01:00
api
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 13:54:00 +01:00
auth
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-14 17:17:20 +01:00
concerns
Mark the 410 gone response for suspended accounts as cachable ( #10339 )
2019-03-21 23:33:18 +01:00
oauth
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-10 21:10:09 +01:00
settings
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 13:54:00 +01:00
well_known
Add Keybase integration ( #10297 )
2019-03-18 21:00:55 +01:00
about_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-13 15:16:02 +01:00
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
application_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01: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
Add admin custom CSS setting ( #8399 )
2018-08-24 04:33:27 +02:00
directories_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-20 16:49:23 +01:00
emojis_controller.rb
Unuse ActiveRecord::Base#cache_key ( #8185 )
2018-08-19 15:52:38 +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-03-18 18:03:27 +01:00
following_accounts_controller.rb
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-05-18 08:47:10 -05:00
home_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-11 15:45:42 +02:00
intents_controller.rb
Add remote interaction dialog for toots ( #8202 )
2018-08-18 03:03:12 +02:00
invites_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-26 20:41:43 +02:00
manifests_controller.rb
media_controller.rb
fix CSP / X-Frame-Options for media embeds ( #9558 )
2018-12-18 16:40:30 +01:00
media_proxy_controller.rb
Raise Mastodon::RaceConditionError if Redis lock failed ( #7511 )
2018-05-16 12:29:45 +02:00
public_timelines_controller.rb
[Glitch] Redesign landing page
2019-03-13 15:53:00 +01:00
relationships_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
remote_follow_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-18 18:04:49 +02:00
remote_interaction_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-10 21:00:30 +01:00
remote_unfollows_controller.rb
Add tests for remote_unfollows_controller ( #7879 )
2018-06-24 19:55:55 +09:00
shares_controller.rb
Merge branch 'master' into glitch-soc/merge
2018-05-11 18:12:42 +02:00
statuses_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
stream_entries_controller.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
tags_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-13 15:16:02 +01:00
fcce135d27