Skip to content

Commit 62c798f

Browse files
Merge branch 'master' into api-endpoint-teams-search
2 parents 7cfa3d5 + 79c8bc0 commit 62c798f

File tree

9 files changed

+8
-9
lines changed

9 files changed

+8
-9
lines changed

docker/root/etc/templates/sshd_config

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ChallengeResponseAuthentication no
2525
PasswordAuthentication no
2626
PermitEmptyPasswords no
2727

28-
AllowUsers git
28+
AllowUsers ${USER}
2929

3030
Banner none
3131
Subsystem sftp /usr/lib/ssh/sftp-server

docker/root/usr/bin/entrypoint

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
if [ "${USER}" != "git" ]; then
44
# rename user
55
sed -i -e "s/^git\:/${USER}\:/g" /etc/passwd
6-
# switch sshd config to different user
7-
sed -i -e "s/AllowUsers git$/AllowUsers ${USER}/g" /etc/ssh/sshd_config
86
fi
97

108
if [ -z "${USER_GID}" ]; then

docs/content/doc/advanced/ci-cd.en-us.md

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ the purpose is to give a starting point to integrate a CI/CD process with your G
2626
- [Jenkins](https://jenkins.io/) with [Gitea plugin](https://plugins.jenkins.io/gitea)
2727
- [Agola](https://agola.io)
2828
- [Buildkite](https://buildkite.com) with [Gitea connector](https://github.com/techknowlogick/gitea-buildkite-connector)
29+
- [AppVeyor](https://www.appveyor.com) with [built-in Gitea support](https://www.appveyor.com/blog/2019/09/05/gitea-receives-first-class-support-in-appveyor/)
2930

3031
Others CI/CD solutions that partially can be integrated with Gitea:
3132
- [Concourse](https://www.concourse-ci.org), see more information at [Concourse community forum](https://discuss.concourse-ci.org/t/concourse-ci-and-gitea-oauth/1475)

options/locale/locale_cs-CZ.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ owner=Vlastník
566566
repo_name=Název repozitáře
567567
repo_name_helper=Dobrý název repozitáře většinou používá krátká, zapamatovatelná a unikátní klíčová slova.
568568
visibility=Viditelnost
569-
visibility.tooltip=Pouze majitelé nebo členové organizace to budou moci vidět, pokud mají práva.
569+
visibility_description=Pouze majitelé nebo členové organizace to budou moci vidět, pokud mají práva.
570570
visibility_helper=Nastavit repozitář jako soukromý
571571
visibility_helper_forced=Váš administrátor vynutil, že nové repozitáře budou soukromé.
572572
visibility_fork_helper=(Změna tohoto ovlivní všechny rozštěpení repozitáře.)

options/locale/locale_de-DE.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ owner=Besitzer
566566
repo_name=Repository-Name
567567
repo_name_helper=Ein guter Repository-Name besteht normalerweise aus kurzen, unvergesslichen und einzigartigen Schlagwörtern.
568568
visibility=Sichtbarkeit
569-
visibility.tooltip=Nur der Eigentümer oder Organisationsmitglieder mit entsprechenden Rechten werden es sehen können.
569+
visibility_description=Nur der Besitzer oder Organisationsmitglieder mit entsprechender Berechtigung, werden in der Lage sein, es zu sehen.
570570
visibility_helper=In privates Repository umwandeln
571571
visibility_helper_forced=Auf dieser Gitea-Instanz können nur private Repositories angelegt werden.
572572
visibility_fork_helper=(Eine Änderung dieses Wertes wirkt sich auf alle Forks aus)

options/locale/locale_en-US.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ owner = Owner
567567
repo_name = Repository Name
568568
repo_name_helper = Good repository names use short, memorable and unique keywords.
569569
visibility = Visibility
570-
visibility.tooltip = Only the owner or the organization members if they have rights, will be able to see it.
570+
visibility_description = Only the owner or the organization members if they have rights, will be able to see it.
571571
visibility_helper = Make Repository Private
572572
visibility_helper_forced = Your site administrator forces new repositories to be private.
573573
visibility_fork_helper = (Changing this will affect all forks.)

options/locale/locale_pt-BR.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ owner=Proprietário
566566
repo_name=Nome do repositório
567567
repo_name_helper=Um bom nome de repositório é composto por palavras curtas, memorizáveis e únicas.
568568
visibility=Visibilidade
569-
visibility.tooltip=Somente o proprietário ou os membros da organização, se tiverem direitos, poderão vê-lo.
569+
visibility_description=Somente o proprietário ou os membros da organização, se tiverem direitos, poderão vê-lo.
570570
visibility_helper=Tornar este repositório privado
571571
visibility_helper_forced=O administrador do site força novos repositórios a serem privados.
572572
visibility_fork_helper=(Esta alteração irá afetar todos os forks.)

options/locale/locale_zh-CN.ini

-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,6 @@ owner=拥有者
566566
repo_name=仓库名称
567567
repo_name_helper=好的存储库名称使用简短、深刻和独特的关键字。
568568
visibility=可见性
569-
visibility.tooltip=只有组织所有人或拥有权利的组织成员才能看到。
570569
visibility_helper=将仓库设为私有
571570
visibility_helper_forced=站点管理员强制要求新仓库为私有。
572571
visibility_fork_helper=(修改该值将会影响到所有派生仓库)

templates/repo/create.tmpl

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<input id="repo_name" name="repo_name" value="{{.repo_name}}" autofocus required>
3939
<span class="help">{{.i18n.Tr "repo.repo_name_helper"}}</span>
4040
</div>
41-
<div class="inline field" data-tooltip={{.i18n.Tr "repo.visibility.tooltip"}}>
41+
<div class="inline field">
4242
<label>{{.i18n.Tr "repo.visibility"}}</label>
4343
<div class="ui checkbox">
4444
{{if .IsForcedPrivate}}
@@ -49,6 +49,7 @@
4949
<label>{{.i18n.Tr "repo.visibility_helper" | Safe}}</label>
5050
{{end}}
5151
</div>
52+
<span class="help">{{.i18n.Tr "repo.visibility_description"}}</span>
5253
</div>
5354
<div class="inline field {{if .Err_Description}}error{{end}}">
5455
<label for="description">{{.i18n.Tr "repo.repo_desc"}}</label>

0 commit comments

Comments
 (0)