Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

app/models/user.rb

@@ -903,6 +903,8 @@ raise 'Minimum one user need to have admin permissions'
 =end
 
   def last_admin_check(role)
+    return if Setting.get('import_mode')
+
     ticket_admin_role_ids = Role.joins(:permissions).where(permissions: { name: ['admin', 'admin.user'] }).pluck(:id)
     count                 = User.joins(:roles).where(roles: { id: ticket_admin_role_ids }, users: { active: true }).count
     if ticket_admin_role_ids.include?(role.id)

config/initializers/doorkeeper.rb

@@ -43,7 +43,7 @@ Doorkeeper.configure do
   # reuse_access_token
 
   # Issue access tokens with refresh token (disabled by default)
-  # use_refresh_token
+  use_refresh_token
 
   # Provide support for an owner to be assigned to each registered application (disabled by default)
   # Optional parameter confirmation: true (default false) if you want to enforce ownership of