foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 12:59:11 -05:00
Code Issues Wiki Activity

Merge branch 'master' into api_return-json-error

Browse source
This commit is contained in:
6543 2020-05-25 01:30:02 +02:00 committed by GitHub
commit cd7b120174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
custom/conf/app.ini.sample
View file

@ -627,7 +627,8 @@ SUBJECT_PREFIX =
; Mail server
; Gmail: smtp.gmail.com:587
; QQ: smtp.qq.com:465
; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used.
; Using STARTTLS on port 587 is recommended per RFC 6409.
; Note, if the port ends with "465", SMTPS will be used.
HOST =
; Disable HELO operation when hostnames are different.
DISABLE_HELO =
@ -639,11 +640,13 @@ SKIP_VERIFY =
USE_CERTIFICATE = false
CERT_FILE = custom/mailer/cert.pem
KEY_FILE = custom/mailer/key.pem
; Should SMTP connection use TLS
; Should SMTP connect with TLS, (if port ends with 465 TLS will always be used.)
; If this is false but STARTTLS is supported the connection will be upgraded to TLS opportunistically.
IS_TLS_ENABLED = false
; Mail from address, RFC 5322. This can be just an email address, or the `"Name" <email@example.com>` format
FROM =
; Mailer user name and password
; Please Note: Authentication is only supported when the SMTP server communication is encrypted with TLS (this can be via STARTTLS) or `HOST=localhost`.
USER =
; Use PASSWD = `your password` for quoting if you use special characters in the password.
PASSWD =

6
docs/content/doc/advanced/config-cheat-sheet.en-us.md
View file

