Merge branch 'stable-2.15'
* stable-2.15:
HookArgs: Add @CanonicalWebUrl annotation to urlProvider
Change-Id: I2376174465191f4bf88f5ced844fee7b4323b9cb
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/HookArgs.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/HookArgs.java
index 12e42ec..91d3696 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/HookArgs.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/HookArgs.java
@@ -18,11 +18,13 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
+import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.ApprovalInfo;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
@@ -47,7 +49,7 @@
@Inject
HookArgs(
IdentifiedUser.GenericFactory identifiedUserFactory,
- Provider<String> urlProvider,
+ @CanonicalWebUrl @Nullable Provider<String> urlProvider,
HookMetrics metrics,
GitRepositoryManager gitManager,
SitePaths sitePaths) {