opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6' into stable-2.7

Browse Source 
* stable-2.6:
  Fix: Duplicate options of permitted_labels.
  Make links appear with the same color in Change UI
  Update revision of reviewnotes plugin

Conflicts:
	plugins/reviewnotes

Change-Id: Ib88f7163a15a6fefd0f30f7eacef7b576aa79ab1
This commit is contained in:
Dave Borowitz
2013-09-30 11:11:24 -07:00
parent 8c5809d59c 1d0673b5f4
commit b4497fd7ce
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -31,11 +31,12 @@ import com.google.common.base.Strings;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.SetMultimap;
import com.google.common.collect.Sets;
import com.google.common.collect.Table;
import com.google.gerrit.common.changes.ListChangesOption;
@@ -580,7 +581,7 @@ public class ChangeJson {
}
LabelTypes labelTypes = ctl.getLabelTypes();
ListMultimap<String, String> permitted = LinkedListMultimap.create();
SetMultimap<String, String> permitted = LinkedHashMultimap.create();
for (SubmitRecord rec : submitRecords(cd)) {
if (rec.labels == null) {
continue;