opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6'

Browse Source 
* stable-2.6:
  Enable expanding skipped lines even if 'Syntax Coloring' is off
  Fix: `gerrit review` with --message does not work with no labels
  Reword 'Working ...' message changes in 2.6 release notes
  TrivialRebase: Support custom labels
  MergeUtil: Remove legacy label ID
  TrivialRebase: Call gerrit review instead of approve
This commit is contained in:
Shawn Pearce
2013-04-22 10:40:10 -07:00
parent 932bfbae82 dbc2f75dc9
commit ec82f0de4f
6 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -315,11 +315,11 @@ public class MergeUtil {
}
private static boolean isCodeReview(LabelId id) {
return "CRVW".equals(id.get()) || "Code-Review".equalsIgnoreCase(id.get());
return "Code-Review".equalsIgnoreCase(id.get());
}
private static boolean isVerified(LabelId id) {
return "VRIF".equals(id.get()) || "Verified".equalsIgnoreCase(id.get());
return "Verified".equalsIgnoreCase(id.get());
}
public List<PatchSetApproval> getApprovalsForCommit(final CodeReviewCommit n) {