commit 2e034f1ddf290c58bfe40e51e5d7e323d8cfbd93
author Paladox <thomasmulhall410@yahoo.com> Fri Feb 09 17:56:13 2018 +0000
committer Paladox <thomasmulhall410@yahoo.com> Fri Feb 09 17:56:13 2018 +0000
tree 1f94b52dbaad647e145aa2eb44b4746044d810a0
parent 65ce510e7bdd7c29c5c00a42c79ec630feece921
parent 99f65912e94b535dbcba46fccad8d80cb2c867ff

Merge branch 'stable-2.15'

* stable-2.15:
  Allow configuring base url of gitiles
  Fix URI for new UI

Change-Id: I386ea03b2505288bed824efbfb1d7360cfc84f0e

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 97a3123..34ad36e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "d9abef15db0f934bfe9adcb40b0c475807fd12bf",
+    commit = "8c91ef43828699c7ed33976897991a427dcfe04b",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
 #Snapshot Plugin API
-#load(
-#   "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#   "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
 load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
+   "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+   "gerrit_api_maven_local",
 )
 
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+#    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+#    "gerrit_api",
+#)
+
 # Load release Plugin API
-gerrit_api()
+#gerrit_api()
 
 load("//:external_plugin_deps.bzl", "external_plugin_deps")
 

src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java
index 61641d3..20e3cce 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GerritGitilesAccess.java
@@ -24,10 +24,10 @@
 import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.server.config.AnonymousCowardName;
 import com.google.gerrit.server.permissions.PermissionBackendException;
-import com.google.gerrit.server.project.ListProjects;
 import com.google.gerrit.server.project.ProjectCache;
 import com.google.gerrit.server.project.ProjectJson;
 import com.google.gerrit.server.project.ProjectState;
+import com.google.gerrit.server.restapi.project.ListProjects;
 import com.google.gitiles.GitilesAccess;
 import com.google.gitiles.GitilesUrls;
 import com.google.gitiles.RepositoryDescription;