Merge "Do not create refs for imports and cache-automerge refs" into stable-2.11
diff --git a/BUCK b/BUCK
index 8f9d440..d118181 100644
--- a/BUCK
+++ b/BUCK
@@ -4,12 +4,8 @@
if STANDALONE_MODE:
HTTP_LIB = '//lib/http:http_lib'
- GSON = '//lib/gson:gson'
- LOG4J = '//lib/log:log4j'
else:
HTTP_LIB = '//plugins/importer/lib/http:http_lib'
- GSON = '//plugins/importer/lib/gson:gson'
- LOG4J = '//plugins/importer/lib/log:log4j'
gerrit_plugin(
name = 'importer',
@@ -28,8 +24,8 @@
HTTP_LIB,
],
provided_deps = [
- LOG4J,
- GSON,
+ '//lib:gson',
+ '//lib/log:log4j',
],
)
diff --git a/lib/gson/BUCK b/lib/BUCK
similarity index 100%
rename from lib/gson/BUCK
rename to lib/BUCK
diff --git a/src/main/resources/Documentation/about.md b/src/main/resources/Documentation/about.md
index e320dfe..e69aed0 100644
--- a/src/main/resources/Documentation/about.md
+++ b/src/main/resources/Documentation/about.md
@@ -41,6 +41,8 @@
On project import the configured max object size on the target Gerrit
server is ignored.
+Draft changes, draft patch sets and change edits are *not* imported.
+
<a id="project-import-process">
#### Process
@@ -87,7 +89,10 @@
For auth type 'LDAP', 'HTTP\_LDAP' or 'CLIENT\_SSL\_CERT\_LDAP' missing
user accounts are automatically created. The public SSH keys of a user
are automatically retrieved from the source Gerrit server and added to
-the new account in the target Gerrit server.
+the new account in the target Gerrit server. For this the remote user
+must have the link:access-control.html#capability_modifyAccount[Modify
+Account] or the link:access-control.html#capability_administrateServer[
+Administrate Server] capability assigned on the source system.
Gerrit internal users (e.g. service users) are never automatically
created but must be created in the target Gerrit server before the
