From b8d2ecfb49df1c057368a0c6ec6e513456f6ea34 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 3 Jul 2020 09:08:49 +0200 Subject: [PATCH 1/3] fixes missing content type on migration wizard --- CHANGELOG.md | 1 + .../src/main/java/sonia/scm/update/MigrationWizardServlet.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 507c488740..a6cec18a7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added missing architecture to debian installation documentation ([#1230](https://github.com/scm-manager/scm-manager/pull/1230)) - Mercurial on Python 3 ([#1232](https://github.com/scm-manager/scm-manager/pull/1232)) - Fixed wrong package information for deb and rpm packages ([#1229](https://github.com/scm-manager/scm-manager/pull/1229)) +- Fixed missing content type on migration wizard ## [2.1.1] - 2020-06-23 ### Fixed diff --git a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java index 99833c57cc..f999d34c2c 100644 --- a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java @@ -173,6 +173,9 @@ class MigrationWizardServlet extends HttpServlet { MustacheFactory mf = new DefaultMustacheFactory(); Mustache template = mf.compile(templateName); + resp.setContentType("text/html"); + resp.setCharacterEncoding("UTF-8"); + PrintWriter writer; try { writer = resp.getWriter(); From aaba45c8d4c3bf8ee0e9a490cfcce2ed55ca87a1 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 3 Jul 2020 09:09:39 +0200 Subject: [PATCH 2/3] removes unused imports --- .../src/main/java/sonia/scm/update/MigrationWizardServlet.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java index f999d34c2c..0504a62c59 100644 --- a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java @@ -34,8 +34,6 @@ import org.apache.shiro.subject.Subject; import org.apache.shiro.util.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sonia.scm.event.ScmEventBus; -import sonia.scm.lifecycle.RestartEvent; import sonia.scm.lifecycle.Restarter; import sonia.scm.update.repository.DefaultMigrationStrategyDAO; import sonia.scm.update.repository.MigrationStrategy; From 59a68982a5ea231b8c380a805ebfdb0f72b96d1b Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 3 Jul 2020 09:12:51 +0200 Subject: [PATCH 3/3] adds pr link to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6cec18a7a..0f1ff1f982 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added missing architecture to debian installation documentation ([#1230](https://github.com/scm-manager/scm-manager/pull/1230)) - Mercurial on Python 3 ([#1232](https://github.com/scm-manager/scm-manager/pull/1232)) - Fixed wrong package information for deb and rpm packages ([#1229](https://github.com/scm-manager/scm-manager/pull/1229)) -- Fixed missing content type on migration wizard +- Fixed missing content type on migration wizard ([#1234](https://github.com/scm-manager/scm-manager/pull/1234)) ## [2.1.1] - 2020-06-23 ### Fixed