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

app/assets/javascripts/app/controllers/_application_controller.coffee

@@ -774,6 +774,8 @@ class App.ControllerModal extends App.Controller
 
     if @container
       @el.addClass('modal--local')
+    if @veryLarge
+      @el.addClass('modal--veryLarge')
     if @large
       @el.addClass('modal--large')
     if @small

app/assets/javascripts/app/controllers/agent_ticket_merge.coffee

@@ -3,7 +3,7 @@ class App.TicketMerge extends App.ControllerModal
   buttonCancel: true
   buttonSubmit: true
   head: 'Merge'
-  large: true
+  veryLarge: true
   shown: false
 
   constructor: ->

app/assets/stylesheets/zammad.scss

@@ -6208,6 +6208,9 @@ footer {
     margin: 35px auto;
   }
 }
+.modal--veryLarge .modal-dialog {
+  max-width: 990px;
+}
 .modal--large .modal-dialog {
   max-width: 740px;
 }
@@ -6286,7 +6289,7 @@ footer {
 
 .modal.modal--local {
   display: block;
-  @include bidi-style(padding-left, 40px, padding-right, 0);
+  padding: 0 40px;
 
   .modal-backdrop {
     background: hsla(210,17%,93%,.55);

lib/import/base.rb

@@ -3,6 +3,17 @@
 module Import
   class Base
 
+    # Checks if the backend is active.
+    #
+    # @example
+    #  Import::ExampleBackend.active?
+    #  #=> true
+    #
+    # return [Boolean]
+    def self.active?
+      true
+    end
+
     # Checks if the backend is able to get queued by the Scheduler.
     #
     # @example

spec/lib/import/base_spec.rb

@@ -4,6 +4,13 @@ require 'lib/import/import_job_backend_examples'
 RSpec.describe Import::Base do
   it_behaves_like 'ImportJob backend'
 
+  describe '#active?' do
+
+    it 'returns true by default' do
+      expect(described_class.active?).to be true
+    end
+  end
+
   describe '#queueable?' do
 
     it 'returns true by default' do