Compare commits

..

4 Commits

Author SHA1 Message Date
Jason Song
edb6ba28f1
Add missing translation for actions.runners.reset_registration_token_success (#23732) (#23781)
Backport #23732.

Used at


4011821c94/routers/web/shared/actions/runners.go (L157)
2023-03-29 22:05:26 -04:00
Giteabot
494721cc90
Don't apply the group filter when listing LDAP group membership if it is empty (#23745) (#23788)
Backport #23745 by @zeripath

When running listLdapGroupMemberships check if the groupFilter is empty
before using it to list memberships.

Fix #23615

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>
2023-03-29 15:00:12 -04:00
Giteabot
d27e693ecf
Add CSS rules for basic colored labels (#23774) (#23777)
Backport #23774 by @silverwind

Before:

<img width="164" alt="Screenshot 2023-03-28 at 23 35 46"
src="https://user-images.githubusercontent.com/115237/228372437-663111b9-7285-4fa2-9125-fb5e1cad21d7.png">

After:
<img width="166" alt="Screenshot 2023-03-28 at 23 35 54"
src="https://user-images.githubusercontent.com/115237/228372441-49430517-6b2d-4389-b11c-c30a724f6de7.png">

Also I removed the `!important` on the primary label as it's very likely
unnecessary with the amount of specificity the selector already has.

Co-authored-by: silverwind <me@silverwind.io>
2023-03-29 14:15:00 -04:00
Zettat123
81a995cd84
Fix project card preview select and template select (#23684) (#23731)
Backport #23684 
Now user cannot set Card Previews when creating a new project.

Before:


https://user-images.githubusercontent.com/15528715/227488883-29bbd636-8b98-45b3-b2f8-de5206b045dc.mp4

After:


https://user-images.githubusercontent.com/15528715/227488976-3447f252-805a-4f18-ae0e-1cddd921dcc3.mp4
2023-03-29 14:52:50 +08:00
4 changed files with 104 additions and 5 deletions

View File

@ -3344,6 +3344,7 @@ 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 { if applyGroupFilter && groupFilter != "" {
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 $.card_type) (eq $element.CardType 2))}} {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}}
<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,9 +2399,107 @@ 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 !important; background: transparent;
border-color: var(--color-primary) !important; border-color: var(--color-primary);
color: var(--color-primary) !important; color: var(--color-primary);
}
.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,