opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11'

Browse Source 
* stable-2.11:
  Fix flaky test that relied on non-stable order of approvals
  Update 2.11.4 release notes
  Use uploader for approvals specified on push, not the committer
  Fix "Conflicts With" when current change is a merge commit
  Fix "Conflicts With" when other change is a merge-commit
  UploadValidationListener: Fix minor typo in javadoc
  Provide better detection of requiring sign-in
  Update replication plugin
  Submit: Fix ClassCastException for anonymous user

Note:
The testPushForMasterWithApprovalsForgeCommitterButNoForgeVote test is
broken due to refactoring that was done on the master branch since the
stable-2.11 branch was created. The breakage is not fixed in this merge,
but in the follow-up commit.

Change-Id: I52bdc55ecdf817c2d4ccf3a17e74cff6f53dfa60
This commit is contained in:
David Pursehouse
2015-10-16 14:28:05 +09:00
parent 970f7f8be9 3dcf53f214
commit 70c62aa8f5
14 changed files with 170 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-common/src/main/java/com/google/gerrit/common/data/PatchSetDetail.java
View File

@@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetInfo;
import com.google.gerrit.reviewdb.client.Project;
import java.util.Collections;
import java.util.List;
public class PatchSetDetail {
@@ -27,7 +26,6 @@ public class PatchSetDetail {
protected PatchSetInfo info;
protected List<Patch> patches;
protected Project.NameKey project;
protected List<UiCommandDetail> commands;
public PatchSetDetail() {
}
@@ -63,15 +61,4 @@ public class PatchSetDetail {
public void setProject(final Project.NameKey p) {
project = p;
}
public List<UiCommandDetail> getCommands() {
if (commands != null) {
return commands;
}
return Collections.emptyList();
}
public void setCommands(List<UiCommandDetail> cmds) {
commands = cmds.isEmpty() ? null : cmds;
}
}

24
gerrit-common/src/main/java/com/google/gerrit/common/data/UiCommandDetail.java
View File

@@ -1,24 +0,0 @@
// Copyright (C) 2013 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.common.data;
/** Detail necessary to display an action. */
public class UiCommandDetail {
public String id;
public String method;
public String label;
public String title;
public boolean enabled;
}