Edwin Kempin 5b2259a32f Disable checkbox for useContentMerge if 'Fast Forward Only' ...

Disable the checkbox 'Automatically resolve conflicts' in the
ProjectInfoScreen if 'Fast Forward Only' is chosen as submit
type. Since the setting for the useContentMerge option is ignored if
'Fast Forward Only' is chosen as submit type it is only confusing
to the user if this option is editable but has no effect.

Change-Id: I963df4d577120e1671dd7e9faf195c600df6ff5e
Signed-off-by: Edwin Kempin <edwin.kempin@gmail.com>
Signed-off-by: Shawn O. Pearce <sop@google.com>

2010-10-29 15:42:45 -07:00

contrib

Add an example hook script for checking valid commits

2010-06-18 16:15:22 -05:00

Documentation

Disable checkbox for useContentMerge if 'Fast Forward Only'

2010-10-29 15:42:45 -07:00

gerrit-common

Display empty branch list when project has no repository

2010-08-28 16:33:46 -07:00

gerrit-gwtdebug

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00

gerrit-gwtui

Disable checkbox for useContentMerge if 'Fast Forward Only'

2010-10-29 15:42:45 -07:00

gerrit-httpd

Log branch creation error only once

2010-10-16 11:52:43 -07:00

gerrit-launcher

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00

gerrit-main

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00

gerrit-patch-commonsnet

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00

gerrit-patch-jgit

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00

gerrit-pgm

SSO via client SSL certificates

2010-10-13 15:54:31 +02:00

gerrit-prettify

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00

gerrit-reviewdb

Add experimental support for automatic conflict handling

2010-10-14 21:37:22 -07:00

gerrit-server

Upon replication fail, retry and block future ones to same URL

2010-10-29 15:10:48 -07:00

gerrit-sshd

Enable creation of initial empty commit for new projects

2010-10-15 07:12:52 +02:00

gerrit-util-cli

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00

gerrit-util-ssl

Fix all of our pom.xml versions to be 2.1-SNAPSHOT

2010-08-12 16:24:43 -07:00

gerrit-war

Silence non-critical messages from Velocity

2010-08-25 15:03:59 -07:00

ReleaseNotes

Clarify the upgrade instructions

2010-08-23 09:31:41 -07:00

tools

Fix loading AccountResources and its key_applet in hosted mode

2010-07-14 19:37:40 -07:00

.gitignore

Add standard eclipse generated files to .gitignore

2010-01-29 16:53:05 -08: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

pom.xml

Update to JGit 0.9.3.86-g4c7e100

2010-10-13 21:32:26 -07:00

SUBMITTING_PATCHES

Document how to contribute to Gerrit Code Review

2009-07-02 13:45:52 -07:00

Description

RETIRED, Gerrit as used by OpenStack

120 MiB