From a795129c70be92ecf122317a3b445df3911c8ec5 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Tue, 19 Nov 2019 08:48:46 +0100
Subject: [PATCH 1/3] Remove global style: last div two levels below
 .modal-card-body Apparently added for the CI plugin on 2019-07-24, but no
 longer necessary

---
 scm-ui/ui-styles/src/scm.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scm-ui/ui-styles/src/scm.scss b/scm-ui/ui-styles/src/scm.scss
index 97e3a70a9f..01d8d3e55a 100644
--- a/scm-ui/ui-styles/src/scm.scss
+++ b/scm-ui/ui-styles/src/scm.scss
@@ -809,10 +809,6 @@ form .field:not(.is-grouped) {
   }
 }
 
-.modal-card-body div div:last-child {
-  border-bottom: none;
-}
-
 // cursor
 .has-cursor-pointer {
   cursor: pointer;

From 1d2888f8e65ad5b2ac3f049cfb00a82252e42652 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Tue, 19 Nov 2019 10:13:58 +0100
Subject: [PATCH 2/3] Fix dequote error in "normal" lines

Without this, quotes in normal lines were removed.
---
 .../main/java/sonia/scm/repository/spi/GitDiffCommand.java    | 1 +
 .../spi/GitDiffCommand_DequoteOutputStreamTest.java           | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java
index d6203f2a1b..dce4d0622f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffCommand.java
@@ -110,6 +110,7 @@ public class GitDiffCommand extends AbstractGitCommand implements DiffCommand {
           return;
         }
         numberOfPotentialBeginning = -1;
+        inPotentialQuotedLine = false;
       }
 
       if (inPotentialQuotedLine && i == '"') {
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommand_DequoteOutputStreamTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommand_DequoteOutputStreamTest.java
index 8eaab4fc16..6067356a09 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommand_DequoteOutputStreamTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitDiffCommand_DequoteOutputStreamTest.java
@@ -16,7 +16,7 @@ public class GitDiffCommand_DequoteOutputStreamTest {
       "--- /dev/null\n" +
       "+++ \"b/\\303\\272\\303\\274\\303\\276\\303\\253\\303\\251\\303\\245\\303\\253\\303\\245\\303\\251 \\303\\245g\\303\\260f\\303\\237\"\n" +
       "@@ -0,0 +1 @@\n" +
-      "+rthms";
+      "+String s = \"quotes shall be kept\";";
 
     ByteArrayOutputStream buffer = new ByteArrayOutputStream();
     GitDiffCommand.DequoteOutputStream stream = new GitDiffCommand.DequoteOutputStream(buffer);
@@ -30,6 +30,6 @@ public class GitDiffCommand_DequoteOutputStreamTest {
       "--- /dev/null\n" +
       "+++ b/úüþëéåëåé ågðfß\n" +
       "@@ -0,0 +1 @@\n" +
-      "+rthms");
+      "+String s = \"quotes shall be kept\";");
   }
 }

From 303458c44e5d1e7737f08d609f5d83840895b59c Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Tue, 19 Nov 2019 15:06:12 +0000
Subject: [PATCH 3/3] Close branch bugfix/outdated_context_bottom_border