8 commits

Author	SHA1	Message	Date
Thibaut Girka	3d6c594903	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	2018-06-15 20:51:39 +02:00
Eugen Rochko	907694df6a	Add autofollow option to invites (#7805) ... * Add autofollow option to invites * Trigger CodeClimate rebuild	2018-06-15 18:00:23 +02:00
Thibaut Girka	28ccf0a464	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-23 16:05:19 +02:00
Eugen Rochko	32c3fc08fe	Yeah, it was supposed to be #create?	2018-05-22 20:05:24 +02:00
Thibaut Girka	d0b753db6b	Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	2018-05-11 18:12:42 +02:00
Shuhei Kitagawa	fd0f2b675e	Add tests for invites controller (#7441) ... * Add tests for invites controller * Small refactoring and fix for invites controller	2018-05-11 13:14:33 +02:00
David Yip	6a5ba9d129	Use settings pack for InvitesController (#229)	2017-12-06 17:20:04 -06:00
Eugen Rochko	bc8c951083	Add consumable invites (#5814) ... * Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly	2017-11-27 16:07:59 +01:00