Merge branch 'stable-2.16'
* stable-2.16:
Make WebSessionManager.Val#getAccountId public
Bug fixes for gr-group-members
Fix the position of the gray vertical line for line length limit
Update rules_closure to latest version
dev-plugins: Recommend cloning examples project instead of cookbook-plugin
Change-Id: Ib31fd28ab57375174be278ffd5c214f250e2fe58
diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index 1e54cbf..a3166b7 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -34,10 +34,10 @@
== Getting started
To get started with the development of a plugin clone the sample
-plugin:
+plugins:
----
-$ git clone https://gerrit.googlesource.com/plugins/cookbook-plugin
+$ git clone https://gerrit.googlesource.com/plugins/examples
----
This is a project that demonstrates the various features of the
diff --git a/WORKSPACE b/WORKSPACE
index 38122f7..0aa31f6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -14,9 +14,9 @@
http_archive(
name = "io_bazel_rules_closure",
- sha256 = "0e6de40666f2ebb2b30dc0339745a274d9999334a249b05a3b1f46462e489adf",
- strip_prefix = "rules_closure-87d24b1df8b62405de8dd059cb604fd9d4b1e395",
- urls = ["https://github.com/bazelbuild/rules_closure/archive/87d24b1df8b62405de8dd059cb604fd9d4b1e395.tar.gz"],
+ sha256 = "ddce3b3a3909f99b28b25071c40b7fec7e2e1d1d1a4b2e933f3082aa99517105",
+ strip_prefix = "rules_closure-316e6133888bfc39fb860a4f1a31cfcbae485aef",
+ urls = ["https://github.com/bazelbuild/rules_closure/archive/316e6133888bfc39fb860a4f1a31cfcbae485aef.tar.gz"],
)
# File is specific to Polymer and copied from the Closure Github -- should be
diff --git a/java/com/google/gerrit/httpd/WebSessionManager.java b/java/com/google/gerrit/httpd/WebSessionManager.java
index cb1e965..d09b4dd 100644
--- a/java/com/google/gerrit/httpd/WebSessionManager.java
+++ b/java/com/google/gerrit/httpd/WebSessionManager.java
@@ -215,7 +215,15 @@
return expiresAt;
}
- Account.Id getAccountId() {
+ /**
+ * Parse an Account.Id.
+ *
+ * <p>This is public so that plugins that implement a web session, can also implement a way to
+ * clear per user sessions.
+ *
+ * @return account ID.
+ */
+ public Account.Id getAccountId() {
return accountId;
}
