Google Git
Sign in
gerrit / gerrit / 797596b88111dcb3282d20936f3abba34c9c8aac
commit797596b88111dcb3282d20936f3abba34c9c8aac[log] [tgz]
authorEdwin Kempin <ekempin@google.com>Fri Oct 18 11:01:38 2024 +0000
committerPaladox none <thomasmulhall410@yahoo.com>Mon Oct 21 12:37:16 2024 +0000
treec0dd7ddb16c0982be0bc7b1c761a19bfe8a2b53d
parent4f0175433463887c22436edc2b953c0e6a038347 [diff]
Rebase change edit: Let caller know whether there have been conflicts

Change the rebase change edit REST endpoint to return the rebased change
edit, rather than a '204 No Content' response. This allows us to include
a 'contains_git_conflicts' flag into the returned EditInfo so that
callers can know whether rebasing the change edit resulted in conflicts
(if 'allow_conflicts' was set in the request input).

This changes the response code for a successful rebase from '204 No
Content' to '200 OK'.

Release-Notes: skip
Bug: Google b/364179875
Change-Id: I90c71b74752fdd6817b0e8e8ec0acdb7a1310580
Signed-off-by: Edwin Kempin <ekempin@google.com>
(cherry picked from commit 09ed9f24816e949bbf34e28ed09a7bfcc85d2048)
8 files changed
tree: c0dd7ddb16c0982be0bc7b1c761a19bfe8a2b53d
  1. .github/
  2. .settings/
  3. .ts-out/
  4. antlr3/
  5. contrib/
  6. Documentation/
  7. e2e-tests/
  8. java/
  9. javatests/
  10. lib/
  11. modules/
  12. plugins/
  13. polygerrit-ui/
  14. prolog/
  15. prologtests/
  16. proto/
  17. resources/
  18. tools/
  19. webapp/
  20. polymer-bridges
  21. .bazelignore
  22. .bazelproject
  23. .bazelrc
  24. .bazelversion
  25. .editorconfig
  26. .git-blame-ignore-revs
  27. .gitignore
  28. .gitmodules
  29. .gitreview
  30. .mailmap
  31. .pydevproject
  32. .zuul.yaml
  33. BUILD
  34. COPYING
  35. INSTALL
  36. Jenkinsfile
  37. MODULE.bazel
  38. package.json
  39. README.md
  40. SUBMITTING_PATCHES
  41. version.bzl
  42. web-dev-server.config.mjs
  43. WORKSPACE
  44. yarn.lock
README.md

Gerrit Code Review

Gerrit is a code review and project management tool for Git based projects.

Build Status Maven Central

Objective

Gerrit makes reviews easier by showing changes in a side-by-side display, and allowing inline comments to be added by any reviewer.

Gerrit simplifies Git based project maintainership by permitting any authorized user to submit changes to the master Git repository, rather than requiring all approved changes to be merged in by hand by the project maintainer.

Documentation

For information about how to install and use Gerrit, refer to the documentation.

Source

Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.

Reporting bugs

Please report bugs on the issue tracker.

Contribute

Gerrit is the work of hundreds of contributors. We appreciate your help!

Please read the contribution guidelines.

Note that we do not accept Pull Requests via the Github mirror.

Getting in contact

The Developer Mailing list is repo-discuss on Google Groups.

License

Gerrit is provided under the Apache License 2.0.

Build

Install Bazel and run the following:

    git clone --recurse-submodules https://gerrit.googlesource.com/gerrit
    cd gerrit && bazel build release

Install binary packages (Deb/Rpm)

The instruction how to configure GerritForge/BinTray repositories is here

On Debian/Ubuntu run:

    apt-get update && apt-get install gerrit=<version>-<release>

NOTE: release is a counter that starts with 1 and indicates the number of packages that have been released with the same version of the software.

On CentOS/RedHat run:

    yum clean all && yum install gerrit-<version>[-<release>]

On Fedora run:

    dnf clean all && dnf install gerrit-<version>[-<release>]

Use pre-built Gerrit images on Docker

Docker images of Gerrit are available on DockerHub

To run a CentOS 8 based Gerrit image:

    docker run -p 8080:8080 gerritcodereview/gerrit[:version]-centos8

To run a Ubuntu 20.04 based Gerrit image:

    docker run -p 8080:8080 gerritcodereview/gerrit[:version]-ubuntu20

NOTE: release is optional. Last released package of the version is installed if the release number is omitted.