Merge pull request #1234 from scm-manager/bugfix/migration_wizard_content_type

Adds missing content type header to migration wizard
This commit is contained in:
eheimbuch
2020-07-03 10:03:11 +02:00
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

@@ -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 ([#1234](https://github.com/scm-manager/scm-manager/pull/1234))
## [2.1.1] - 2020-06-23
### Fixed

View File

@@ -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;
@@ -173,6 +171,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();