Skip to content

Commit 90c4d2b

Browse files
authored
Merge branch 'main' into feature-markdown-tasklist
2 parents 2b718c5 + b4d1059 commit 90c4d2b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+308
-1147
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Please check the following:
22

3-
1. Make sure you are targeting the `master` branch, pull requests on release branches are only allowed for bug fixes.
3+
1. Make sure you are targeting the `main` branch, pull requests on release branches are only allowed for bug fixes.
44
2. Read contributing guidelines: https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md
55
3. Describe what your pull request does and which issue you're targeting (if any)
66

models/avatar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const DefaultAvatarSize = -1
4444
const DefaultAvatarPixelSize = 28
4545

4646
// AvatarRenderedSizeFactor is the factor by which the default size is increased for finer rendering
47-
const AvatarRenderedSizeFactor = 2
47+
const AvatarRenderedSizeFactor = 4
4848

4949
// HashEmail hashes email address to MD5 string.
5050
// https://en.gravatar.com/site/implement/hash/

modules/repository/commits_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ func TestPushCommits_AvatarLink(t *testing.T) {
112112
pushCommits.Len = len(pushCommits.Commits)
113113

114114
assert.Equal(t,
115-
"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon&s=56",
115+
"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon&s=112",
116116
pushCommits.AvatarLink("user2@example.com"))
117117

118118
assert.Equal(t,
119119
"https://secure.gravatar.com/avatar/"+
120120
fmt.Sprintf("%x", md5.Sum([]byte("nonexistent@example.com")))+
121-
"?d=identicon&s=56",
121+
"?d=identicon&s=112",
122122
pushCommits.AvatarLink("nonexistent@example.com"))
123123
}
124124

options/locale/locale_cs-CZ.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2225,7 +2225,6 @@ auths.host=Server
22252225
auths.port=Port
22262226
auths.bind_dn=Připojení DN
22272227
auths.bind_password=Heslo připojení
2228-
auths.bind_password_helper=Upozornění: Toto heslo je ukládáno v nešifrované podobě. Použijte účet pouze pro čtení, pokud je to možné.
22292228
auths.user_base=Výchozí bod hledání uživatelů
22302229
auths.user_dn=DN uživatele
22312230
auths.attribute_username=Atribut uživatelského jména

options/locale/locale_de-DE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,6 @@ auths.host=Host
22782278
auths.port=Port
22792279
auths.bind_dn=DN binden
22802280
auths.bind_password=Passwort binden
2281-
auths.bind_password_helper=Achtung: Das Passwort wird im Klartext gespeichert. Benutze, wenn möglich, einen Account, der nur über Lesezugriff verfügt.
22822281
auths.user_base=Basis für Benutzersuche
22832282
auths.user_dn=Benutzer-DN
22842283
auths.attribute_username=Benutzernamens-Attribut

options/locale/locale_es-ES.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2282,7 +2282,6 @@ auths.host=Servidor
22822282
auths.port=Puerto
22832283
auths.bind_dn=Bind DN
22842284
auths.bind_password=Contraseña Bind
2285-
auths.bind_password_helper=Advertencia: Esta contraseña se almacena en texto plano. Utilice una cuenta de sólo lectura si es posible.
22862285
auths.user_base=Base de búsqueda de usuarios
22872286
auths.user_dn=DN de Usuario
22882287
auths.attribute_username=Atributo nombre de usuario

options/locale/locale_fa-IR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,6 @@ auths.host=میزبان
18961896
auths.port=درگاه (پورت)
18971897
auths.bind_dn=DN متصل شده
18981898
auths.bind_password=اتصال گذرواژه
1899-
auths.bind_password_helper=هشدار: این گذرواژه به صورت متن خام ذخیره می شود. استفاده حساب های کاربری فقط-خواندنی امکان پذیر هست.
19001899
auths.user_base=پایگاه جستجوی کاربر
19011900
auths.user_dn=کاربر DN
19021901
auths.attribute_username=ویژگی نام کاربری

options/locale/locale_fr-FR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2222,7 +2222,6 @@ auths.host=Hôte
22222222
auths.port=Port
22232223
auths.bind_dn=Bind DN
22242224
auths.bind_password=Bind mot de passe
2225-
auths.bind_password_helper=Attention: ce mot de passe est stocké en clair. Veuillez utiliser, si possible, un compte avec des droits limités en lecture seule.
22262225
auths.user_base=Utilisateur Search Base
22272226
auths.user_dn=Utilisateur DN
22282227
auths.attribute_username=Attribut nom d'utilisateur

options/locale/locale_hu-HU.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,6 @@ auths.host=Kiszolgáló
14951495
auths.port=Port
14961496
auths.bind_dn=Bind DN
14971497
auths.bind_password=Bind Jelszó
1498-
auths.bind_password_helper=Figyelem: Ez a jelszó egyszerű szövegben van tárolva. Ha lehetséges használjon csak olvasható fiókot.
14991498
auths.user_base=Felhasználókeresés alapja (BaseDN)
15001499
auths.user_dn=Felhasználói DN
15011500
auths.attribute_username=Felhasználónév attribútum

options/locale/locale_it-IT.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2097,7 +2097,6 @@ auths.host=Host
20972097
auths.port=Porta
20982098
auths.bind_dn=Binda DN
20992099
auths.bind_password=Binda Password
2100-
auths.bind_password_helper=Attenzione: La password è memorizzata in testo normale. Se possibile, utilizzare un account di sola lettura.
21012100
auths.user_base=Base ricerca utente
21022101
auths.user_dn=DN dell'utente
21032102
auths.attribute_username=Attributo nome utente

0 commit comments

Comments
 (0)