luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-23 07:14:10 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers
History
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
activitypub
admin Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
auth
concerns
oauth Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
well_known Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) 2017-12-27 18:21:12 +01:00
about_controller.rb
account_follow_controller.rb Restful refactor of accounts/ routes (#2133) 2017-04-19 13:52:37 +02:00
account_unfollow_controller.rb
accounts_controller.rb
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
authorize_interactions_controller.rb
custom_css_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-18 08:47:10 -05:00
home_controller.rb
intents_controller.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
invites_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb Raise Mastodon::RaceConditionError if Redis lock failed (#7511) 2018-05-16 12:29:45 +02: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
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 2018-08-31 19:10:57 +02:00
stream_entries_controller.rb
tags_controller.rb