Compare commits

..

No commits in common. "edb6ba28f17a90dee89cde9189b137f85eaf0383" and "d977e7ec105823106b7470cf153d45dc244890cc" have entirely different histories.

4 changed files with 5 additions and 104 deletions

View File

@ -3344,7 +3344,6 @@ runners.status.unspecified = Unknown
runners.status.idle = Idle runners.status.idle = Idle
runners.status.active = Active runners.status.active = Active
runners.status.offline = Offline runners.status.offline = Offline
runners.reset_registration_token_success = Runner registration token reset successfully
runs.all_workflows = All Workflows runs.all_workflows = All Workflows
runs.open_tab = %d Open runs.open_tab = %d Open

View File

@ -208,7 +208,7 @@ func (source *Source) listLdapGroupMemberships(l *ldap.Conn, uid string, applyGr
} }
var searchFilter string var searchFilter string
if applyGroupFilter && groupFilter != "" { if applyGroupFilter {
searchFilter = fmt.Sprintf("(&(%s)(%s=%s))", groupFilter, source.GroupMemberUID, ldap.EscapeFilter(uid)) searchFilter = fmt.Sprintf("(&(%s)(%s=%s))", groupFilter, source.GroupMemberUID, ldap.EscapeFilter(uid))
} else { } else {
searchFilter = fmt.Sprintf("(%s=%s)", source.GroupMemberUID, ldap.EscapeFilter(uid)) searchFilter = fmt.Sprintf("(%s=%s)", source.GroupMemberUID, ldap.EscapeFilter(uid))

View File

@ -54,7 +54,7 @@
<div class="ui selection dropdown"> <div class="ui selection dropdown">
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range $element := .CardTypes}} {{range $element := .CardTypes}}
{{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}} {{if or (eq $.card_type $element.CardType) (and (not $.card_type) (eq $element.CardType 2))}}
<input type="hidden" name="card_type" value="{{$element.CardType}}"> <input type="hidden" name="card_type" value="{{$element.CardType}}">
<div class="default text">{{$.locale.Tr $element.Translation}}</div> <div class="default text">{{$.locale.Tr $element.Translation}}</div>
{{end}} {{end}}

View File

@ -2399,107 +2399,9 @@ a.ui.label:hover {
.ui.basic.labels .primary.label, .ui.basic.labels .primary.label,
.ui.ui.ui.basic.primary.label { .ui.ui.ui.basic.primary.label {
background: transparent; background: transparent !important;
border-color: var(--color-primary); border-color: var(--color-primary) !important;
color: var(--color-primary); color: var(--color-primary) !important;
}
.ui.basic.labels .secondary.label,
.ui.ui.ui.basic.secondary.label {
background: transparent;
border-color: var(--color-secondary);
color: var(--color-secondary);
}
.ui.basic.labels .orange.label,
.ui.ui.ui.basic.orange.label {
background: transparent;
border-color: var(--color-orange);
color: var(--color-orange);
}
.ui.basic.labels .green.label,
.ui.ui.ui.basic.green.label {
background: transparent;
border-color: var(--color-green);
color: var(--color-green);
}
.ui.basic.labels .olive.label,
.ui.ui.ui.basic.olive.label {
background: transparent;
border-color: var(--color-olive);
color: var(--color-olive);
}
.ui.basic.labels .teal.label,
.ui.ui.ui.basic.teal.label {
background: transparent;
border-color: var(--color-teal);
color: var(--color-teal);
}
.ui.basic.labels .blue.label,
.ui.ui.ui.basic.blue.label {
background: transparent;
border-color: var(--color-blue);
color: var(--color-blue);
}
.ui.basic.labels .violet.label,
.ui.ui.ui.basic.violet.label {
background: transparent;
border-color: var(--color-violet);
color: var(--color-violet);
}
.ui.basic.labels .purple.label,
.ui.ui.ui.basic.purple.label {
background: transparent;
border-color: var(--color-purple);
color: var(--color-purple);
}
.ui.basic.labels .pink.label,
.ui.ui.ui.basic.pink.label {
background: transparent;
border-color: var(--color-pink);
color: var(--color-pink);
}
.ui.basic.labels .red.label,
.ui.ui.ui.basic.red.label {
background: transparent;
border-color: var(--color-red);
color: var(--color-red);
}
.ui.basic.labels .brown.label,
.ui.ui.ui.basic.brown.label {
background: transparent;
border-color: var(--color-brown);
color: var(--color-brown);
}
.ui.basic.labels .yellow.label,
.ui.ui.ui.basic.yellow.label {
background: transparent;
border-color: var(--color-yellow);
color: var(--color-yellow);
}
.ui.basic.labels .grey.label,
.ui.ui.ui.basic.grey.label {
background: transparent;
border-color: var(--color-grey);
color: var(--color-grey);
}
.ui.basic.labels .black.label,
.ui.ui.ui.basic.black.label {
background: transparent;
border-color: var(--color-black);
color: var(--color-black);
} }
.ui.basic.labels .label, .ui.basic.labels .label,