Merge changes Ia8073e37,I7ebf1004,I8b1d118d,I4ead9bf5
* changes:
Upgrade protobuf-java to 3.5.1
Upgrade gson to 2.8.4
Upgrade truth to 0.40
Upgrade guava to 25.0-jre
diff --git a/resources/com/google/gitiles/templates/Common.soy b/resources/com/google/gitiles/templates/Common.soy
index 392f816..6d2e8ed 100644
--- a/resources/com/google/gitiles/templates/Common.soy
+++ b/resources/com/google/gitiles/templates/Common.soy
@@ -110,24 +110,24 @@
*
* Please call this in custom variants as well.
*/
-{template .footerPoweredBy}
+{deltemplate gitiles.footerPoweredBy}
<span class="Footer-poweredBy">
Powered by <a href="https://gerrit.googlesource.com/gitiles/">Gitiles</a>
</span>
-{/template}
+{/deltemplate}
/**
* Footer format badge
*
* You can use this in custom footers as well.
*/
-{template .footerFormatBadge}
+{deltemplate gitiles.footerFormatBadge}
<span class="Footer-formats">
<a class="u-monospace Footer-formatsItem" href="?format=TEXT">{msg desc="text format"}txt{/msg}</a>
{sp}
<a class="u-monospace Footer-formatsItem" href="?format=JSON">{msg desc="JSON format"}json{/msg}</a>
</span>
-{/template}
+{/deltemplate}
/**
* Default Footer
@@ -136,8 +136,8 @@
<!-- default customFooter -->
<footer class="Site-footer">
<div class="Footer">
- {call gitiles.footerPoweredBy /}
- {call gitiles.footerFormatBadge /}
+ {delcall gitiles.footerPoweredBy /}
+ {delcall gitiles.footerFormatBadge /}
</div>
</footer>
{/deltemplate}
diff --git a/resources/com/google/gitiles/templates/Doc.soy b/resources/com/google/gitiles/templates/Doc.soy
index c938490..d1c0f79 100644
--- a/resources/com/google/gitiles/templates/Doc.soy
+++ b/resources/com/google/gitiles/templates/Doc.soy
@@ -66,7 +66,7 @@
</div>
<footer class="Site-footer">
<div class="Footer">
- {call gitiles.footerPoweredBy /}
+ {delcall gitiles.footerPoweredBy /}
<div class="Footer-links">
{if $sourceUrl}<a class="Footer-link" href="{$sourceUrl}">{msg desc="text for the source link"}source{/msg}</a>{/if}
{if $logUrl}<a class="Footer-link" href="{$logUrl}">{msg desc="text for the log link"}log{/msg}</a>{/if}