mastodon/app/controllers
Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00
..
activitypub Ensure request.body isn't emptied out before signature verification (#10432) 2019-03-31 17:27:24 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:02:54 +01:00
api Merge branch 'master' into glitch-soc/merge-upstream 2019-04-01 21:28:31 +02: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-28 18:35:25 +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
custom_css_controller.rb
directories_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:02:54 +01:00
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
following_accounts_controller.rb
home_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb Make Chrome splash screen same color as web UI's background color (#5169) 2017-10-02 01:23:32 +02:00
media_controller.rb
media_proxy_controller.rb
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-28 13:01:33 +01:00
remote_follow_controller.rb
remote_interaction_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
remote_unfollows_controller.rb
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