Skip to content

Commit d9a8ee8

Browse files
lafrikslafriks
authored
Merge branch 'main' into reword-pr-merge-options
2 parents 0daf6bd + 24366ed commit d9a8ee8

File tree

10 files changed

+72
-42
lines changed

10 files changed

+72
-42
lines changed

‎.drone.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ trigger:
1515
steps:
1616
- name: deps-frontend
1717
pull: always
18-
image: node:16
18+
image: node:14
1919
commands:
2020
- make node_modules
2121

2222
- name: lint-frontend
23-
image: node:16
23+
image: node:14
2424
commands:
2525
- make lint-frontend
2626
depends_on: [deps-frontend]
@@ -58,7 +58,7 @@ steps:
5858
TAGS: bindata gogit sqlite sqlite_unlock_notify
5959

6060
- name: checks-frontend
61-
image: node:16
61+
image: node:14
6262
commands:
6363
- make checks-frontend
6464
depends_on: [deps-frontend]
@@ -71,13 +71,13 @@ steps:
7171
depends_on: [lint-backend]
7272

7373
- name: test-frontend
74-
image: node:16
74+
image: node:14
7575
commands:
7676
- make test-frontend
7777
depends_on: [lint-frontend]
7878

7979
- name: build-frontend
80-
image: node:16
80+
image: node:14
8181
commands:
8282
- make frontend
8383
depends_on: [test-frontend]
@@ -514,7 +514,7 @@ steps:
514514
pull: always
515515
image: techknowlogick/xgo:go-1.16.x
516516
commands:
517-
- curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
517+
- curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs
518518
- export PATH=$PATH:$GOPATH/bin
519519
- make release
520520
environment:
@@ -610,7 +610,7 @@ steps:
610610
pull: always
611611
image: techknowlogick/xgo:go-1.16.x
612612
commands:
613-
- curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
613+
- curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs
614614
- export PATH=$PATH:$GOPATH/bin
615615
- make release
616616
environment:

‎options/locale/locale_ja-JP.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,7 @@ editor.require_signed_commit=ブランチでは署名されたコミットが必
10401040
commits.desc=ソースコードの変更履歴を参照します。
10411041
commits.commits=コミット
10421042
commits.no_commits=共通のコミットはありません。 '%s' と '%s' の履歴はすべて異なっています。
1043+
commits.nothing_to_compare=二つのブランチは同じ内容です。
10431044
commits.search=コミットの検索…
10441045
commits.search.tooltip=キーワード "author:"、"committer:"、"after:"、"before:" を付けて指定できます。 例 "revert author:Alice before:2019-04-01"
10451046
commits.find=検索

‎options/locale/locale_pt-PT.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,7 @@ editor.require_signed_commit=O ramo requer um cometimento assinado
10401040
commits.desc=Navegar pelo histórico de modificações no código fonte.
10411041
commits.commits=Cometimentos
10421042
commits.no_commits=Não há cometimentos em comum. '%s' e '%s' têm históricos completamente diferentes.
1043+
commits.nothing_to_compare=Estes ramos são iguais.
10431044
commits.search=Procurar cometimentos…
10441045
commits.search.tooltip=Pode prefixar palavras-chave com "author:", "committer:", "after:", ou "before:". Por exemplo: "revert author:Alice before:2019-04-01".
10451046
commits.find=Procurar
@@ -1828,8 +1829,8 @@ settings.event_pull_request_review=Pedido de integração revisto
18281829
settings.event_pull_request_review_desc=Pedido de integração aprovado, rejeitado ou comentado na revisão.
18291830
settings.event_pull_request_sync=Pedido de integração sincronizado
18301831
settings.event_pull_request_sync_desc=Pedido de integração sincronizado.
1831-
settings.branch_filter=Filtro por ramo
1832-
settings.branch_filter_desc=Lista de permissões do ramo para eventos de envio e de criação e eliminação de ramos, especificada como um padrão glob. Se estiver em branco ou for <code>*</code>, serão reportados eventos para todos os ramos. Veja a documentação <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> para ver os detalhes da sintaxe. Exemplos: <code>trunk</code>, <code>{trunk,release*}</code>.
1832+
settings.branch_filter=Filtro de ramos
1833+
settings.branch_filter_desc=Lista dos ramos a serem considerados nos eventos de envio e de criação e eliminação de ramos, especificada como um padrão glob. Se estiver em branco ou for <code>*</code>, serão reportados eventos para todos os ramos. Veja a documentação <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> para ver os detalhes da sintaxe. Exemplos: <code>trunk</code>, <code>{trunk,release*}</code>.
18331834
settings.active=Em funcionamento
18341835
settings.active_helper=Informação sobre eventos despoletados será enviada para o URL deste automatismo web.
18351836
settings.add_hook_success=O automatismo web foi adicionado.

