4 commits

Author	SHA1	Message	Date
Thibaut Girka	cde0ac1aa7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	2019-04-10 09:16:08 +02:00
ThibG	a604f766e0	Fix batch actions not working on pending accounts (#10508)	2019-04-08 18:35:41 +02:00
Thibaut Girka	85ab126f88	Fix pending accounts management	2019-04-08 16:40:11 +02:00
Eugen Rochko	c34a7f5bd2	Add batch actions for approving and rejecting pending accounts (#10469)	2019-04-06 17:53:45 +02:00