Make sure to pull org labels too.

Author: telackey

routers/web/org/org_labels.go

@@ -73,6 +73,7 @@ func UpdateLabel(ctx *context.Context) {
 
 	l.Name = form.Title
 	l.Exclusive = form.Exclusive
+	l.ExclusiveOrder = form.ExclusiveOrder
 	l.Description = form.Description
 	l.Color = form.Color
 	l.SetArchived(form.IsArchived)

routers/web/repo/issue_list.go

@@ -468,6 +468,18 @@ func renderExclusiveLabelScopes(ctx *context.Context) {
 		ctx.ServerError("GetAllRepoLabels", err)
 		return
 	}
+
+	if ctx.Repo.Owner.IsOrganization() {
+		orgLabels, err := issues_model.GetLabelsByOrgID(ctx, ctx.Repo.Owner.ID, "", db.ListOptions{})
+		if err != nil {
+			ctx.ServerError("GetAllRepoLabels", err)
+			return
+		}
+
+		labels = append(labels, orgLabels...)
+	}
+
+	// This treats org- and repo-level label scopes equivalently.
 	scopeSet := make(map[string]bool, 0)
 	for _, label := range labels {
 		scope := label.ExclusiveScope()