12 commits

Author	SHA1	Message	Date
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	2018-05-03 17:23:44 -05:00
Eugen Rochko	a5293fdf61	Fix n+1 queries in StatusThreadingConcern (#7321)	2018-05-03 10:41:58 +02:00
Eugen Rochko	f62539ce5c	Remove most behaviour disparities between blocks and mutes (#7231) ... * Remove most behaviour disparities between blocks and mutes The only differences between block and mute should be: - Mutes can optionally NOT affect notifications - Mutes should not be visible to the muted Fix #7230 Fix #5713 * Do not allow boosting someone you blocked Fix #7248 * Do not allow favouriting someone you blocked * Fix nil error in StatusPolicy	2018-05-02 15:50:20 +02:00
David Yip	16d5217502	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json	2018-04-18 18:48:12 -05:00
ThibG	e5dd385431	Allow boosting own private toots (#6157) ... * Adjust policy to allow boosting own private toots * Add ability to reblog private toots from dropdown menu	2018-04-17 23:35:45 +02:00
David Yip	f6355f6ffb	Update StatusPolicy to check current_account for local_only? toots. ... StatusPolicy#account was renamed to StatusPolicy#current_account in upstream. This commit renames the local-only changes to match and augments the #show? policy spec with what we expect for local-only toots.	2017-11-17 09:07:21 -06:00
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	2017-11-16 01:21:16 -06:00
Eugen Rochko	7bb8b0b2fc	Add moderator role and add pundit policies for admin actions (#5635) ... * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	2017-11-11 20:23:33 +01:00
beatrix	f0a2a6c875	try to tighten up local only toot stuff, like... properly (#163) ... * try to tighten up local only toot stuff, like... properly * try to un-break tests	2017-10-09 09:56:17 -04:00
Jack Jennings	33f669a5f8	Add status destroy authorization to policy (#3453) ... * Add status destroy authorization to policy * Create explicit unreblog status authorization	2017-05-30 22:56:31 +02:00
Jack Jennings	e031fd60ad	Move status reblog authorization into policy (#3425)	2017-05-30 15:16:14 +02:00
Jack Jennings	3a2003ba86	Extract authorization policy for viewing statuses (#3150)	2017-05-29 18:22:22 +02:00