Merge branch 'stable-3.3' into stable-3.4 * stable-3.3: fix: cannot build 'gerrit-3.2' on MacOS Load fonts directly from Gerrit instead of 3rd party domains Change-Id: I9d299ee3176544418662d959072ea47143be60b9
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java index b4a206c..6b48974 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java +++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java
@@ -76,13 +76,15 @@ } @Override - public WebLinkInfo getPatchSetWebLink(String projectName, String commit) { + public WebLinkInfo getPatchSetWebLink( + String projectName, String commit, String commitMessage, String branchName) { return new WebLinkInfo( name, null, String.format("%s/%s/+/%s", baseUrl, projectName, commit), target); } @Override - public WebLinkInfo getParentWebLink(String projectName, String commit) { + public WebLinkInfo getParentWebLink( + String projectName, String commit, String commitMessage, String branchName) { return new WebLinkInfo( name, null, String.format("%s/%s/+/%s", baseUrl, projectName, commit), target); }