opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Fix java.lang.ArrayIndexOutOfBoundsException when checking for parent
  ProjectTagsScreen: Fix title of revision field for new tag
  Fix cyclic dependency when using site_path from system_config table

Change-Id: I1f4ed09818885284b9686d38705a20cf21cfce23
This commit is contained in:
Paladox 2017-06-14 14:56:09 +01:00
commit c7746ffec7
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
View File

@ -181,6 +181,8 @@ public interface AdminConstants extends Constants {
String initialRevision(); String initialRevision();
String revision();
String buttonAddBranch(); String buttonAddBranch();
String buttonDeleteBranch(); String buttonDeleteBranch();

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
View File

@ -86,6 +86,7 @@ columnBranchRevision = Revision
columnTagName = Tag Name columnTagName = Tag Name
columnTagRevision = Revision columnTagRevision = Revision
initialRevision = Initial Revision initialRevision = Initial Revision
revision = Revision
buttonAddBranch = Create Branch buttonAddBranch = Create Branch
buttonAddTag = Create Tag buttonAddTag = Create Tag
buttonDeleteBranch = Delete buttonDeleteBranch = Delete

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java
View File

@ -150,7 +150,7 @@ public class ProjectTagsScreen extends PaginatedProjectScreen {
} }
} }
}); });
addGrid.setText(1, 0, AdminConstants.I.initialRevision() + ":"); addGrid.setText(1, 0, AdminConstants.I.revision() + ":");
addGrid.setWidget(1, 1, irevTxtBox); addGrid.setWidget(1, 1, irevTxtBox);
addTag = new Button(AdminConstants.I.buttonAddTag()); addTag = new Button(AdminConstants.I.buttonAddTag());

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
View File

@ -242,7 +242,7 @@ public class ChangeKindCacheImpl implements ChangeKindCache {
} }
if ((prior.getParentCount() != 1 || next.getParentCount() != 1) if ((prior.getParentCount() != 1 || next.getParentCount() != 1)
&& (!onlyFirstParentChanged(prior, next) || prior.getParentCount() == 0)) { && (prior.getParentCount() == 0 || !onlyFirstParentChanged(prior, next))) {
// Trivial rebases done by machine only work well on 1 parent. // Trivial rebases done by machine only work well on 1 parent.
return ChangeKind.REWORK; return ChangeKind.REWORK;
} }

4
gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java
View File

@ -17,6 +17,7 @@ package com.google.gerrit.httpd;
import com.google.gerrit.reviewdb.client.SystemConfig; import com.google.gerrit.reviewdb.client.SystemConfig;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.config.SitePath; import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.schema.ReviewDbFactory;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory; import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject; import com.google.inject.Inject;
@ -30,7 +31,8 @@ class SitePathFromSystemConfigProvider implements Provider<Path> {
private final Path path; private final Path path;
@Inject @Inject
SitePathFromSystemConfigProvider(SchemaFactory<ReviewDb> schemaFactory) throws OrmException { SitePathFromSystemConfigProvider(@ReviewDbFactory SchemaFactory<ReviewDb> schemaFactory)
throws OrmException {
path = read(schemaFactory); path = read(schemaFactory);
} }