Edwin Kempin 3c4113abdf Mark cherry-pick change as WIP if cherry-pick resulted in conflicts ...

Marking the target change as work-in-progress makes it more obvious to
users that conflicts need to be resolved before the change can be
submitted.

Change-Id: I585f75050d49151db6a685b6dc75119b44826c9d
Signed-off-by: Edwin Kempin <ekempin@google.com>

2018-10-16 09:37:55 +02:00

..

images

Rewrite Inline Edit to describe new UI.

2018-08-28 14:39:15 -07:00

.gitignore

Ignore /Documentation/*.html

2015-05-06 11:25:51 -07:00

access-control.txt

Update bulleted list with continuation markers so code blocks

2018-09-21 10:04:20 -07:00

BUILD

Move AsciiDoctor Java files to a java package

2018-05-24 15:33:19 -04:00

cmd-apropos.txt

Documentation: Also consider the use of kerberos authentication over SSH

2017-08-28 01:44:52 +02:00

cmd-ban-commit.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-cherry-pick.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-close-connection.txt

Add a period to the end of description sentence

2018-09-24 09:33:48 -07:00

cmd-create-account.txt

Remove spaces in front of example

2018-09-24 09:38:45 -07:00

cmd-create-branch.txt

Clean up syntax of cmd-create-branch.txt

2018-09-24 18:36:21 +00:00

cmd-create-group.txt

Clean up syntax of cmd-create-group.txt

2018-09-24 23:07:27 +00:00

cmd-create-project.txt

Clean up syntax of create-project.txt

2018-09-24 23:07:37 +00:00

cmd-flush-caches.txt

Clean up syntax of cmd-flush-caches.txt

2018-09-24 23:07:45 +00:00

cmd-gc.txt

Clean up syntax of cmd-gc.txt

2018-09-24 23:07:53 +00:00

cmd-gsql.txt

Clean up syntax of cmd-gsql.txt

2018-09-24 23:08:04 +00:00

cmd-hook-commit-msg.txt

Clean up syntax of cmd-hook-commit-msg.txt

2018-09-24 23:08:14 +00:00

cmd-index-activate.txt

Clean up syntax of cmd-index-activate.txt

2018-09-24 21:28:19 -07:00

cmd-index-changes-in-project.txt

Clean up syntax of cmd-index-changes-in-project.txt

2018-09-24 21:30:48 -07:00

cmd-index-changes.txt

Clean up syntax for cmd-index-changes.txt

2018-09-24 21:33:42 -07:00

cmd-index-start.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-index.txt

Remove extra spaces to improve rendered content

2018-09-21 15:25:45 -07:00

cmd-kill.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-logging-ls-level.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-logging-set-level.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-ls-groups.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-ls-members.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-ls-projects.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-ls-user-refs.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-plugin-enable.txt

Clear up syntax for command reference files

2018-09-26 12:31:46 -07:00

cmd-plugin-install.txt

Fix various typos, spelling mistakes, and inconsistencies

2016-09-06 16:27:49 +09:00

cmd-plugin-ls.txt

Fix broken synopsis formatting in documentation

2016-07-06 10:54:42 +02:00

cmd-plugin-reload.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-plugin-remove.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-query.txt

Documentation: Also consider the use of kerberos authentication over SSH

2017-08-28 01:44:52 +02:00

cmd-receive-pack.txt

Documentation: Also consider the use of kerberos authentication over SSH

2017-08-28 01:44:52 +02:00

cmd-reload-config.txt

Document that some properties in gerrit.config supports reload

2018-04-20 15:16:21 +00:00

cmd-rename-group.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-review.txt

Merge branch 'stable-2.15'

2018-09-28 20:15:01 +09:00

cmd-set-account.txt

Relax access to ssh set-account command

2018-07-02 11:25:53 +01:00

cmd-set-head.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-set-members.txt

Documentation: Also consider the use of kerberos authentication over SSH

2017-08-28 01:44:52 +02:00

cmd-set-project-parent.txt

SSH: set-project-parent is no longer admin exclusive

2018-08-22 07:02:19 +00:00

cmd-set-project.txt

Documentation: add REBASE_ALWAYS as submit type option where omitted

2017-08-27 23:37:33 +00:00

cmd-set-reviewers.txt

Fix changes not found

2017-10-18 21:55:15 -04:00

cmd-show-caches.txt

Improve naming of group caches

2018-02-21 08:10:43 +01:00

cmd-show-connections.txt

ShowConnections: Only show start and idle columns for mina backend

2016-08-04 05:55:37 +00:00

cmd-show-queue.txt

doc update: how to get online index status info

2016-08-15 13:57:37 -07:00

cmd-stream-events.txt

Merge branch 'stable-2.14' into stable-2.15

2018-09-16 09:29:19 +09:00

cmd-suexec.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-test-submit-rule.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-test-submit-type.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

cmd-version.txt

Documentation: Also consider the use of kerberos authentication over SSH

2017-08-28 01:44:52 +02:00

concept-changes.txt

Merge branch 'stable-2.15'

2018-09-27 16:45:10 +09:00

concept-patch-sets.txt

Add new concept topic, Patch Sets, to documentation

2017-08-09 19:07:02 -07:00

concept-refs-for-namespace.txt

Add new concept topic on refs/for namespace

2017-08-09 19:02:17 -07:00

config-accounts.txt

Add warning about changing external IDs manually

2018-09-20 09:48:03 +02:00

config-auto-site-initialization.txt

Update Documentation of Auto Site Initialization

2017-03-01 08:18:24 +09:00

config-cla.txt

config-cla: Improve documentation of adding groups config

2016-08-22 17:46:31 +09:00

config-gerrit.txt

Remove parallelizing code from ChangeJson

2018-10-11 10:04:00 +02:00

config-gitweb.txt

Document that gitweb.type must be set

2018-03-16 09:47:32 +09:00

config-groups.txt

Documentation: describe NoteDb group storage

2017-12-05 15:57:58 +01:00

config-hooks.txt

Update plugin links in documentation

2018-09-28 16:07:43 +09:00

config-labels.txt

Add config and rule to ignore self approval on labels

2018-09-07 15:14:37 +02:00

config-login-register.txt

Use "gerrit" as the Gerrit user instead of "gerrit2"

2017-07-04 21:20:47 +09:00

config-mail.txt

Merge branch 'stable-2.15'

2018-05-02 11:21:18 +09:00

config-plugins.txt

Update list of plugins in config-plugins.txt

2018-09-28 16:11:14 +09:00

config-project-config.txt

Merge branch 'stable-2.15'

2018-09-16 18:13:48 -07:00

config-reverseproxy.txt

Update reverse proxy configuration example for nginx

2015-07-06 01:50:38 +00:00

config-robot-comments.txt

Add support for Robot Comments

2016-09-28 15:34:54 +02:00

config-sso.txt

Merge branch 'stable-2.14' into stable-2.15

2018-02-02 13:39:59 +09:00

config-themes.txt

Fix formatting of example blocks

2016-07-07 14:06:31 +02:00

config-validation.txt

Add validation listener for account activation

2018-04-25 09:50:07 +02:00

database-setup.txt

Documentation: Remove 'install-quick' page in favour of 'linux-quickstart'

2018-08-16 11:51:51 +02:00

dev-bazel.txt

Bazel: Add support for Java 10

2018-09-25 07:31:33 +00:00

dev-build-plugins.txt

Expand docs on how to include external dependencies in core plugins

2018-02-27 17:06:26 +09:00

dev-contributing.txt

Document how features in Gerrit can be deprecated

2018-09-05 13:00:38 +02:00

dev-design.txt

Replace links to code.google.com/p/gerrit

2018-02-02 10:13:45 +09:00

dev-eclipse.txt

Set up Eclipse to work with Java 9 and later

2018-08-31 11:18:40 +00:00

dev-inspector.txt

Merge "Some more broken synopsis formattings in documentation"

2016-07-08 14:07:44 +00:00

dev-intellij.txt

Documentation: clarify latest IntelliJ version use

2018-05-28 23:03:19 +00:00

dev-plugins.txt

ChangeQueryProcessor: Add DynamicBean getter and setter

2018-10-11 09:30:22 -06:00

dev-polygerrit.txt

Update dev-polygerrit.txt

2018-08-23 10:32:38 +00:00

dev-readme.txt

Update documentation to use --recurse-submodules instead of --recursive

2018-10-12 14:08:45 +09:00

dev-release-deploy-config.txt

dev-release: Add step to sign the announcement mail

2017-06-30 13:38:33 +09:00

dev-release-jgit.txt

Provide a diff file to make it easier to deploy JGit snapshot

2016-08-31 11:13:47 +09:00

dev-release-subproject.txt

Remove outstanding references to buck

2018-02-07 09:16:41 -05:00

dev-release.txt

Update plugin links in documentation

2018-09-28 16:07:43 +09:00

dev-rest-api.txt

gerrit-server: use hashed passwords for HTTP.

2017-02-28 09:09:33 +01:00

dev-stars.txt

Replace Mute/Unmute by Mark as Reviewed/Unreviewed (Part 3)

2017-10-01 12:38:18 +00:00

error-branch-not-found.txt

Doc: Consistently refer to "Web UI" rather than "WebUI"

2014-05-02 17:21:22 +09:00

error-change-closed.txt

Doc: Consistently refer to "Web UI" rather than "WebUI"

2014-05-02 17:21:22 +09:00

error-change-does-not-belong-to-project.txt

Consistently refer to Change-Id in documentation

2014-09-04 13:12:24 +09:00

error-change-not-found.txt

Consistently refer to Change-Id in documentation

2014-09-04 13:12:24 +09:00

error-change-upload-blocked.txt

…

error-commit-already-exists.txt

Merge branch 'stable-2.8'

2014-03-11 18:24:13 +09:00

error-contains-banned-commit.txt

…

error-has-duplicates.txt

Fix some legacy-style titles in documentation

2016-07-08 13:45:28 +02:00

error-invalid-author.txt

…

error-invalid-changeid-line.txt

Doc: Consistently refer to "Web UI" rather than "WebUI"

2014-05-02 17:21:22 +09:00

error-invalid-committer.txt

Fix reference to Forge Committer access right in documentation

2014-07-08 07:24:01 +00:00

error-messages.txt

Deprecate pushing to refs/changes

2018-01-26 09:06:16 +01:00

error-missing-changeid.txt

ReceiveCommits: uniformize commit validation error messages.

2018-08-29 12:48:24 +09:00

error-missing-subject.txt

ReceiveCommits: uniformize commit validation error messages.

2018-08-29 12:48:24 +09:00

error-multiple-changeid-lines.txt

ReceiveCommits: uniformize commit validation error messages.

2018-08-29 12:48:24 +09:00

error-no-common-ancestry.txt

…

error-no-new-changes.txt

Clarify documentation of "no new changes" error message

2018-01-26 08:49:52 +09:00

error-non-fast-forward.txt

…

error-not-a-gerrit-administrator.txt

…

error-not-allowed-to-upload-merges.txt

…

error-not-permitted-to-create.txt

…

error-not-signed-off-by.txt

…

error-not-valid-ref.txt

…

error-permission-denied.txt

Documentation: Also consider the use of kerberos authentication over SSH

2017-08-28 01:44:52 +02:00

error-prohibited-by-gerrit.txt

Rename 'Push Annotated/Signed Tag' permission to 'Create Annotated/Signed Tag'

2016-09-08 13:50:04 +09:00

error-project-not-found.txt

Doc: Consistently refer to "Web UI" rather than "WebUI"

2014-05-02 17:21:22 +09:00

error-push-fails-due-to-commit-message.txt

…

error-push-refschanges-not-allowed.txt

Deprecate pushing to refs/changes

2018-01-26 09:06:16 +01:00

error-same-change-id-in-multiple-changes.txt

Provide more informative error message for Change-Id conflicts

2016-04-12 14:18:12 +00:00

error-too-many-commits.txt

Add limit to number of commits that ReceiveCommits will validate

2017-08-31 12:19:58 -04:00

error-upload-denied.txt

Fix some legacy-style titles in documentation

2016-07-08 13:45:28 +02:00

i18n-readme.txt

…

index.txt

Add documentation for request tracing

2018-08-24 18:01:03 +02:00

install-j2ee.txt

Fix broken formatting in Tomcat reverse proxy config documentation

2014-10-21 11:04:42 +09:00

install.txt

Merge branch 'stable-2.15'

2018-08-22 21:59:06 +09:00

intro-gerrit-walkthrough.txt

Merge branch 'stable-2.15'

2018-06-13 16:20:48 +09:00

intro-how-gerrit-works.txt

Fix the display of images in intro-how-gerrit-works.txt

2018-09-18 11:12:35 -07:00

intro-project-owner.txt

Update plugin links in documentation

2018-09-28 16:07:43 +09:00

intro-quick.txt

Edits to intro-quick.txt and intro-how-gerrit-works.txt

2018-07-20 16:08:55 -07:00

intro-rockstar.txt

Add intro to documentation to describe the rationale of Gerrit code review.

2018-08-03 12:01:36 -07:00

intro-user.txt

Merge branch 'stable-2.15'

2018-07-17 13:08:37 +09:00

js-api.txt

Create gr-confirm-submit-dialog component

2018-06-20 12:05:01 -07:00

json.txt

Add hashtags to events and query results

2018-07-17 07:08:16 +02:00

linux-quickstart.txt

linux-quickstart: Remove leftover conflict marker

2018-08-23 12:30:31 +09:00

metrics.txt

ReceiveCommits: expose change IDs touched; add metrics

2018-10-10 12:48:55 +02:00

note-db.txt

Merge branch 'stable-2.15' into master

2018-02-07 15:04:41 -05:00

pg-plugin-admin-api.txt

Add API for defining new admin menu links from plugins

2018-03-30 16:38:17 -07:00

pg-plugin-change-metadata-api.txt

Plugin API for label score updates

2018-04-06 15:24:56 -07:00

pg-plugin-dev.txt

Add restApi.getVersion() method to plugin REST API

2018-04-24 10:31:40 -07:00

pg-plugin-endpoints.txt

Create gr-confirm-submit-dialog component

2018-06-20 12:05:01 -07:00

pg-plugin-migration.txt

Merge branch 'stable-2.15'

2018-01-25 01:57:07 +00:00

pg-plugin-repo-api.txt

Rename projects admin interface to repo

2017-12-27 21:40:31 +00:00

pg-plugin-rest-api.txt

Add restApi.getVersion() method to plugin REST API

2018-04-24 10:31:40 -07:00

pg-plugin-settings-api.txt

Support for .settingsScreen() plugin API

2018-01-04 15:59:48 -08:00

pg-plugin-styling.txt

Update PolyGerrit plugin documentation

2018-01-10 23:41:09 +00:00

pgm-daemon.txt

Remove AccountByEmailCache

2017-08-08 14:24:34 +02:00

pgm-gsql.txt

Some more broken synopsis formattings in documentation

2016-07-08 13:47:29 +02:00

pgm-index.txt

Support Jdbc implementation of AccountPatchReviewStore

2017-04-26 09:28:57 +02:00

pgm-init.txt

init: Add a flag to force-delete the cache

2016-10-06 17:20:01 +02:00

pgm-LocalUsernamesToLowerCase.txt

Add warning that LocalUsernamesToLowerCase doesn't convert 'username' external IDs

2018-09-20 10:04:51 +02:00

pgm-MigrateAccountPatchReviewDb.txt

Fix account_patch_reviews for mysql

2018-02-15 21:40:22 +00:00

pgm-passwd.txt

Gerrit command line utility to set/update secure.config

2017-01-12 00:25:25 +00:00

pgm-prolog-shell.txt

Use "gerrit" as the Gerrit user instead of "gerrit2"

2017-07-04 21:20:47 +09:00

pgm-reindex.txt

Remove --dry-run option from reindex command documentation

2016-07-08 15:26:42 +02:00

pgm-rulec.txt

Some more broken synopsis formattings in documentation

2016-07-08 13:47:29 +02:00

pgm-SwitchSecureStore.txt

Some more broken synopsis formattings in documentation

2016-07-08 13:47:29 +02:00

project-configuration.txt

Merge branch 'stable-2.15' into master

2018-03-29 10:26:18 -04:00

prolog-change-facts.txt

Remove current_user predicates

2018-02-16 14:04:01 +00:00

prolog-cookbook.txt

Fix Prolog's example 10 in documentation

2018-06-13 12:30:13 +00:00

replace_macros.py

Python cleanups, round 2: line too long, etc.

2018-05-19 22:48:43 +01:00

rest-api-access.txt

Merge branch 'stable-2.15'

2018-09-12 13:27:01 +09:00

rest-api-accounts.txt

Merge "Merge branch 'stable-2.15'"

2018-09-17 16:42:00 +00:00

rest-api-changes.txt

Mark cherry-pick change as WIP if cherry-pick resulted in conflicts

2018-10-16 09:37:55 +02:00

rest-api-config.txt

Merge branch 'stable-2.14' into stable-2.15

2018-08-29 11:07:04 +09:00

rest-api-documentation.txt

Remove Buck based build

2017-01-23 12:44:58 +00:00

rest-api-groups.txt

Docs: Clarify that for external groups the name in GroupInfo can be missing

2018-04-17 11:15:06 +00:00

rest-api-plugins.txt

Disentangle ListPlugins and PluginLsCommand

2017-08-10 22:43:32 +01:00

rest-api-projects.txt

Support allow_conflicts option in cherry-pick input

2018-10-10 11:26:00 +02:00

rest-api.txt

Support request tracing for REST calls by setting a header in the request

2018-09-10 10:27:32 +02:00

user-change-cleanup.txt

Add background job to abandon inactive changes automatically

2015-06-25 07:26:25 +02:00

user-changeid.txt

Discontinue draft workflow

2017-09-30 15:47:14 +02:00

user-dashboards.txt

Add user guide

2015-04-30 14:37:09 +00:00

user-inline-edit.txt

user-inline-edit: Fix anchor on "Modifying Changes" section

2018-10-09 23:34:55 +00:00

user-named-destinations.txt

Add named destinations support

2015-09-03 10:50:07 -06:00

user-named-queries.txt

Move 'User Refs' docs to the intro-user doc.

2015-09-04 14:55:15 +00:00

user-notify.txt

Add Gerrit-Comment-In-Reply-To footer

2017-11-22 14:23:03 -08:00

user-request-tracing.txt

Support request tracing for REST calls by setting a header in the request

2018-09-10 10:27:32 +02:00

user-review-ui.txt

Update plugin links in documentation

2018-09-28 16:07:43 +09:00

user-search-accounts.txt

Add account predicate that checks if user can see a certain change

2018-03-25 13:55:14 +01:00

user-search-groups.txt

Add fields for members and subgroups to the group index

2017-09-13 14:57:46 +02:00

user-search-projects.txt

Add STATE field to ProjectIndex

2018-07-12 09:24:49 +02:00

user-search.txt

Support 'repo', 'repos' and 'parentrepo' as search operators

2018-09-27 07:49:56 +00:00

user-signedoffby.txt

Revert "== GERRIT" in documentation.

2014-03-25 19:44:49 +00:00

user-submodules.txt

Replace "the the" occurences with "the" (wrong repetition)

2018-04-19 09:30:07 +02:00

user-upload.txt

Allow clients to provide ID for tracing

2018-08-30 13:25:42 +02:00