Shawn Pearce a4e0250cbd Allow PatchListLoader to use recursive merger ...

The automerge "base" created on merge commits should use the
recursive merger, if it has not been disabled on this server.

Switching to recursive allows handling changes that require
the virtual common ancestor to be built when multiple merge
bases are discovered for the two parents.

Change-Id: Ica2daa6bd0a38f7fa1430bed28bd7f54d3bfb2c4

2015-03-18 17:15:07 +01:00

.settings

Eclipse: Bump java source and target level to 7

2013-11-29 00:15:50 +01:00

bucklets

Buck: Allow to co-exist in tree and standalone plugins

2014-06-26 10:59:25 +02:00

contrib

Allow to download reposize.sh script from Gerrit

2014-05-09 16:20:51 +02:00

Documentation

Merge "Expose extension point for generic OAuth providers" into stable-2.10

2015-03-13 13:31:49 +00:00

gerrit-acceptance-tests

Update JGit to version 3.5.1.201410131835-r

2014-10-22 13:01:27 -04:00

gerrit-antlr

Buck: Remove usage of genfile()

2014-06-10 07:14:18 +00:00

gerrit-cache-h2

Honor expireAfterWrite in the H2CacheImpl

2014-12-03 16:25:05 +09:00

gerrit-common

OpenID: Add support for Launchpad on the login form

2015-03-01 22:25:50 +01:00

gerrit-extension-api

Set version to 2.10.1

2015-03-13 15:35:33 +01:00

gerrit-gwtdebug

Prevent StackOverflowError in JettyTreeLogger

2014-02-07 12:54:18 +00:00

gerrit-gwtexpui

Do not linkify trailing dot or comma

2014-07-16 17:24:32 +09:00

gerrit-gwtui

Expose extension point for generic OAuth providers

2015-03-06 01:10:40 +01:00

gerrit-gwtui-common

Buck: Rename gwtxml to gwt_xml in gwt_module()

2014-05-19 12:26:50 -07:00

gerrit-httpd

Expose extension point for generic OAuth providers

2015-03-06 01:10:40 +01:00

gerrit-launcher

Apply "type inference for generic instance creation" Java 7 feature

2014-04-26 15:27:57 +02:00

gerrit-lucene

Merge branch 'stable-2.9' into stable-2.10

2014-11-12 10:12:26 -08:00

gerrit-main

Build Main for Java 1.2

2013-11-30 01:53:00 -08:00

gerrit-oauth

Expose extension point for generic OAuth providers

2015-03-06 01:10:40 +01:00

gerrit-openid

OpenID: Add support for Launchpad on the login form

2015-03-01 22:25:50 +01:00

gerrit-patch-commonsnet

Replace 'for' loop with 'foreach'

2013-12-04 01:02:53 +04:00

gerrit-patch-jgit

Buck: Rename gwtxml to gwt_xml in gwt_module()

2014-05-19 12:26:50 -07:00

gerrit-pgm

Expose extension point for generic OAuth providers

2015-03-06 01:10:40 +01:00

gerrit-plugin-api

Set version to 2.10.1

2015-03-13 15:35:33 +01:00

gerrit-plugin-archetype

Set version to 2.10.1

2015-03-13 15:35:33 +01:00

gerrit-plugin-gwt-archetype

Set version to 2.10.1

2015-03-13 15:35:33 +01:00

gerrit-plugin-gwtui

Set version to 2.10.1

2015-03-13 15:35:33 +01:00

gerrit-plugin-js-archetype

Set version to 2.10.1

2015-03-13 15:35:33 +01:00

gerrit-prettify

Buck: Rename gwtxml to gwt_xml in gwt_module()

2014-05-19 12:26:50 -07:00

gerrit-reviewdb

Expose extension point for generic OAuth providers

2015-03-06 01:10:40 +01:00

gerrit-server

Allow PatchListLoader to use recursive merger

2015-03-18 17:15:07 +01:00

gerrit-solr

Delete a change from the index when it is not in the DB

2014-11-12 17:03:41 +00:00

gerrit-sshd

Don't duplicate commandName in SSH log

2014-12-05 17:29:13 -05:00

gerrit-util-cli

ReceiveCommits: Add support for approvals

2014-05-08 17:08:44 -07:00

gerrit-util-ssl

Remove unused .gitignore

2013-11-28 22:56:51 -08:00

gerrit-war

Set version to 2.10.1

2015-03-13 15:35:33 +01:00

lib

Update JGit to 3.6.2.201501210735-r

2015-01-21 21:16:50 +00:00

plugins

Update cookbook plugin to latest revision

2015-03-03 09:53:29 +09:00

ReleaseNotes

Release notes for Gerrit 2.10.1

2015-03-13 15:29:57 +01:00

tools

Merge branch 'stable-2.9' into stable-2.10

2014-09-05 19:13:31 +09:00

website/releases

Exclude gerrit-snapshot-* from releases page

2014-02-19 05:56:00 +00:00

.buckconfig

Buck: Share buck cache directory between multiple source trees

2014-06-12 09:58:24 +02:00

.buckversion

Update Buck

2014-06-24 20:40:48 +00:00

.gitignore

Merge branch 'stable-2.9'

2014-05-27 09:58:38 +09:00

.gitmodules

Add singleusergroup plugin

2013-11-09 07:45:00 +01:00

.pydevproject

Set python version back to 2.6.5 in .pydevproject

2013-05-20 11:36:08 +09:00

BUCK

Update Buck and use gwt_binary()

2014-05-19 11:41:31 -07:00

COPYING

Initial project setup of Gerrit 2

2008-11-14 16:59:34 -08:00

INSTALL

Remove Gerrit 1.x to 2.x import tools

2009-03-27 20:20:10 -07:00

SUBMITTING_PATCHES

Update push URL in SUBMITTING_PATCHES

2012-03-29 00:57:14 -04:00

VERSION

Set version to 2.10.1

2015-03-13 15:35:33 +01:00

Description

RETIRED, Gerrit as used by OpenStack

120 MiB