@ -397,10 +397,15 @@ set name for unique queues. Individual queues will default to
- `DISABLE_HELO`: **\<empty\>**: Disable HELO operation.
- `HELO_HOSTNAME`: **\<empty\>**: Custom hostname for HELO operation.
- `HOST`: **\<empty\>**: SMTP mail host address and port (example: smtp.gitea.io:587).
- Using opportunistic TLS via STARTTLS on port 587 is recommended per RFC 6409.
- `IS_TLS_ENABLED` : **false** : Forcibly use TLS to connect even if not on a default SMTPS port.
- Note, if the port ends with `465` SMTPS/SMTP over TLS will be used despite this setting.
- Otherwise if `IS_TLS_ENABLED=false` and the server supports `STARTTLS` this will be used. Thus if `STARTTLS` is preferred you should set `IS_TLS_ENABLED=false`.
- `FROM`: **\<empty\>**: Mail from address, RFC 5322. This can be just an email address, or
the "Name" \<email@example.com\> format.
- `USER`: **\<empty\>**: Username of mailing user (usually the sender's e-mail address).
- `PASSWD`: **\<empty\>**: Password of mailing user. Use \`your password\` for quoting if you use special characters in the password.
- Please note: authentication is only supported when the SMTP server communication is encrypted with TLS (this can be via `STARTTLS`) or `HOST=localhost`. See [Email Setup]({{< relref "doc/usage/email-setup.en-us.md" >}}) for more information.
- `SKIP_VERIFY`: **\<empty\>**: Do not verify the self-signed certificates.
- **Note:** Gitea only supports SMTP with STARTTLS.
- `SUBJECT_PREFIX`: **\<empty\>**: Prefix to be placed before e-mail subject lines.
@ -415,7 +420,6 @@ set name for unique queues. Individual queues will default to
- `SENDMAIL_PATH`: **sendmail**: The location of sendmail on the operating system (can be
command or full path).
- `SENDMAIL_TIMEOUT`: **5m**: default timeout for sending email through sendmail
- ``IS_TLS_ENABLED`` : **false** : Decide if SMTP connections should use TLS.
## Cache (`cache`)

9
docs/content/doc/installation/from-package.en-us.md
View file

@ -38,10 +38,13 @@ config is found in **/etc/gitea/app.ini**
## Windows
There are no published packages for Windows. This page will change when packages are published,
in the form of `MSI` installers or via [Chocolatey](https://chocolatey.org/). In the meantime, follow
the [deployment from binary]({{< relref "from-binary.en-us.md" >}}) guide.
There is a [Gitea](https://chocolatey.org/packages/gitea) package for Windows by [Chocolatey](https://chocolatey.org/).
```sh
choco install gitea
```
Or follow the [deployment from binary]({{< relref "from-binary.en-us.md" >}}) guide.
## macOS
Currently, the only supported method of installation on MacOS is [Homebrew](http://brew.sh/).

6
docs/content/doc/usage/email-setup.en-us.md
View file

@ -46,6 +46,12 @@ PASSWD = `password`
For the full list of options check the [Config Cheat Sheet]({{< relref "doc/advanced/config-cheat-sheet.en-us.md" >}})
- Please note: authentication is only supported when the SMTP server communication is encrypted with TLS or `HOST=localhost`. TLS encryption can be through:
- Via the server supporting TLS through STARTTLS - usually provided on port 587. (Also known as Opportunistic TLS.)
- SMTPS connection (SMTP over transport layer security) via the default port 465.
- Forced SMTPS connection with `IS_TLS_ENABLED=true`. (These are both known as Implicit TLS.)
- This is due to protections imposed by the Go internal libraries against STRIPTLS attacks.
### Gmail
The following configuration should work with GMail's SMTP server:

2
models/issue.go
View file

@ -249,7 +249,7 @@ func (issue *Issue) loadReactions(e Engine) (err error) {
}
func (issue *Issue) loadMilestone(e Engine) (err error) {
if issue.Milestone == nil && issue.MilestoneID > 0 {
if (issue.Milestone == nil || issue.Milestone.ID != issue.MilestoneID) && issue.MilestoneID > 0 {
issue.Milestone, err = getMilestoneByRepoID(e, issue.RepoID, issue.MilestoneID)
if err != nil && !IsErrMilestoneNotExist(err) {
return fmt.Errorf("getMilestoneByRepoID [repo_id: %d, milestone_id: %d]: %v", issue.RepoID, issue.MilestoneID, err)

2
modules/repository/create.go
View file

@ -47,7 +47,7 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (_ *m
// No need for init mirror.
if !opts.IsMirror {
repoPath := models.RepoPath(u.Name, repo.Name)
if err = initRepository(ctx, repoPath, u, repo, opts); err != nil {
if err = initRepository(ctx, repoPath, doer, repo, opts); err != nil {
if err2 := os.RemoveAll(repoPath); err2 != nil {
log.Error("initRepository: %v", err)
return fmt.Errorf(

18
options/locale/locale_pt-PT.ini
View file

@ -863,7 +863,7 @@ issues.new.add_assignees_title=Definir responsáveis
issues.new.clear_assignees=Limpar responsáveis
issues.new.no_assignees=Sem responsáveis
issues.new.no_reviewers=Sem revisores
issues.new.add_reviewer_title=Solicitar avaliação
issues.new.add_reviewer_title=Solicitar revisão
issues.no_ref=Sem ramo ou etiqueta especificados
issues.create=Criar questão
issues.new_label=Nova etiqueta
@ -921,7 +921,7 @@ issues.action_milestone=Etapa
issues.action_milestone_no_select=Sem etapa
issues.action_assignee=Responsável
issues.action_assignee_no_select=Sem responsável
issues.opened_by=abertas %[1]s por <a href="%[2]s">%[3]s</a>
issues.opened_by=aberta %[1]s por <a href="%[2]s">%[3]s</a>
pulls.merged_by=integrados %[1]s por <a href="%[2]s">%[3]s</a>
pulls.merged_by_fake=integrados %[1]s por %[2]s
issues.closed_by=de <a href="%[2]s">%[3]s</a> fechada %[1]s
@ -958,9 +958,9 @@ issues.ref_from=`de %[1]s`
issues.poster=Autor
issues.collaborator=Colaborador(a)
issues.owner=Proprietário(a)
issues.re_request_review=Voltar a solicitar avaliação
issues.remove_request_review=Remover solicitação de avaliação
issues.remove_request_review_block=Não é possível remover a solicitação de avaliação
issues.re_request_review=Voltar a solicitar revisão
issues.remove_request_review=Remover solicitação de revisão
issues.remove_request_review_block=Não é possível remover a solicitação de revisão
issues.sign_in_require_desc=<a href="%s">Inicie a sessão</a> para participar neste diálogo.
issues.edit=Editar
issues.cancel=Cancelar
@ -1074,8 +1074,8 @@ issues.review.left_comment=deixou um comentário
issues.review.content.empty=Tem que deixar um comentário indicando a(s) alteração(ões) solicitada(s).
issues.review.reject=alterações solicitadas %s
issues.review.wait=foi solicitada para avaliação %s
issues.review.add_review_request=solicitou avaliação de %s %s
issues.review.remove_review_request=removeu a solicitação de avaliação para %s %s
issues.review.add_review_request=solicitou revisão de %s %s
issues.review.remove_review_request=removeu a solicitação de revisão para %s %s
issues.review.remove_review_request_self=recusou-se a avaliar %s
issues.review.pending=Pendente
issues.review.review=Revisão
@ -1541,7 +1541,7 @@ settings.protect_required_approvals_desc=Permitir somente a integração constan
settings.protect_approvals_whitelist_enabled=Restringir aprovações a utilizadores ou equipas da lista de permissão
settings.protect_approvals_whitelist_enabled_desc=Somente as avaliações dos utilizadores ou equipas da lista de permissão irão contar para as aprovações necessárias. Se não houver uma lista de permissão de aprovações, avaliações de qualquer pessoa com acesso de escrita contam para as aprovações necessárias.
settings.protect_approvals_whitelist_users=Avaliadores com permissão:
settings.protect_approvals_whitelist_teams=Equipas com permissão para avaliar:
settings.protect_approvals_whitelist_teams=Equipas com permissão para rever:
settings.dismiss_stale_approvals=Descartar aprovações obsoletas
settings.dismiss_stale_approvals_desc=Quando novos cometimentos que mudam o conteúdo do pedido de integração são enviados para o ramo, as aprovações antigas serão descartadas.
settings.require_signed_commits=Exigir cometimentos assinados
@ -1640,7 +1640,7 @@ diff.comment.add_single_comment=Adicionar um único comentário
diff.comment.add_review_comment=Adicionar comentário
diff.comment.start_review=Iniciar revisão
diff.comment.reply=Responder
diff.review=Avaliar
diff.review=Revisão
diff.review.header=Submeter avaliação
diff.review.placeholder=Comentário da avaliação
diff.review.comment=Comentar

3
templates/repo/issue/view_content/comments.tmpl
View file

@ -598,9 +598,6 @@
{{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}}
<div class="timeline-item event" id="{{.HashTag}}">
<span class="badge">{{svg "octicon-repo-force-push" 16}}</span>
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
<img src="{{.Poster.RelAvatarLink}}">
</a>
<span class="text grey">
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
{{ if .IsForcePush }}

4
web_src/less/_repository.less
View file

@ -1318,6 +1318,10 @@
}
}
}
.markdown {
font-size: 14px;
}
}
.filter.dropdown .menu {