Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 07:55:47 +01:00
Code Issues Packages Projects Releases Activity

Merge with 2.0.0-m3

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-07 17:42:20 +01:00
parent c1b6f64ecf b5389023cf
commit a95815ed18
29 changed files with 690 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java
View File

@@ -92,7 +92,7 @@ public class DiffStreamingOutput implements StreamingOutput
public void write(OutputStream output) throws IOException {
try
{
builder.retriveContent(output);
builder.retrieveContent(output);
}
finally
{

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java
View File

@@ -63,7 +63,7 @@ public class DiffRootResource {
repositoryService.getDiffCommand()
.setRevision(revision)
.setFormat(diffFormat)
.retriveContent(output);
.retrieveContent(output);
};
return Response.ok(responseEntry)
.header(HEADER_CONTENT_DISPOSITION, HttpUtil.createContentDispositionAttachmentHeader(String.format("%s-%s.diff", name, revision)))