‎routers/api/v1/repo/topic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func UpdateTopics(ctx *context.APIContext) {
126126

127127
// AddTopic adds a topic name to a repo
128128
func AddTopic(ctx *context.APIContext) {
129-
// swagger:operation PUT /repos/{owner}/{repo}/topics/{topic} repository repoAddTopíc
129+
// swagger:operation PUT /repos/{owner}/{repo}/topics/{topic} repository repoAddTopic
130130
// ---
131131
// summary: Add a topic to a repository
132132
// produces:

‎routers/api/v1/swagger/app.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ type swaggerResponseOAuth2Application struct {
1414
// in:body
1515
Body api.OAuth2Application `json:"body"`
1616
}
17+
18+
// AccessToken represents an API access token.
19+
// swagger:response AccessToken
20+
type swaggerResponseAccessToken struct {
21+
// in:body
22+
Body api.AccessToken `json:"body"`
23+
}

‎routers/api/v1/swagger/options.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ type swaggerParameterBodies struct {
164164
// in:body
165165
CreateTagOption api.CreateTagOption
166166

167+
// in:body
168+
CreateAccessTokenOption api.CreateAccessTokenOption
169+
167170
// in:body
168171
UserSettingsOptions api.UserSettingsOptions
169172
}

‎routers/api/v1/user/app.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,10 @@ func CreateAccessToken(ctx *context.APIContext) {
7676
// description: username of user
7777
// type: string
7878
// required: true
79-
// - name: accessToken
79+
// - name: userCreateToken
8080
// in: body
8181
// schema:
82-
// type: object
83-
// required:
84-
// - name
85-
// properties:
86-
// name:
87-
// type: string
82+
// "$ref": "#/definitions/CreateAccessTokenOption"
8883
// responses:
8984
// "201":
9085
// "$ref": "#/responses/AccessToken"

‎services/wiki/wiki.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ func prepareWikiFileName(gitRepo *git.Repository, wikiName string) (bool, string
9090
// Look for both files
9191
filesInIndex, err := gitRepo.LsTree("master", unescaped, escaped)
9292
if err != nil {
93+
if strings.Contains(err.Error(), "Not a valid object name master") {
94+
return false, escaped, nil
95+
}
9396
log.Error("%v", err)
9497
return false, escaped, err
9598
}

‎services/wiki/wiki_test.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
package wiki
66

77
import (
8+
"io/ioutil"
9+
"os"
810
"path/filepath"
911
"testing"
1012

1113
"code.gitea.io/gitea/models"
1214
"code.gitea.io/gitea/modules/git"
15+
"code.gitea.io/gitea/modules/util"
16+
1317
"github.com/stretchr/testify/assert"
1418
)
1519

@@ -261,3 +265,28 @@ func TestPrepareWikiFileName(t *testing.T) {
261265
})
262266
}
263267
}
268+
269+
func TestPrepareWikiFileName_FirstPage(t *testing.T) {
270+
models.PrepareTestEnv(t)
271+
272+
// Now create a temporaryDirectory
273+
tmpDir, err := ioutil.TempDir("", "empty-wiki")
274+
assert.NoError(t, err)
275+
defer func() {
276+
if _, err := os.Stat(tmpDir); !os.IsNotExist(err) {
277+
_ = util.RemoveAll(tmpDir)
278+
}
279+
}()
280+
281+
err = git.InitRepository(tmpDir, true)
282+
assert.NoError(t, err)
283+
284+
gitRepo, err := git.OpenRepository(tmpDir)
285+
defer gitRepo.Close()
286+
assert.NoError(t, err)
287+
288+
existence, newWikiPath, err := prepareWikiFileName(gitRepo, "Home")
289+
assert.False(t, existence)
290+
assert.NoError(t, err)
291+
assert.Equal(t, "Home.md", newWikiPath)
292+
}

‎templates/swagger/v1_json.tmpl

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9651,7 +9651,7 @@
96519651
"repository"
96529652
],
96539653
"summary": "Add a topic to a repository",
9654-
"operationId": "repoAddTopíc",
9654+
"operationId": "repoAddTopic",
96559655
"parameters": [
96569656
{
96579657
"type": "string",
@@ -11917,18 +11917,10 @@
1191711917
"required": true
1191811918
},
1191911919
{
11920-
"name": "accessToken",
11920+
"name": "userCreateToken",
1192111921
"in": "body",
1192211922
"schema": {
11923-
"type": "object",
11924-
"required": [
11925-
"name"
11926-
],
11927-
"properties": {
11928-
"name": {
11929-
"type": "string"
11930-
}
11931-
}
11923+
"$ref": "#/definitions/CreateAccessTokenOption"
1193211924
}
1193311925
}
1193411926
],
@@ -12654,6 +12646,17 @@
1265412646
},
1265512647
"x-go-package": "code.gitea.io/gitea/modules/structs"
1265612648
},
12649+
"CreateAccessTokenOption": {
12650+
"description": "CreateAccessTokenOption options when create access token",
12651+
"type": "object",
12652+
"properties": {
12653+
"name": {
12654+
"type": "string",
12655+
"x-go-name": "Name"
12656+
}
12657+
},
12658+
"x-go-package": "code.gitea.io/gitea/modules/structs"
12659+
},
1265712660
"CreateBranchProtectionOption": {
1265812661
"description": "CreateBranchProtectionOption options for creating a branch protection",
1265912662
"type": "object",
@@ -17045,20 +17048,8 @@
1704517048
"responses": {
1704617049
"AccessToken": {
1704717050
"description": "AccessToken represents an API access token.",
17048-
"headers": {
17049-
"id": {
17050-
"type": "integer",
17051-
"format": "int64"
17052-
},
17053-
"name": {
17054-
"type": "string"
17055-
},
17056-
"sha1": {
17057-
"type": "string"
17058-
},
17059-
"token_last_eight": {
17060-
"type": "string"
17061-
}
17051+
"schema": {
17052+
"$ref": "#/definitions/AccessToken"
1706217053
}
1706317054
},
1706417055
"AccessTokenList": {

0 commit comments

Comments
 (0)