mirror of https://github.com/go-gitea/gitea
Compare commits
20 Commits
ca5a68c2f3
...
c61bc2e72c
Author | SHA1 | Date |
---|---|---|
silverwind | c61bc2e72c | |
Chongyi Zheng | 4ae6b1a553 | |
wxiaoguang | 7a832ef248 | |
silverwind | 9b2536b78f | |
silverwind | dcc3c17e5c | |
silverwind | 2cdda417ce | |
silverwind | 02be08f233 | |
silverwind | 424d976776 | |
silverwind | 33d4ed973f | |
silverwind | 73937a5204 | |
silverwind | 839700b923 | |
silverwind | 41bd63b6e8 | |
silverwind | 484691be05 | |
silverwind | 0dbb24635a | |
silverwind | 7e40149415 | |
silverwind | 110bc5d7ad | |
silverwind | 086231338d | |
silverwind | f6df3ef0ae | |
silverwind | 34c6e6f4b3 | |
silverwind | 2c9a036ad6 |
11
Makefile
11
Makefile
|
@ -30,7 +30,7 @@ EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-che
|
||||||
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0
|
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0
|
||||||
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
|
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
|
||||||
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11
|
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11
|
||||||
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.4.1
|
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.5.1
|
||||||
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@db51e79a0e37c572d8b59ae0c58bf2bbbbe53285
|
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@db51e79a0e37c572d8b59ae0c58bf2bbbbe53285
|
||||||
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
|
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
|
||||||
GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1
|
GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1
|
||||||
|
@ -397,11 +397,11 @@ lint-md: node_modules
|
||||||
|
|
||||||
.PHONY: lint-spell
|
.PHONY: lint-spell
|
||||||
lint-spell:
|
lint-spell:
|
||||||
@go run $(MISSPELL_PACKAGE) -error $(SPELLCHECK_FILES)
|
@go run $(MISSPELL_PACKAGE) -dict tools/misspellings.csv -error $(SPELLCHECK_FILES)
|
||||||
|
|
||||||
.PHONY: lint-spell-fix
|
.PHONY: lint-spell-fix
|
||||||
lint-spell-fix:
|
lint-spell-fix:
|
||||||
@go run $(MISSPELL_PACKAGE) -w $(SPELLCHECK_FILES)
|
@go run $(MISSPELL_PACKAGE) -dict tools/misspellings.csv -w $(SPELLCHECK_FILES)
|
||||||
|
|
||||||
.PHONY: lint-go
|
.PHONY: lint-go
|
||||||
lint-go:
|
lint-go:
|
||||||
|
@ -908,8 +908,9 @@ webpack: $(WEBPACK_DEST)
|
||||||
|
|
||||||
$(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json
|
$(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json
|
||||||
@$(MAKE) -s node-check node_modules
|
@$(MAKE) -s node-check node_modules
|
||||||
rm -rf $(WEBPACK_DEST_ENTRIES)
|
@rm -rf $(WEBPACK_DEST_ENTRIES)
|
||||||
npx webpack
|
@echo "Running webpack..."
|
||||||
|
@BROWSERSLIST_IGNORE_OLD_DATA=true npx webpack
|
||||||
@touch $(WEBPACK_DEST)
|
@touch $(WEBPACK_DEST)
|
||||||
|
|
||||||
.PHONY: svg
|
.PHONY: svg
|
||||||
|
|
|
@ -1322,7 +1322,7 @@ Defaultly every storage has their default base path like below
|
||||||
| actions_log | actions_log/ |
|
| actions_log | actions_log/ |
|
||||||
| actions_artifacts | actions_artifacts/ |
|
| actions_artifacts | actions_artifacts/ |
|
||||||
|
|
||||||
And bucket, basepath or `SERVE_DIRECT` could be special or overrided, if you want to use a different you can:
|
And bucket, basepath or `SERVE_DIRECT` could be special or overridden, if you want to use a different you can:
|
||||||
|
|
||||||
```ini
|
```ini
|
||||||
[storage.actions_log]
|
[storage.actions_log]
|
||||||
|
|
|
@ -262,11 +262,11 @@ func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID strin
|
||||||
|
|
||||||
// InsertRun inserts a run
|
// InsertRun inserts a run
|
||||||
func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWorkflow) error {
|
func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWorkflow) error {
|
||||||
ctx, commiter, err := db.TxContext(ctx)
|
ctx, committer, err := db.TxContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer commiter.Close()
|
defer committer.Close()
|
||||||
|
|
||||||
index, err := db.GetNextResourceIndex(ctx, "action_run_index", run.RepoID)
|
index, err := db.GetNextResourceIndex(ctx, "action_run_index", run.RepoID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -331,7 +331,7 @@ func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWork
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return commiter.Commit()
|
return committer.Commit()
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetRunByID(ctx context.Context, id int64) (*ActionRun, error) {
|
func GetRunByID(ctx context.Context, id int64) (*ActionRun, error) {
|
||||||
|
|
|
@ -216,11 +216,11 @@ func GetRunningTaskByToken(ctx context.Context, token string) (*ActionTask, erro
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask, bool, error) {
|
func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask, bool, error) {
|
||||||
ctx, commiter, err := db.TxContext(ctx)
|
ctx, committer, err := db.TxContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, err
|
return nil, false, err
|
||||||
}
|
}
|
||||||
defer commiter.Close()
|
defer committer.Close()
|
||||||
|
|
||||||
e := db.GetEngine(ctx)
|
e := db.GetEngine(ctx)
|
||||||
|
|
||||||
|
@ -322,7 +322,7 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask
|
||||||
|
|
||||||
task.Job = job
|
task.Job = job
|
||||||
|
|
||||||
if err := commiter.Commit(); err != nil {
|
if err := committer.Commit(); err != nil {
|
||||||
return nil, false, err
|
return nil, false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -347,11 +347,11 @@ func UpdateTaskByState(ctx context.Context, state *runnerv1.TaskState) (*ActionT
|
||||||
stepStates[v.Id] = v
|
stepStates[v.Id] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, commiter, err := db.TxContext(ctx)
|
ctx, committer, err := db.TxContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer commiter.Close()
|
defer committer.Close()
|
||||||
|
|
||||||
e := db.GetEngine(ctx)
|
e := db.GetEngine(ctx)
|
||||||
|
|
||||||
|
@ -412,7 +412,7 @@ func UpdateTaskByState(ctx context.Context, state *runnerv1.TaskState) (*ActionT
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := commiter.Commit(); err != nil {
|
if err := committer.Commit(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import (
|
||||||
|
|
||||||
// ActionTasksVersion
|
// ActionTasksVersion
|
||||||
// If both ownerID and repoID is zero, its scope is global.
|
// If both ownerID and repoID is zero, its scope is global.
|
||||||
// If ownerID is not zero and repoID is zero, its scope is org (there is no user-level runner currrently).
|
// If ownerID is not zero and repoID is zero, its scope is org (there is no user-level runner currently).
|
||||||
// If ownerID is zero and repoID is not zero, its scope is repo.
|
// If ownerID is zero and repoID is not zero, its scope is repo.
|
||||||
type ActionTasksVersion struct {
|
type ActionTasksVersion struct {
|
||||||
ID int64 `xorm:"pk autoincr"`
|
ID int64 `xorm:"pk autoincr"`
|
||||||
|
@ -73,11 +73,11 @@ func increaseTasksVersionByScope(ctx context.Context, ownerID, repoID int64) err
|
||||||
}
|
}
|
||||||
|
|
||||||
func IncreaseTaskVersion(ctx context.Context, ownerID, repoID int64) error {
|
func IncreaseTaskVersion(ctx context.Context, ownerID, repoID int64) error {
|
||||||
ctx, commiter, err := db.TxContext(ctx)
|
ctx, committer, err := db.TxContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer commiter.Close()
|
defer committer.Close()
|
||||||
|
|
||||||
// 1. increase global
|
// 1. increase global
|
||||||
if err := increaseTasksVersionByScope(ctx, 0, 0); err != nil {
|
if err := increaseTasksVersionByScope(ctx, 0, 0); err != nil {
|
||||||
|
@ -101,5 +101,5 @@ func IncreaseTaskVersion(ctx context.Context, ownerID, repoID int64) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return commiter.Commit()
|
return committer.Commit()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
-
|
-
|
||||||
id: 1
|
id: 1
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 2
|
issue_id: 2
|
||||||
index: 2
|
index: 2
|
||||||
head_repo_id: 1
|
head_repo_id: 1
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
-
|
-
|
||||||
id: 2
|
id: 2
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 3
|
issue_id: 3
|
||||||
index: 3
|
index: 3
|
||||||
head_repo_id: 1
|
head_repo_id: 1
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
-
|
-
|
||||||
id: 3
|
id: 3
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 8
|
issue_id: 8
|
||||||
index: 1
|
index: 1
|
||||||
head_repo_id: 11
|
head_repo_id: 11
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
-
|
-
|
||||||
id: 4
|
id: 4
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 9
|
issue_id: 9
|
||||||
index: 1
|
index: 1
|
||||||
head_repo_id: 48
|
head_repo_id: 48
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
-
|
-
|
||||||
id: 5 # this PR is outdated (one commit behind branch1 )
|
id: 5 # this PR is outdated (one commit behind branch1 )
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 11
|
issue_id: 11
|
||||||
index: 5
|
index: 5
|
||||||
head_repo_id: 1
|
head_repo_id: 1
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
-
|
-
|
||||||
id: 6
|
id: 6
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 12
|
issue_id: 12
|
||||||
index: 2
|
index: 2
|
||||||
head_repo_id: 3
|
head_repo_id: 3
|
||||||
|
@ -81,7 +81,7 @@
|
||||||
-
|
-
|
||||||
id: 7
|
id: 7
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 19
|
issue_id: 19
|
||||||
index: 1
|
index: 1
|
||||||
head_repo_id: 58
|
head_repo_id: 58
|
||||||
|
@ -94,7 +94,7 @@
|
||||||
-
|
-
|
||||||
id: 8
|
id: 8
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 20
|
issue_id: 20
|
||||||
index: 1
|
index: 1
|
||||||
head_repo_id: 23
|
head_repo_id: 23
|
||||||
|
@ -103,7 +103,7 @@
|
||||||
-
|
-
|
||||||
id: 9
|
id: 9
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 21
|
issue_id: 21
|
||||||
index: 1
|
index: 1
|
||||||
head_repo_id: 60
|
head_repo_id: 60
|
||||||
|
@ -112,7 +112,7 @@
|
||||||
-
|
-
|
||||||
id: 10
|
id: 10
|
||||||
type: 0 # gitea pull request
|
type: 0 # gitea pull request
|
||||||
status: 2 # mergable
|
status: 2 # mergeable
|
||||||
issue_id: 22
|
issue_id: 22
|
||||||
index: 1
|
index: 1
|
||||||
head_repo_id: 61
|
head_repo_id: 61
|
||||||
|
|
|
@ -807,7 +807,7 @@ func UpdateAllowEdits(ctx context.Context, pr *PullRequest) error {
|
||||||
|
|
||||||
// Mergeable returns if the pullrequest is mergeable.
|
// Mergeable returns if the pullrequest is mergeable.
|
||||||
func (pr *PullRequest) Mergeable(ctx context.Context) bool {
|
func (pr *PullRequest) Mergeable(ctx context.Context) bool {
|
||||||
// If a pull request isn't mergable if it's:
|
// If a pull request isn't mergeable if it's:
|
||||||
// - Being conflict checked.
|
// - Being conflict checked.
|
||||||
// - Has a conflict.
|
// - Has a conflict.
|
||||||
// - Received a error while being conflict checked.
|
// - Received a error while being conflict checked.
|
||||||
|
|
|
@ -187,8 +187,8 @@ func AddTime(ctx context.Context, user *user_model.User, issue *Issue, amount in
|
||||||
Issue: issue,
|
Issue: issue,
|
||||||
Repo: issue.Repo,
|
Repo: issue.Repo,
|
||||||
Doer: user,
|
Doer: user,
|
||||||
// Content before v1.21 did store the formated string instead of seconds,
|
// Content before v1.21 did store the formatted string instead of seconds,
|
||||||
// so use "|" as delimeter to mark the new format
|
// so use "|" as delimiter to mark the new format
|
||||||
Content: fmt.Sprintf("|%d", amount),
|
Content: fmt.Sprintf("|%d", amount),
|
||||||
Type: CommentTypeAddTimeManual,
|
Type: CommentTypeAddTimeManual,
|
||||||
TimeID: t.ID,
|
TimeID: t.ID,
|
||||||
|
@ -267,8 +267,8 @@ func DeleteIssueUserTimes(ctx context.Context, issue *Issue, user *user_model.Us
|
||||||
Issue: issue,
|
Issue: issue,
|
||||||
Repo: issue.Repo,
|
Repo: issue.Repo,
|
||||||
Doer: user,
|
Doer: user,
|
||||||
// Content before v1.21 did store the formated string instead of seconds,
|
// Content before v1.21 did store the formatted string instead of seconds,
|
||||||
// so use "|" as delimeter to mark the new format
|
// so use "|" as delimiter to mark the new format
|
||||||
Content: fmt.Sprintf("|%d", removedTime),
|
Content: fmt.Sprintf("|%d", removedTime),
|
||||||
Type: CommentTypeDeleteTimeManual,
|
Type: CommentTypeDeleteTimeManual,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
|
@ -298,8 +298,8 @@ func DeleteTime(ctx context.Context, t *TrackedTime) error {
|
||||||
Issue: t.Issue,
|
Issue: t.Issue,
|
||||||
Repo: t.Issue.Repo,
|
Repo: t.Issue.Repo,
|
||||||
Doer: t.User,
|
Doer: t.User,
|
||||||
// Content before v1.21 did store the formated string instead of seconds,
|
// Content before v1.21 did store the formatted string instead of seconds,
|
||||||
// so use "|" as delimeter to mark the new format
|
// so use "|" as delimiter to mark the new format
|
||||||
Content: fmt.Sprintf("|%d", t.Time),
|
Content: fmt.Sprintf("|%d", t.Time),
|
||||||
Type: CommentTypeDeleteTimeManual,
|
Type: CommentTypeDeleteTimeManual,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
package v1_17 //nolint
|
package v1_17 //nolint
|
||||||
|
|
||||||
// This migration added non-ideal indices to the action table which on larger datasets slowed things down
|
// This migration added non-ideal indices to the action table which on larger datasets slowed things down
|
||||||
// it has been superceded by v218.go
|
// it has been superseded by v218.go
|
||||||
|
|
|
@ -184,7 +184,7 @@ func (ref RefName) RefGroup() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// RefType returns the simple ref type of the reference, e.g. branch, tag
|
// RefType returns the simple ref type of the reference, e.g. branch, tag
|
||||||
// It's differrent from RefGroup, which is using the name of the directory under .git/refs
|
// It's different from RefGroup, which is using the name of the directory under .git/refs
|
||||||
// Here we using branch but not heads, using tag but not tags
|
// Here we using branch but not heads, using tag but not tags
|
||||||
func (ref RefName) RefType() string {
|
func (ref RefName) RefType() string {
|
||||||
var refType string
|
var refType string
|
||||||
|
|
|
@ -134,7 +134,7 @@ func (pm *Manager) AddTypedContext(parent context.Context, description, processT
|
||||||
//
|
//
|
||||||
// Most processes will not need to use the cancel function but there will be cases whereby you want to cancel the process but not immediately remove it from the
|
// Most processes will not need to use the cancel function but there will be cases whereby you want to cancel the process but not immediately remove it from the
|
||||||
// process table.
|
// process table.
|
||||||
func (pm *Manager) AddContextTimeout(parent context.Context, timeout time.Duration, description string) (ctx context.Context, cancel context.CancelFunc, finshed FinishedFunc) {
|
func (pm *Manager) AddContextTimeout(parent context.Context, timeout time.Duration, description string) (ctx context.Context, cancel context.CancelFunc, finished FinishedFunc) {
|
||||||
if timeout <= 0 {
|
if timeout <= 0 {
|
||||||
// it's meaningless to use timeout <= 0, and it must be a bug! so we must panic here to tell developers to make the timeout correct
|
// it's meaningless to use timeout <= 0, and it must be a bug! so we must panic here to tell developers to make the timeout correct
|
||||||
panic("the timeout must be greater than zero, otherwise the context will be cancelled immediately")
|
panic("the timeout must be greater than zero, otherwise the context will be cancelled immediately")
|
||||||
|
@ -142,9 +142,9 @@ func (pm *Manager) AddContextTimeout(parent context.Context, timeout time.Durati
|
||||||
|
|
||||||
ctx, cancel = context.WithTimeout(parent, timeout)
|
ctx, cancel = context.WithTimeout(parent, timeout)
|
||||||
|
|
||||||
ctx, _, finshed = pm.Add(ctx, description, cancel, NormalProcessType, true)
|
ctx, _, finished = pm.Add(ctx, description, cancel, NormalProcessType, true)
|
||||||
|
|
||||||
return ctx, cancel, finshed
|
return ctx, cancel, finished
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add create a new process
|
// Add create a new process
|
||||||
|
|
|
@ -49,9 +49,9 @@ func TestSubjectBodySeparator(t *testing.T) {
|
||||||
test("Multiple\n---\n-------\n---\nSeparators",
|
test("Multiple\n---\n-------\n---\nSeparators",
|
||||||
"Multiple\n",
|
"Multiple\n",
|
||||||
"\n-------\n---\nSeparators")
|
"\n-------\n---\nSeparators")
|
||||||
test("Insuficient\n--\nSeparators",
|
test("Insufficient\n--\nSeparators",
|
||||||
"",
|
"",
|
||||||
"Insuficient\n--\nSeparators")
|
"Insufficient\n--\nSeparators")
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestJSEscapeSafe(t *testing.T) {
|
func TestJSEscapeSafe(t *testing.T) {
|
||||||
|
|
|
@ -301,7 +301,7 @@ func (ar artifactRoutes) uploadArtifact(ctx *ArtifactContext) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// comfirmUploadArtifact comfirm upload artifact.
|
// comfirmUploadArtifact confirm upload artifact.
|
||||||
// if all chunks are uploaded, merge them to one file.
|
// if all chunks are uploaded, merge them to one file.
|
||||||
func (ar artifactRoutes) comfirmUploadArtifact(ctx *ArtifactContext) {
|
func (ar artifactRoutes) comfirmUploadArtifact(ctx *ArtifactContext) {
|
||||||
_, runID, ok := validateRunID(ctx)
|
_, runID, ok := validateRunID(ctx)
|
||||||
|
|
|
@ -36,7 +36,7 @@ var withRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar
|
||||||
uuid := request.Header().Get(uuidHeaderKey)
|
uuid := request.Header().Get(uuidHeaderKey)
|
||||||
token := request.Header().Get(tokenHeaderKey)
|
token := request.Header().Get(tokenHeaderKey)
|
||||||
// TODO: version will be removed from request header after Gitea 1.20 released.
|
// TODO: version will be removed from request header after Gitea 1.20 released.
|
||||||
// And Gitea will not try to read version from reuqest header
|
// And Gitea will not try to read version from request header
|
||||||
version := request.Header().Get(versionHeaderKey)
|
version := request.Header().Get(versionHeaderKey)
|
||||||
|
|
||||||
runner, err := actions_model.GetRunnerByUUID(ctx, uuid)
|
runner, err := actions_model.GetRunnerByUUID(ctx, uuid)
|
||||||
|
@ -53,7 +53,7 @@ var withRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar
|
||||||
cols := []string{"last_online"}
|
cols := []string{"last_online"}
|
||||||
|
|
||||||
// TODO: version will be removed from request header after Gitea 1.20 released.
|
// TODO: version will be removed from request header after Gitea 1.20 released.
|
||||||
// And Gitea will not try to read version from reuqest header
|
// And Gitea will not try to read version from request header
|
||||||
version, _ = util.SplitStringAtByteN(version, 64)
|
version, _ = util.SplitStringAtByteN(version, 64)
|
||||||
if !util.IsEmptyString(version) && runner.Version != version {
|
if !util.IsEmptyString(version) && runner.Version != version {
|
||||||
runner.Version = version
|
runner.Version = version
|
||||||
|
|
|
@ -19,7 +19,7 @@ The package registry code is divided into multiple modules to split the function
|
||||||
|
|
||||||
## Models
|
## Models
|
||||||
|
|
||||||
Every package registry implementation uses the same underlaying models:
|
Every package registry implementation uses the same underlying models:
|
||||||
|
|
||||||
| Model | Description |
|
| Model | Description |
|
||||||
| - | - |
|
| - | - |
|
||||||
|
|
|
@ -12,7 +12,7 @@ import (
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RegistrationToken is response related to registeration token
|
// RegistrationToken is response related to registration token
|
||||||
// swagger:response RegistrationToken
|
// swagger:response RegistrationToken
|
||||||
type RegistrationToken struct {
|
type RegistrationToken struct {
|
||||||
Token string `json:"token"`
|
Token string `json:"token"`
|
||||||
|
|
|
@ -359,7 +359,7 @@ func preReceiveBranch(ctx *preReceiveContext, oldCommitID, newCommitID string, r
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log.Error("Unable to check if mergable: protected branch %s in %-v and pr #%d. Error: %v", ctx.opts.UserID, branchName, repo, pr.Index, err)
|
log.Error("Unable to check if mergeable: protected branch %s in %-v and pr #%d. Error: %v", ctx.opts.UserID, branchName, repo, pr.Index, err)
|
||||||
ctx.JSON(http.StatusInternalServerError, private.Response{
|
ctx.JSON(http.StatusInternalServerError, private.Response{
|
||||||
Err: fmt.Sprintf("Unable to get status of pull request %d. Error: %v", ctx.opts.PullRequestID, err),
|
Err: fmt.Sprintf("Unable to get status of pull request %d. Error: %v", ctx.opts.PullRequestID, err),
|
||||||
})
|
})
|
||||||
|
|
|
@ -30,7 +30,7 @@ func Organizations(ctx *context.Context) {
|
||||||
explore.RenderUserSearch(ctx, &user_model.SearchUserOptions{
|
explore.RenderUserSearch(ctx, &user_model.SearchUserOptions{
|
||||||
Actor: ctx.Doer,
|
Actor: ctx.Doer,
|
||||||
Type: user_model.UserTypeOrganization,
|
Type: user_model.UserTypeOrganization,
|
||||||
IncludeReserved: true, // administrator needs to list all acounts include reserved
|
IncludeReserved: true, // administrator needs to list all accounts include reserved
|
||||||
ListOptions: db.ListOptions{
|
ListOptions: db.ListOptions{
|
||||||
PageSize: setting.UI.Admin.OrgPagingNum,
|
PageSize: setting.UI.Admin.OrgPagingNum,
|
||||||
},
|
},
|
||||||
|
|
|
@ -81,7 +81,7 @@ func Users(ctx *context.Context) {
|
||||||
IsRestricted: util.OptionalBoolParse(statusFilterMap["is_restricted"]),
|
IsRestricted: util.OptionalBoolParse(statusFilterMap["is_restricted"]),
|
||||||
IsTwoFactorEnabled: util.OptionalBoolParse(statusFilterMap["is_2fa_enabled"]),
|
IsTwoFactorEnabled: util.OptionalBoolParse(statusFilterMap["is_2fa_enabled"]),
|
||||||
IsProhibitLogin: util.OptionalBoolParse(statusFilterMap["is_prohibit_login"]),
|
IsProhibitLogin: util.OptionalBoolParse(statusFilterMap["is_prohibit_login"]),
|
||||||
IncludeReserved: true, // administrator needs to list all acounts include reserved, bot, remote ones
|
IncludeReserved: true, // administrator needs to list all accounts include reserved, bot, remote ones
|
||||||
ExtraParamStrings: extraParamStrings,
|
ExtraParamStrings: extraParamStrings,
|
||||||
}, tplUsers)
|
}, tplUsers)
|
||||||
}
|
}
|
||||||
|
|
|
@ -812,7 +812,7 @@ func CompareDiff(ctx *context.Context) {
|
||||||
// applicable if you have one commit to compare and that commit has a message.
|
// applicable if you have one commit to compare and that commit has a message.
|
||||||
// In that case the commit message will be prepend to the template body.
|
// In that case the commit message will be prepend to the template body.
|
||||||
if templateContent, ok := ctx.Data[pullRequestTemplateKey].(string); ok && templateContent != "" {
|
if templateContent, ok := ctx.Data[pullRequestTemplateKey].(string); ok && templateContent != "" {
|
||||||
// Re-use the same key as that's priortized over the "content" key.
|
// Re-use the same key as that's prioritized over the "content" key.
|
||||||
// Add two new lines between the content to ensure there's always at least
|
// Add two new lines between the content to ensure there's always at least
|
||||||
// one empty line between them.
|
// one empty line between them.
|
||||||
ctx.Data[pullRequestTemplateKey] = content + "\n\n" + templateContent
|
ctx.Data[pullRequestTemplateKey] = content + "\n\n" + templateContent
|
||||||
|
|
|
@ -419,11 +419,9 @@ func DiffPreviewPost(ctx *context.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if diff.NumFiles == 0 {
|
if diff.NumFiles != 0 {
|
||||||
ctx.PlainText(http.StatusOK, ctx.Locale.TrString("repo.editor.no_changes_to_show"))
|
ctx.Data["File"] = diff.Files[0]
|
||||||
return
|
|
||||||
}
|
}
|
||||||
ctx.Data["File"] = diff.Files[0]
|
|
||||||
|
|
||||||
ctx.HTML(http.StatusOK, tplEditDiffPreview)
|
ctx.HTML(http.StatusOK, tplEditDiffPreview)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1760,8 +1760,8 @@ func ViewIssue(ctx *context.Context) {
|
||||||
// drop error since times could be pruned from DB..
|
// drop error since times could be pruned from DB..
|
||||||
_ = comment.LoadTime(ctx)
|
_ = comment.LoadTime(ctx)
|
||||||
if comment.Content != "" {
|
if comment.Content != "" {
|
||||||
// Content before v1.21 did store the formated string instead of seconds,
|
// Content before v1.21 did store the formatted string instead of seconds,
|
||||||
// so "|" is used as delimeter to mark the new format
|
// so "|" is used as delimiter to mark the new format
|
||||||
if comment.Content[0] != '|' {
|
if comment.Content[0] != '|' {
|
||||||
// handle old time comments that have formatted text stored
|
// handle old time comments that have formatted text stored
|
||||||
comment.RenderedContent = templates.SanitizeHTML(comment.Content)
|
comment.RenderedContent = templates.SanitizeHTML(comment.Content)
|
||||||
|
|
|
@ -72,8 +72,8 @@ func ToTimelineComment(ctx context.Context, repo *repo_model.Repository, c *issu
|
||||||
c.Type == issues_model.CommentTypeStopTracking ||
|
c.Type == issues_model.CommentTypeStopTracking ||
|
||||||
c.Type == issues_model.CommentTypeDeleteTimeManual) &&
|
c.Type == issues_model.CommentTypeDeleteTimeManual) &&
|
||||||
c.Content[0] == '|' {
|
c.Content[0] == '|' {
|
||||||
// TimeTracking Comments from v1.21 on store the seconds instead of an formated string
|
// TimeTracking Comments from v1.21 on store the seconds instead of an formatted string
|
||||||
// so we check for the "|" delimeter and convert new to legacy format on demand
|
// so we check for the "|" delimiter and convert new to legacy format on demand
|
||||||
c.Content = util.SecToTime(c.Content[1:])
|
c.Content = util.SecToTime(c.Content[1:])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -229,12 +229,12 @@ func TeamReviewRequest(ctx context.Context, issue *issues_model.Issue, doer *use
|
||||||
return comment, teamReviewRequestNotify(ctx, issue, doer, reviewer, isAdd, comment)
|
return comment, teamReviewRequestNotify(ctx, issue, doer, reviewer, isAdd, comment)
|
||||||
}
|
}
|
||||||
|
|
||||||
func ReviewRequestNotify(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, reviewNotifers []*ReviewRequestNotifier) {
|
func ReviewRequestNotify(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, reviewNotifiers []*ReviewRequestNotifier) {
|
||||||
for _, reviewNotifer := range reviewNotifers {
|
for _, reviewNotifier := range reviewNotifiers {
|
||||||
if reviewNotifer.Reviwer != nil {
|
if reviewNotifier.Reviewer != nil {
|
||||||
notify_service.PullRequestReviewRequest(ctx, issue.Poster, issue, reviewNotifer.Reviwer, reviewNotifer.IsAdd, reviewNotifer.Comment)
|
notify_service.PullRequestReviewRequest(ctx, issue.Poster, issue, reviewNotifier.Reviewer, reviewNotifier.IsAdd, reviewNotifier.Comment)
|
||||||
} else if reviewNotifer.ReviewTeam != nil {
|
} else if reviewNotifier.ReviewTeam != nil {
|
||||||
if err := teamReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifer.ReviewTeam, reviewNotifer.IsAdd, reviewNotifer.Comment); err != nil {
|
if err := teamReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifier.ReviewTeam, reviewNotifier.IsAdd, reviewNotifier.Comment); err != nil {
|
||||||
log.Error("teamReviewRequestNotify: %v", err)
|
log.Error("teamReviewRequestNotify: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,17 +90,17 @@ func ChangeTitle(ctx context.Context, issue *issues_model.Issue, doer *user_mode
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
var reviewNotifers []*ReviewRequestNotifier
|
var reviewNotifiers []*ReviewRequestNotifier
|
||||||
if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issues_model.HasWorkInProgressPrefix(title) {
|
if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issues_model.HasWorkInProgressPrefix(title) {
|
||||||
var err error
|
var err error
|
||||||
reviewNotifers, err = PullRequestCodeOwnersReview(ctx, issue, issue.PullRequest)
|
reviewNotifiers, err = PullRequestCodeOwnersReview(ctx, issue, issue.PullRequest)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("PullRequestCodeOwnersReview: %v", err)
|
log.Error("PullRequestCodeOwnersReview: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
notify_service.IssueChangeTitle(ctx, doer, issue, oldTitle)
|
notify_service.IssueChangeTitle(ctx, doer, issue, oldTitle)
|
||||||
ReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifers)
|
ReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifiers)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ func getMergeBase(repo *git.Repository, pr *issues_model.PullRequest, baseBranch
|
||||||
type ReviewRequestNotifier struct {
|
type ReviewRequestNotifier struct {
|
||||||
Comment *issues_model.Comment
|
Comment *issues_model.Comment
|
||||||
IsAdd bool
|
IsAdd bool
|
||||||
Reviwer *user_model.User
|
Reviewer *user_model.User
|
||||||
ReviewTeam *org_model.Team
|
ReviewTeam *org_model.Team
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,9 +124,9 @@ func PullRequestCodeOwnersReview(ctx context.Context, issue *issues_model.Issue,
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
notifiers = append(notifiers, &ReviewRequestNotifier{
|
notifiers = append(notifiers, &ReviewRequestNotifier{
|
||||||
Comment: comment,
|
Comment: comment,
|
||||||
IsAdd: true,
|
IsAdd: true,
|
||||||
Reviwer: u,
|
Reviewer: u,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
|
||||||
}
|
}
|
||||||
log.Trace("Doing: Update")
|
log.Trace("Doing: Update")
|
||||||
|
|
||||||
handler := func(idx int, bean any) error {
|
handler := func(bean any) error {
|
||||||
var repo *repo_model.Repository
|
var repo *repo_model.Repository
|
||||||
var mirrorType SyncType
|
var mirrorType SyncType
|
||||||
var referenceID int64
|
var referenceID int64
|
||||||
|
@ -91,7 +91,7 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
|
||||||
pullMirrorsRequested := 0
|
pullMirrorsRequested := 0
|
||||||
if pullLimit != 0 {
|
if pullLimit != 0 {
|
||||||
if err := repo_model.MirrorsIterate(ctx, pullLimit, func(idx int, bean any) error {
|
if err := repo_model.MirrorsIterate(ctx, pullLimit, func(idx int, bean any) error {
|
||||||
if err := handler(idx, bean); err != nil {
|
if err := handler(bean); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
pullMirrorsRequested++
|
pullMirrorsRequested++
|
||||||
|
@ -105,7 +105,7 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
|
||||||
pushMirrorsRequested := 0
|
pushMirrorsRequested := 0
|
||||||
if pushLimit != 0 {
|
if pushLimit != 0 {
|
||||||
if err := repo_model.PushMirrorsIterate(ctx, pushLimit, func(idx int, bean any) error {
|
if err := repo_model.PushMirrorsIterate(ctx, pushLimit, func(idx int, bean any) error {
|
||||||
if err := handler(idx, bean); err != nil {
|
if err := handler(bean); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
pushMirrorsRequested++
|
pushMirrorsRequested++
|
||||||
|
|
|
@ -466,7 +466,7 @@ func SyncPullMirror(ctx context.Context, repoID int64) bool {
|
||||||
|
|
||||||
log.Trace("SyncMirrors [repo: %-v]: %d branches updated", m.Repo, len(results))
|
log.Trace("SyncMirrors [repo: %-v]: %d branches updated", m.Repo, len(results))
|
||||||
if len(results) > 0 {
|
if len(results) > 0 {
|
||||||
if ok := checkAndUpdateEmptyRepository(ctx, m, gitRepo, results); !ok {
|
if ok := checkAndUpdateEmptyRepository(ctx, m, results); !ok {
|
||||||
log.Error("SyncMirrors [repo: %-v]: checkAndUpdateEmptyRepository: %v", m.Repo, err)
|
log.Error("SyncMirrors [repo: %-v]: checkAndUpdateEmptyRepository: %v", m.Repo, err)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -564,7 +564,7 @@ func SyncPullMirror(ctx context.Context, repoID int64) bool {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, gitRepo *git.Repository, results []*mirrorSyncResult) bool {
|
func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, results []*mirrorSyncResult) bool {
|
||||||
if !m.Repo.IsEmpty {
|
if !m.Repo.IsEmpty {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,11 +20,11 @@ import (
|
||||||
|
|
||||||
// DeleteOrganization completely and permanently deletes everything of organization.
|
// DeleteOrganization completely and permanently deletes everything of organization.
|
||||||
func DeleteOrganization(ctx context.Context, org *org_model.Organization, purge bool) error {
|
func DeleteOrganization(ctx context.Context, org *org_model.Organization, purge bool) error {
|
||||||
ctx, commiter, err := db.TxContext(ctx)
|
ctx, committer, err := db.TxContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer commiter.Close()
|
defer committer.Close()
|
||||||
|
|
||||||
if purge {
|
if purge {
|
||||||
err := repo_service.DeleteOwnerRepositoriesDirectly(ctx, org.AsUser())
|
err := repo_service.DeleteOwnerRepositoriesDirectly(ctx, org.AsUser())
|
||||||
|
@ -52,7 +52,7 @@ func DeleteOrganization(ctx context.Context, org *org_model.Organization, purge
|
||||||
return fmt.Errorf("DeleteOrganization: %w", err)
|
return fmt.Errorf("DeleteOrganization: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := commiter.Commit(); err != nil {
|
if err := committer.Commit(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ const (
|
||||||
MergeCheckTypeAuto // Auto Merge (Scheduled Merge) After Checks Succeed
|
MergeCheckTypeAuto // Auto Merge (Scheduled Merge) After Checks Succeed
|
||||||
)
|
)
|
||||||
|
|
||||||
// CheckPullMergable check if the pull mergable based on all conditions (branch protection, merge options, ...)
|
// CheckPullMergable check if the pull mergeable based on all conditions (branch protection, merge options, ...)
|
||||||
func CheckPullMergable(stdCtx context.Context, doer *user_model.User, perm *access_model.Permission, pr *issues_model.PullRequest, mergeCheckType MergeCheckType, adminSkipProtectionCheck bool) error {
|
func CheckPullMergable(stdCtx context.Context, doer *user_model.User, perm *access_model.Permission, pr *issues_model.PullRequest, mergeCheckType MergeCheckType, adminSkipProtectionCheck bool) error {
|
||||||
return db.WithTx(stdCtx, func(ctx context.Context) error {
|
return db.WithTx(stdCtx, func(ctx context.Context) error {
|
||||||
if pr.HasMerged {
|
if pr.HasMerged {
|
||||||
|
|
|
@ -46,7 +46,7 @@ func getCommitIDsFromRepo(ctx context.Context, repo *repo_model.Repository, oldC
|
||||||
return commitIDs, isForcePush, err
|
return commitIDs, isForcePush, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find commits between new and old commit exclusing base branch commits
|
// Find commits between new and old commit excluding base branch commits
|
||||||
commits, err := gitRepo.CommitsBetweenNotBase(newCommit, oldCommit, baseBranch)
|
commits, err := gitRepo.CommitsBetweenNotBase(newCommit, oldCommit, baseBranch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, err
|
return nil, false, err
|
||||||
|
|
|
@ -77,7 +77,7 @@ func NewPullRequest(ctx context.Context, repo *repo_model.Repository, issue *iss
|
||||||
}
|
}
|
||||||
defer baseGitRepo.Close()
|
defer baseGitRepo.Close()
|
||||||
|
|
||||||
var reviewNotifers []*issue_service.ReviewRequestNotifier
|
var reviewNotifiers []*issue_service.ReviewRequestNotifier
|
||||||
if err := db.WithTx(ctx, func(ctx context.Context) error {
|
if err := db.WithTx(ctx, func(ctx context.Context) error {
|
||||||
if err := issues_model.NewPullRequest(ctx, repo, issue, labelIDs, uuids, pr); err != nil {
|
if err := issues_model.NewPullRequest(ctx, repo, issue, labelIDs, uuids, pr); err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -137,7 +137,7 @@ func NewPullRequest(ctx context.Context, repo *repo_model.Repository, issue *iss
|
||||||
}
|
}
|
||||||
|
|
||||||
if !pr.IsWorkInProgress(ctx) {
|
if !pr.IsWorkInProgress(ctx) {
|
||||||
reviewNotifers, err = issue_service.PullRequestCodeOwnersReview(ctx, issue, pr)
|
reviewNotifiers, err = issue_service.PullRequestCodeOwnersReview(ctx, issue, pr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -152,7 +152,7 @@ func NewPullRequest(ctx context.Context, repo *repo_model.Repository, issue *iss
|
||||||
}
|
}
|
||||||
baseGitRepo.Close() // close immediately to avoid notifications will open the repository again
|
baseGitRepo.Close() // close immediately to avoid notifications will open the repository again
|
||||||
|
|
||||||
issue_service.ReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifers)
|
issue_service.ReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifiers)
|
||||||
|
|
||||||
mentions, err := issues_model.FindAndUpdateIssueMentions(ctx, issue, issue.Poster, issue.Content)
|
mentions, err := issues_model.FindAndUpdateIssueMentions(ctx, issue, issue.Poster, issue.Content)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<div class="ui ten wide column">
|
<div class="ui ten wide column">
|
||||||
{{template "org/team/navbar" .}}
|
{{template "org/team/navbar" .}}
|
||||||
{{if .IsOrganizationOwner}}
|
{{if .IsOrganizationOwner}}
|
||||||
<div class="ui attached segment">
|
<div class="ui top attached segment">
|
||||||
<form class="ui form ignore-dirty tw-flex tw-flex-wrap tw-gap-2" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post">
|
<form class="ui form ignore-dirty tw-flex tw-flex-wrap tw-gap-2" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post">
|
||||||
{{.CsrfTokenHtml}}
|
{{.CsrfTokenHtml}}
|
||||||
<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
|
<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
<div class="ui attached segment">
|
<div class="ui{{if not .IsOrganizationOwner}} top{{end}} attached segment">
|
||||||
<div class="flex-list">
|
<div class="flex-list">
|
||||||
{{range .Team.Members}}
|
{{range .Team.Members}}
|
||||||
<div class="flex-item tw-items-center">
|
<div class="flex-item tw-items-center">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="ui top attached tabular menu org-team-navbar">
|
<div class="ui compact small menu small-menu-items org-team-navbar">
|
||||||
<a class="item{{if .PageIsOrgTeamMembers}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}">{{svg "octicon-person"}} <strong>{{.Team.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}</a>
|
<a class="item{{if .PageIsOrgTeamMembers}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}">{{svg "octicon-person"}} <strong>{{.Team.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}</a>
|
||||||
<a class="item{{if .PageIsOrgTeamRepos}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/repositories">{{svg "octicon-repo"}} <strong>{{.Team.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}</a>
|
<a class="item{{if .PageIsOrgTeamRepos}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/repositories">{{svg "octicon-repo"}} <strong>{{.Team.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
<div class="ui attached segment">
|
<div class="ui{{if not $canAddRemove}} top{{end}} attached segment">
|
||||||
<div class="flex-list">
|
<div class="flex-list">
|
||||||
{{range .Team.Repos}}
|
{{range .Team.Repos}}
|
||||||
<div class="flex-item tw-items-center">
|
<div class="flex-item tw-items-center">
|
||||||
|
|
|
@ -139,7 +139,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
{{template "repo/commit_load_branches_and_tags" .}}
|
{{template "repo/commit_load_branches_and_tags" .}}
|
||||||
</div>
|
</div>
|
||||||
<div class="ui attached segment tw-flex tw-items-center tw-justify-between tw-py-1 commit-header-row tw-flex-wrap {{$class}}">
|
<div class="ui{{if not .Commit.Signature}} bottom{{end}} attached segment tw-flex tw-items-center tw-justify-between tw-py-1 commit-header-row tw-flex-wrap {{$class}}">
|
||||||
<div class="tw-flex tw-items-center author">
|
<div class="tw-flex tw-items-center author">
|
||||||
{{if .Author}}
|
{{if .Author}}
|
||||||
{{ctx.AvatarUtils.Avatar .Author 28 "tw-mr-2"}}
|
{{ctx.AvatarUtils.Avatar .Author 28 "tw-mr-2"}}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{{if .File}}
|
||||||
<div class="diff-file-box">
|
<div class="diff-file-box">
|
||||||
<div class="ui attached table segment">
|
<div class="ui attached table segment">
|
||||||
<div class="file-body file-code code-diff code-diff-unified unicode-escaped">
|
<div class="file-body file-code code-diff code-diff-unified unicode-escaped">
|
||||||
|
@ -9,3 +10,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{{else}}
|
||||||
|
<div class="tw-p-6">
|
||||||
|
{{ctx.Locale.Tr "repo.editor.no_changes_to_show"}}
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
|
|
@ -26,14 +26,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff">
|
<div class="ui compact small menu small-menu-items repo-editor-menu" data-write="write" data-preview="preview" data-diff="diff">
|
||||||
<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
|
<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
|
||||||
<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
|
<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
|
||||||
{{if not .IsNewFile}}
|
{{if not .IsNewFile}}
|
||||||
<a class="item" data-tab="diff" hx-params="context,content" hx-vals='{"context":"{{.BranchLink}}"}' hx-include="#edit_area" hx-swap="innerHTML" hx-target=".tab[data-tab='diff']" hx-indicator=".tab[data-tab='diff']" hx-post="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
|
<a class="item" data-tab="diff" hx-params="context,content" hx-vals='{"context":"{{.BranchLink}}"}' hx-include="#edit_area" hx-swap="innerHTML" hx-target=".tab[data-tab='diff']" hx-indicator=".tab[data-tab='diff']" hx-post="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div class="ui bottom attached active tab segment" data-tab="write">
|
<div class="ui active tab segment tw-rounded" data-tab="write">
|
||||||
<textarea id="edit_area" name="content" class="tw-hidden" data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
|
<textarea id="edit_area" name="content" class="tw-hidden" data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
|
||||||
data-url="{{.Repository.Link}}/markup"
|
data-url="{{.Repository.Link}}/markup"
|
||||||
data-context="{{.RepoLink}}"
|
data-context="{{.RepoLink}}"
|
||||||
|
@ -41,10 +41,10 @@
|
||||||
data-line-wrap-extensions="{{.LineWrapExtensions}}">{{.FileContent}}</textarea>
|
data-line-wrap-extensions="{{.LineWrapExtensions}}">{{.FileContent}}</textarea>
|
||||||
<div class="editor-loading is-loading"></div>
|
<div class="editor-loading is-loading"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui bottom attached tab segment markup" data-tab="preview">
|
<div class="ui tab segment markup tw-rounded" data-tab="preview">
|
||||||
{{ctx.Locale.Tr "loading"}}
|
{{ctx.Locale.Tr "loading"}}
|
||||||
</div>
|
</div>
|
||||||
<div class="ui bottom attached tab segment diff edit-diff" data-tab="diff">
|
<div class="ui tab segment diff edit-diff tw-text-center" data-tab="diff">
|
||||||
<div class="tw-p-16"></div>
|
<div class="tw-p-16"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,24 +1,21 @@
|
||||||
<div class="ui centered grid">
|
<div class="ui centered grid">
|
||||||
<div class="twelve wide computer column">
|
<div class="twelve wide computer column">
|
||||||
<div class="ui attached left aligned segment">
|
<p>{{ctx.Locale.Tr "repo.issues.label_templates.info"}}</p>
|
||||||
<p>{{ctx.Locale.Tr "repo.issues.label_templates.info"}}</p>
|
<form class="ui form center" action="{{.Link}}/initialize" method="post">
|
||||||
<br>
|
{{.CsrfTokenHtml}}
|
||||||
<form class="ui form center" action="{{.Link}}/initialize" method="post">
|
<div class="field">
|
||||||
{{.CsrfTokenHtml}}
|
<div class="ui selection dropdown">
|
||||||
<div class="field">
|
<input type="hidden" name="template_name" value="Default">
|
||||||
<div class="ui selection dropdown">
|
<div class="default text">{{ctx.Locale.Tr "repo.issues.label_templates.helper"}}</div>
|
||||||
<input type="hidden" name="template_name" value="Default">
|
<div class="menu">
|
||||||
<div class="default text">{{ctx.Locale.Tr "repo.issues.label_templates.helper"}}</div>
|
{{range .LabelTemplateFiles}}
|
||||||
<div class="menu">
|
<div class="item" data-value="{{.DisplayName}}">{{.DisplayName}}<br><i>({{.Description}})</i></div>
|
||||||
{{range .LabelTemplateFiles}}
|
{{end}}
|
||||||
<div class="item" data-value="{{.DisplayName}}">{{.DisplayName}}<br><i>({{.Description}})</i></div>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
{{svg "octicon-triangle-down" 18 "dropdown icon"}}
|
|
||||||
</div>
|
</div>
|
||||||
|
{{svg "octicon-triangle-down" 18 "dropdown icon"}}
|
||||||
</div>
|
</div>
|
||||||
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "repo.issues.label_templates.use"}}</button>
|
</div>
|
||||||
</form>
|
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "repo.issues.label_templates.use"}}</button>
|
||||||
</div>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
{{template "repo/migrate/helper" .}}
|
{{template "repo/migrate/helper" .}}
|
||||||
<div class="ui cards migrate-entries">
|
<div class="ui cards migrate-entries">
|
||||||
{{range .Services}}
|
{{range .Services}}
|
||||||
<a class="ui card migrate-entry tw-flex tw-items-center" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}">
|
<a class="ui card migrate-entry tw-flex tw-items-center tw-rounded" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}">
|
||||||
{{if eq .Name "github"}}
|
{{if eq .Name "github"}}
|
||||||
{{svg "octicon-mark-github" 184 "tw-p-4"}}
|
{{svg "octicon-mark-github" 184 "tw-p-4"}}
|
||||||
{{else if eq .Name "gitlab"}}
|
{{else if eq .Name "gitlab"}}
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
<div class="ui container">
|
<div class="ui container">
|
||||||
{{template "base/alert" .}}
|
{{template "base/alert" .}}
|
||||||
{{template "repo/release_tag_header" .}}
|
{{template "repo/release_tag_header" .}}
|
||||||
|
{{if .Releases}}
|
||||||
<h4 class="ui top attached header">
|
<h4 class="ui top attached header">
|
||||||
<div class="five wide column tw-flex tw-items-center">
|
<div class="five wide column tw-flex tw-items-center">
|
||||||
{{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.tags"}}
|
{{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.tags"}}
|
||||||
|
@ -57,6 +58,7 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
{{template "base/paginate" .}}
|
{{template "base/paginate" .}}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div id="profile-avatar-card" class="ui card">
|
<div id="profile-avatar-card" class="ui card tw-rounded">
|
||||||
<div id="profile-avatar" class="content tw-flex">
|
<div id="profile-avatar" class="content tw-flex">
|
||||||
{{if eq .SignedUserID .ContextUser.ID}}
|
{{if eq .SignedUserID .ContextUser.ID}}
|
||||||
<a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{ctx.Locale.Tr "user.change_avatar"}}">
|
<a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{ctx.Locale.Tr "user.change_avatar"}}">
|
||||||
|
|
|
@ -25282,7 +25282,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"RegistrationToken": {
|
"RegistrationToken": {
|
||||||
"description": "RegistrationToken is response related to registeration token",
|
"description": "RegistrationToken is response related to registration token",
|
||||||
"headers": {
|
"headers": {
|
||||||
"token": {
|
"token": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{{template "base/head" .}}
|
{{template "base/head" .}}
|
||||||
<div role="main" aria-label="{{.Title}}" class="page-content user notification">
|
<div role="main" aria-label="{{.Title}}" class="page-content user notification">
|
||||||
<div class="ui container">
|
<div class="ui container">
|
||||||
<div class="ui top attached tabular menu">
|
<div class="ui compact small menu small-menu-items">
|
||||||
<a href="{{AppSubUrl}}/notifications/subscriptions" class="{{if eq .Status 1}}active {{end}}item">
|
<a href="{{AppSubUrl}}/notifications/subscriptions" class="{{if eq .Status 1}}active {{end}}item">
|
||||||
{{ctx.Locale.Tr "notification.subscriptions"}}
|
{{ctx.Locale.Tr "notification.subscriptions"}}
|
||||||
</a>
|
</a>
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
{{ctx.Locale.Tr "notification.watching"}}
|
{{ctx.Locale.Tr "notification.watching"}}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui bottom attached active tab segment">
|
<div class="ui top attached active tab segment">
|
||||||
{{if eq .Status 1}}
|
{{if eq .Status 1}}
|
||||||
<div class="tw-flex tw-justify-between">
|
<div class="tw-flex tw-justify-between">
|
||||||
<div class="tw-flex">
|
<div class="tw-flex">
|
||||||
|
|
|
@ -111,7 +111,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui attached bottom segment">
|
<div class="ui bottom attached segment">
|
||||||
<form class="ui form" action="{{AppSubUrl}}/user/settings/account/email" method="post">
|
<form class="ui form" action="{{AppSubUrl}}/user/settings/account/email" method="post">
|
||||||
{{.CsrfTokenHtml}}
|
{{.CsrfTokenHtml}}
|
||||||
<div class="required field {{if .Err_Email}}error{{end}}">
|
<div class="required field {{if .Err_Email}}error{{end}}">
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui attached bottom segment">
|
<div class="ui bottom attached segment">
|
||||||
<h5 class="ui top header">
|
<h5 class="ui top header">
|
||||||
{{ctx.Locale.Tr "settings.generate_new_token"}}
|
{{ctx.Locale.Tr "settings.generate_new_token"}}
|
||||||
</h5>
|
</h5>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui attached bottom segment">
|
<div class="ui bottom attached segment">
|
||||||
<form class="ui form ignore-dirty" action="{{.FormActionPath}}" method="post">
|
<form class="ui form ignore-dirty" action="{{.FormActionPath}}" method="post">
|
||||||
{{.CsrfTokenHtml}}
|
{{.CsrfTokenHtml}}
|
||||||
<div class="field {{if .Err_AppName}}error{{end}}">
|
<div class="field {{if .Err_AppName}}error{{end}}">
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="ui attached bottom segment">
|
<div class="ui bottom attached segment">
|
||||||
<h5 class="ui top header">
|
<h5 class="ui top header">
|
||||||
{{ctx.Locale.Tr "settings.create_oauth2_application"}}
|
{{ctx.Locale.Tr "settings.create_oauth2_application"}}
|
||||||
</h5>
|
</h5>
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui attached bottom segment">
|
<div class="ui bottom attached segment">
|
||||||
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/openid" method="post">
|
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/openid" method="post">
|
||||||
{{.CsrfTokenHtml}}
|
{{.CsrfTokenHtml}}
|
||||||
<div class="required field {{if .Err_OpenID}}error{{end}}">
|
<div class="required field {{if .Err_OpenID}}error{{end}}">
|
||||||
|
|
|
@ -119,9 +119,9 @@ func TestAPIRepoIssueConfigPaths(t *testing.T) {
|
||||||
".github/issue_template/config",
|
".github/issue_template/config",
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, canidate := range templateConfigCandidates {
|
for _, candidate := range templateConfigCandidates {
|
||||||
for _, extension := range []string{".yaml", ".yml"} {
|
for _, extension := range []string{".yaml", ".yml"} {
|
||||||
fullPath := canidate + extension
|
fullPath := candidate + extension
|
||||||
t.Run(fullPath, func(t *testing.T) {
|
t.Run(fullPath, func(t *testing.T) {
|
||||||
configMap := make(map[string]any)
|
configMap := make(map[string]any)
|
||||||
configMap["blank_issues_enabled"] = false
|
configMap["blank_issues_enabled"] = false
|
||||||
|
|
|
@ -67,7 +67,7 @@ func TestCompareBranches(t *testing.T) {
|
||||||
|
|
||||||
session := loginUser(t, "user2")
|
session := loginUser(t, "user2")
|
||||||
|
|
||||||
// Inderect compare remove-files-b (head) with add-csv (base) branch
|
// Indirect compare remove-files-b (head) with add-csv (base) branch
|
||||||
//
|
//
|
||||||
// 'link_hi' and 'test.csv' are deleted, 'test.txt' is added
|
// 'link_hi' and 'test.csv' are deleted, 'test.txt' is added
|
||||||
req := NewRequest(t, "GET", "/user2/repo20/compare/add-csv...remove-files-b")
|
req := NewRequest(t, "GET", "/user2/repo20/compare/add-csv...remove-files-b")
|
||||||
|
@ -79,7 +79,7 @@ func TestCompareBranches(t *testing.T) {
|
||||||
|
|
||||||
inspectCompare(t, htmlDoc, diffCount, diffChanges)
|
inspectCompare(t, htmlDoc, diffCount, diffChanges)
|
||||||
|
|
||||||
// Inderect compare remove-files-b (head) with remove-files-a (base) branch
|
// Indirect compare remove-files-b (head) with remove-files-a (base) branch
|
||||||
//
|
//
|
||||||
// 'link_hi' and 'test.csv' are deleted, 'test.txt' is added
|
// 'link_hi' and 'test.csv' are deleted, 'test.txt' is added
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ func TestCompareBranches(t *testing.T) {
|
||||||
|
|
||||||
inspectCompare(t, htmlDoc, diffCount, diffChanges)
|
inspectCompare(t, htmlDoc, diffCount, diffChanges)
|
||||||
|
|
||||||
// Inderect compare remove-files-a (head) with remove-files-b (base) branch
|
// Indirect compare remove-files-a (head) with remove-files-b (base) branch
|
||||||
//
|
//
|
||||||
// 'link_hi' and 'test.csv' are deleted
|
// 'link_hi' and 'test.csv' are deleted
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
acounts,accounts
|
||||||
|
canidate,candidate
|
||||||
|
comfirm,confirm
|
||||||
|
converage,coverage
|
||||||
|
currrently,currently
|
||||||
|
delimeter,delimiter
|
||||||
|
differrent,different
|
||||||
|
exclusing,excluding
|
||||||
|
finshed,finished
|
||||||
|
formated,formatted
|
||||||
|
inderect,indirect
|
||||||
|
insuficient,insufficient
|
||||||
|
likly,likely
|
||||||
|
mergable,mergeable
|
||||||
|
overrided,overridden
|
||||||
|
priortized,prioritized
|
||||||
|
registeration,registration
|
||||||
|
reuqest,request
|
||||||
|
reviwer,reviewer
|
||||||
|
superceded,superseded
|
||||||
|
underlaying,underlying
|
|
|
@ -21,6 +21,11 @@
|
||||||
background-color: transparent !important;
|
background-color: transparent !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.monaco-editor,
|
||||||
|
.monaco-editor .overflow-guard {
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
}
|
||||||
|
|
||||||
/* these seem unthemeable */
|
/* these seem unthemeable */
|
||||||
.monaco-scrollable-element > .scrollbar > .slider {
|
.monaco-scrollable-element > .scrollbar > .slider {
|
||||||
background: var(--color-primary) !important;
|
background: var(--color-primary) !important;
|
||||||
|
|
|
@ -54,6 +54,7 @@ These inconsistent layouts should be refactored to simple ones.
|
||||||
.ui.modal form > .content {
|
.ui.modal form > .content {
|
||||||
padding: 1.5em;
|
padding: 1.5em;
|
||||||
background: var(--color-body);
|
background: var(--color-body);
|
||||||
|
border-radius: 0 0 var(--border-radius) var(--border-radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
.ui.modal > .actions,
|
.ui.modal > .actions,
|
||||||
|
@ -63,6 +64,7 @@ These inconsistent layouts should be refactored to simple ones.
|
||||||
border-color: var(--color-secondary);
|
border-color: var(--color-secondary);
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
border-radius: 0 0 var(--border-radius) var(--border-radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
.ui.modal .content > .actions {
|
.ui.modal .content > .actions {
|
||||||
|
|
|
@ -152,7 +152,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.ui.attached.segment:has(+ .ui[class*="top attached"].header),
|
.ui.attached.segment:has(+ .ui[class*="top attached"].header),
|
||||||
.ui.attached.segment:last-child {
|
.ui.attached.segment:last-child,
|
||||||
|
.ui.segment:has(+ .ui.segment:not(.attached)),
|
||||||
|
.ui.attached.segment:has(+ .ui.modal) {
|
||||||
border-radius: 0 0 0.28571429rem 0.28571429rem;
|
border-radius: 0 0 0.28571429rem 0.28571429rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -166,6 +168,10 @@
|
||||||
.ui.segment[class*="top attached"]:first-child {
|
.ui.segment[class*="top attached"]:first-child {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
}
|
}
|
||||||
|
.ui[class*="top attached"].segment:last-child {
|
||||||
|
border-top-left-radius: 0.28571429rem;
|
||||||
|
border-top-right-radius: 0.28571429rem;
|
||||||
|
}
|
||||||
|
|
||||||
.ui.segment[class*="bottom attached"] {
|
.ui.segment[class*="bottom attached"] {
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
|
|
|
@ -1586,6 +1586,7 @@ td .commit-summary {
|
||||||
|
|
||||||
.repository .diff-file-box .file-body.file-code {
|
.repository .diff-file-box .file-body.file-code {
|
||||||
background: var(--color-code-bg);
|
background: var(--color-code-bg);
|
||||||
|
border-radius: var(--border-radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
.repository .diff-file-box .file-body.file-code .lines-num {
|
.repository .diff-file-box .file-body.file-code .lines-num {
|
||||||
|
@ -2382,6 +2383,22 @@ tbody.commit-list {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* fix bottom border radius on diff files */
|
||||||
|
.diff-file-body tr.tag-code:last-child {
|
||||||
|
background: none;
|
||||||
|
}
|
||||||
|
.diff-file-body tr.tag-code:last-child > td {
|
||||||
|
background: var(--color-box-body-highlight);
|
||||||
|
}
|
||||||
|
.diff-file-body tr.tag-code:last-child td:first-child,
|
||||||
|
.diff-file-body tr.tag-code:last-child td:first-child * {
|
||||||
|
border-bottom-left-radius: 3px;
|
||||||
|
}
|
||||||
|
.diff-file-body tr.tag-code:last-child td:last-child,
|
||||||
|
.diff-file-body tr.tag-code:last-child td:last-child * {
|
||||||
|
border-bottom-right-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
.resolved-placeholder {
|
.resolved-placeholder {
|
||||||
font-weight: var(--font-weight-normal) !important;
|
font-weight: var(--font-weight-normal) !important;
|
||||||
border: 1px solid var(--color-secondary) !important;
|
border: 1px solid var(--color-secondary) !important;
|
||||||
|
@ -2491,6 +2508,7 @@ tbody.commit-list {
|
||||||
|
|
||||||
.diff-file-header {
|
.diff-file-header {
|
||||||
padding: 5px 8px !important;
|
padding: 5px 8px !important;
|
||||||
|
box-shadow: 0 -1px 0 1px var(--color-body); /* prevent borders being visible behind top corners when sticky and scrolled */
|
||||||
}
|
}
|
||||||
|
|
||||||
.diff-file-box[data-folded="true"] .diff-file-body {
|
.diff-file-box[data-folded="true"] .diff-file-body {
|
||||||
|
|
|
@ -50,7 +50,7 @@ function processWindowErrorEvent({error, reason, message, type, filename, lineno
|
||||||
const assetBaseUrl = String(new URL(__webpack_public_path__, window.location.origin));
|
const assetBaseUrl = String(new URL(__webpack_public_path__, window.location.origin));
|
||||||
const {runModeIsProd} = window.config ?? {};
|
const {runModeIsProd} = window.config ?? {};
|
||||||
|
|
||||||
// `error` and `reason` are not guaranteed to be errors. If the value is falsy, it is likly a
|
// `error` and `reason` are not guaranteed to be errors. If the value is falsy, it is likely a
|
||||||
// non-critical event from the browser. We log them but don't show them to users. Examples:
|
// non-critical event from the browser. We log them but don't show them to users. Examples:
|
||||||
// - https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver#observation_errors
|
// - https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver#observation_errors
|
||||||
// - https://github.com/mozilla-mobile/firefox-ios/issues/10817
|
// - https://github.com/mozilla-mobile/firefox-ios/issues/10817
|
||||||
|
|
|
@ -98,6 +98,7 @@ export async function createMonaco(textarea, filename, editorOpts) {
|
||||||
'input.foreground': getColor('--color-input-text'),
|
'input.foreground': getColor('--color-input-text'),
|
||||||
'scrollbar.shadow': getColor('--color-shadow'),
|
'scrollbar.shadow': getColor('--color-shadow'),
|
||||||
'progressBar.background': getColor('--color-primary'),
|
'progressBar.background': getColor('--color-primary'),
|
||||||
|
'focusBorder': '#0000', // prevent blue border
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ import {attachRefIssueContextPopup} from './contextpopup.js';
|
||||||
import {POST} from '../modules/fetch.js';
|
import {POST} from '../modules/fetch.js';
|
||||||
|
|
||||||
function initEditPreviewTab($form) {
|
function initEditPreviewTab($form) {
|
||||||
const $tabMenu = $form.find('.tabular.menu');
|
const $tabMenu = $form.find('.repo-editor-menu');
|
||||||
$tabMenu.find('.item').tab();
|
$tabMenu.find('.item').tab();
|
||||||
const $previewTab = $tabMenu.find(`.item[data-tab="${$tabMenu.data('preview')}"]`);
|
const $previewTab = $tabMenu.find(`.item[data-tab="${$tabMenu.data('preview')}"]`);
|
||||||
if ($previewTab.length) {
|
if ($previewTab.length) {
|
||||||
|
|
Loading…
Reference in New Issue