From ef1236b3abf72ee0353e2040315efe307daae6c8 Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@znuny.com>
Date: Sat, 17 Feb 2018 12:28:38 +0100
Subject: [PATCH 1/3] Added .active? to Import backends default API for e.g.
 monitoring checks.

---
 lib/import/base.rb           | 11 +++++++++++
 spec/lib/import/base_spec.rb |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/lib/import/base.rb b/lib/import/base.rb
index 331772f1c..a42839c7c 100644
--- a/lib/import/base.rb
+++ b/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
diff --git a/spec/lib/import/base_spec.rb b/spec/lib/import/base_spec.rb
index 148c6c5f6..ea8be7c24 100644
--- a/spec/lib/import/base_spec.rb
+++ b/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

From 73160c25d17d3ac9fb37e3dfa7ac5836f8802eb5 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Sat, 17 Feb 2018 23:11:31 +0100
Subject: [PATCH 2/3] Modal: add support for size veryLarge (990px)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Largest so far was ‘large’ with a max-width of 740px.
---
 .../app/controllers/_application_controller.coffee           | 2 ++
 app/assets/stylesheets/zammad.scss                           | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee
index ff9a2f972..b1c2ab1d3 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.coffee
+++ b/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
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 734d13531..f06160715 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/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);

From 30b995a58cb48efe3a10c1e6e1d017219b9a8a60 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Sat, 17 Feb 2018 23:11:59 +0100
Subject: [PATCH 3/3] TicketMerge: use veryLarge modal size

might fix #1266
---
 .../javascripts/app/controllers/agent_ticket_merge.coffee       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee b/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee
index d71087198..f894767b9 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_merge.coffee
+++ b/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: ->