Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

api4/api.go

@@ -114,7 +114,7 @@ type API struct {
 	BaseRoutes *Routes
 }
 
-func Init(a *app.App, root *mux.Router, full bool) *API {
+func Init(a *app.App, root *mux.Router) *API {
 	api := &API{
 		App:        a,
 		BaseRoutes: &Routes{},
@@ -234,10 +234,7 @@ func Init(a *app.App, root *mux.Router, full bool) *API {
 
 	root.Handle("/api/v4/{anything:.*}", http.HandlerFunc(api.Handle404))
 
-	// REMOVE CONDITION WHEN APIv3 REMOVED
-	if full {
-		a.InitEmailBatching()
-	}
+	a.InitEmailBatching()
 
 	return api
 }