Merge branch 'stable-2.15'
* stable-2.15: StarredChangesUtil: Handle unexpected format of reviewed/unreviewed labels Fix migration of mute stars Test that change is reindexed when change is starred/unstarred Suggest "is:private" in autocompete Trigger GitRefUpdatedEvent when star labels are updated Trigger GitReferenceUpdated event when account or change sequence is updated Fix bad rounding of relative dates like '1 year, 12 months ago' Fix test of RelativeDateFormatter Trigger GitReferenceUpdated event when external IDs are updated Increase the value of GERRIT_FDS parameter Add rel="external" to link to CLA Fix invalid operator invalidating web session Address test flakiness in gr-project-detail-list Update patchset selector styles Change-Id: I4ec66d2d53c9fbe98878fa02585724db2eda216a
This commit is contained in:
@@ -32,6 +32,7 @@ import com.google.gerrit.pgm.util.SiteProgram;
|
||||
import com.google.gerrit.pgm.util.ThreadLimiter;
|
||||
import com.google.gerrit.server.change.ChangeResource;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
|
||||
import com.google.gerrit.server.index.IndexModule;
|
||||
import com.google.gerrit.server.index.IndexModule.IndexType;
|
||||
import com.google.gerrit.server.index.change.ChangeSchemaDefinitions;
|
||||
@@ -170,6 +171,7 @@ public class Reindex extends SiteProgram {
|
||||
@Override
|
||||
protected void configure() {
|
||||
factory(ChangeResource.Factory.class);
|
||||
bind(GitReferenceUpdated.class).toInstance(GitReferenceUpdated.DISABLED);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -16,11 +16,13 @@ package com.google.gerrit.pgm.init;
|
||||
|
||||
import com.google.gerrit.pgm.init.api.AllUsersNameOnInitProvider;
|
||||
import com.google.gerrit.pgm.init.api.InitFlags;
|
||||
import com.google.gerrit.reviewdb.client.Project;
|
||||
import com.google.gerrit.server.GerritPersonIdentProvider;
|
||||
import com.google.gerrit.server.account.externalids.ExternalId;
|
||||
import com.google.gerrit.server.account.externalids.ExternalIdReader;
|
||||
import com.google.gerrit.server.account.externalids.ExternalIdsUpdate;
|
||||
import com.google.gerrit.server.config.SitePaths;
|
||||
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import java.io.File;
|
||||
@@ -67,7 +69,17 @@ public class ExternalIdsOnInit {
|
||||
|
||||
PersonIdent serverIdent = new GerritPersonIdentProvider(flags.cfg).get();
|
||||
ExternalIdsUpdate.commit(
|
||||
repo, rw, ins, rev, noteMap, commitMessage, serverIdent, serverIdent);
|
||||
new Project.NameKey(allUsers),
|
||||
repo,
|
||||
rw,
|
||||
ins,
|
||||
rev,
|
||||
noteMap,
|
||||
commitMessage,
|
||||
serverIdent,
|
||||
serverIdent,
|
||||
null,
|
||||
GitReferenceUpdated.DISABLED);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ package com.google.gerrit.pgm.init.api;
|
||||
import com.google.gerrit.reviewdb.client.Project;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gerrit.server.Sequences;
|
||||
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
|
||||
import com.google.gerrit.server.git.GitRepositoryManager;
|
||||
import com.google.gerrit.server.notedb.RepoSequence;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
@@ -40,6 +41,7 @@ public class SequencesOnInit {
|
||||
RepoSequence accountSeq =
|
||||
new RepoSequence(
|
||||
repoManager,
|
||||
GitReferenceUpdated.DISABLED,
|
||||
new Project.NameKey(allUsersName.get()),
|
||||
Sequences.NAME_ACCOUNTS,
|
||||
accountSeed,
|
||||
|
||||
@@ -289,7 +289,11 @@ fi
|
||||
|
||||
GERRIT_FDS=`get_config --int core.packedGitOpenFiles`
|
||||
test -z "$GERRIT_FDS" && GERRIT_FDS=128
|
||||
GERRIT_FDS=`expr $GERRIT_FDS + $GERRIT_FDS`
|
||||
FDS_MULTIPLIER=2
|
||||
USE_LFS=`get_config --get lfs.plugin`
|
||||
test -n "$USE_LFS" && FDS_MULTIPLIER=3
|
||||
|
||||
GERRIT_FDS=`expr $FDS_MULTIPLIER \* $GERRIT_FDS`
|
||||
test $GERRIT_FDS -lt 1024 && GERRIT_FDS=1024
|
||||
|
||||
GERRIT_STARTUP_TIMEOUT=`get_config --get container.startupTimeout`
|
||||
|
||||
Reference in New Issue
Block a user