Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/controllers/_application_controller_form.js.coffee

@@ -1051,7 +1051,7 @@ class App.ControllerForm extends App.Controller
         $( item[0] ).on('focus', ->
           visible = $( item[0] ).is(":visible")
           if visible && !$( item[0] ).expanding('active')
-            $( item[0] ).expanding()
+            $( item[0] ).expanding().focus()
         )
       App.Delay.set( a, 80 )
 

app/controllers/search_controller.rb

@@ -34,7 +34,6 @@ class SearchController < ApplicationController
         limit: limit,
         current_user: current_user,
       )
-      user_result = []
       users.each do |user|
         item = {
           id: user.id,
@@ -50,7 +49,6 @@ class SearchController < ApplicationController
         current_user: current_user,
       )
 
-      organization_result = []
       organizations.each do |organization|
         item = {
           id: organization.id,

lib/import/otrs.rb

@@ -304,7 +304,7 @@ module Import::OTRS
 
     result = request_json({})
     if !result['Success']
-      'API key not valid!'
+      fail 'API key not valid!'
     end
 
     # set settings