From 749802c9223b787c2681faac6e1f8798df219d50 Mon Sep 17 00:00:00 2001 From: 6543 Date: Mon, 19 Jun 2023 18:40:06 +0200 Subject: [PATCH 01/18] Refactor: TotalTimest return seconds (#25370) so template/browser can deal with string format --- *Sponsored by Kithara Software GmbH* --- models/issues/tracked_time.go | 8 ++++---- models/issues/tracked_time_test.go | 12 ++++++------ templates/repo/issue/view_content/sidebar.tmpl | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go index ac65d654f20a3..698014afeba54 100644 --- a/models/issues/tracked_time.go +++ b/models/issues/tracked_time.go @@ -199,8 +199,8 @@ func addTime(ctx context.Context, user *user_model.User, issue *Issue, amount in return tt, db.Insert(ctx, tt) } -// TotalTimes returns the spent time for each user by an issue -func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]string, error) { +// TotalTimes returns the spent time in seconds for each user by an issue +func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]int64, error) { trackedTimes, err := GetTrackedTimes(db.DefaultContext, options) if err != nil { return nil, err @@ -211,7 +211,7 @@ func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]string, totalTimesByUser[t.UserID] += t.Time } - totalTimes := make(map[*user_model.User]string) + totalTimes := make(map[*user_model.User]int64) // Fetching User and making time human readable for userID, total := range totalTimesByUser { user, err := user_model.GetUserByID(db.DefaultContext, userID) @@ -221,7 +221,7 @@ func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]string, } return nil, err } - totalTimes[user] = util.SecToTime(total) + totalTimes[user] = total } return totalTimes, nil } diff --git a/models/issues/tracked_time_test.go b/models/issues/tracked_time_test.go index 99b977cca5264..baa170b201265 100644 --- a/models/issues/tracked_time_test.go +++ b/models/issues/tracked_time_test.go @@ -86,8 +86,8 @@ func TestTotalTimes(t *testing.T) { assert.NoError(t, err) assert.Len(t, total, 1) for user, time := range total { - assert.Equal(t, int64(1), user.ID) - assert.Equal(t, "6 minutes 40 seconds", time) + assert.EqualValues(t, 1, user.ID) + assert.EqualValues(t, 400, time) } total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 2}) @@ -95,9 +95,9 @@ func TestTotalTimes(t *testing.T) { assert.Len(t, total, 2) for user, time := range total { if user.ID == 2 { - assert.Equal(t, "1 hour 1 minute", time) + assert.EqualValues(t, 3662, time) } else if user.ID == 1 { - assert.Equal(t, "20 seconds", time) + assert.EqualValues(t, 20, time) } else { assert.Error(t, assert.AnError) } @@ -107,8 +107,8 @@ func TestTotalTimes(t *testing.T) { assert.NoError(t, err) assert.Len(t, total, 1) for user, time := range total { - assert.Equal(t, int64(2), user.ID) - assert.Equal(t, "1 second", time) + assert.EqualValues(t, 2, user.ID) + assert.EqualValues(t, 1, time) } total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 4}) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index c0f5a8d3d7780..f429655541e7b 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -340,7 +340,7 @@
{{template "shared/user/authorlink" $user}}
- {{$trackedtime}} + {{$trackedtime|Sec2Time}}
From 7f38cf71fe0dce89b3d7c8749046c43c2b84efe1 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Mon, 19 Jun 2023 19:12:15 +0200 Subject: [PATCH 02/18] Fix issue filters on mobile view (#25368) Fix #24846 applying the solution proposed by @silverwind
Screenshots ![Bildschirmfoto vom 2023-06-19 12-20-54](https://github.com/go-gitea/gitea/assets/47871822/3f4e4536-38c4-451b-bfc0-a7c39acd37f0) ![Bildschirmfoto vom 2023-06-19 12-21-02](https://github.com/go-gitea/gitea/assets/47871822/3403ecc2-4d7f-4acd-b0c0-1b7a10228ff7) ![Bildschirmfoto vom 2023-06-19 12-21-16](https://github.com/go-gitea/gitea/assets/47871822/ef28a2bf-b7cc-4aec-b54b-99d2cc46a1f6) ![Bildschirmfoto vom 2023-06-19 12-21-21](https://github.com/go-gitea/gitea/assets/47871822/f8cd72a5-379e-410b-b0ef-d58895719370) ![Bildschirmfoto vom 2023-06-19 12-21-28](https://github.com/go-gitea/gitea/assets/47871822/34c78301-820c-4106-a086-ae81dc97eb91) ![Bildschirmfoto vom 2023-06-19 12-21-48](https://github.com/go-gitea/gitea/assets/47871822/b677adf1-3a48-42c8-befe-fa9d2679f0a3)
Replaces #25335 --- templates/repo/issue/list.tmpl | 4 ++-- web_src/css/repo/issue-list.css | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 12eb31acdc614..3574719eae97d 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -89,7 +89,7 @@ {{template "repo/issue/openclose" .}}
-
+
@@ -278,7 +278,7 @@ {{template "repo/issue/openclose" .}}
-
+
{{if not .Repository.IsArchived}} {{if .IsShowClosed}} diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index ddd425d068bff..8602bb9a974d7 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -1,6 +1,7 @@ .issue-list-toolbar { display: flex; flex-wrap: wrap; + justify-content: space-between; align-items: flex-start; gap: 1rem; margin-top: 1rem; @@ -10,17 +11,19 @@ display: flex; } -.issue-list-toolbar-right { - margin-left: auto; +.issue-list-toolbar-right .filter.menu { + flex-direction: row; + flex-wrap: wrap; + gap: 8px; } @media (max-width: 767.98px) { .issue-list-toolbar { flex-direction: column-reverse; } - .issue-list-toolbar-right { - margin-right: auto; - width: 100%; + .issue-list-toolbar-right .dropdown .menu { + left: auto !important; + right: auto !important; } .issue-list-navbar { order: 0; From 49a77e37ba2aed2cccae5166c021e049953e299c Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 20 Jun 2023 01:49:50 +0800 Subject: [PATCH 03/18] Fix sidebar label dropdown divider (#25359) Follow #25312 Also fix the label dropdown on sidebar Before: Screen Shot 2023-06-19 at 08 55 05 After: Screen Shot 2023-06-19 at 08 57 17 --- web_src/js/features/repo-issue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 979ee897235b1..194ffca57c4a5 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -149,7 +149,7 @@ export function initRepoIssueSidebarList() { } } }); - $('.ui.dropdown.label-filter').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems'); + $('.ui.dropdown.label-filter, .ui.dropdown.select-label').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems'); } export function initRepoIssueCommentDelete() { From 1a5b7c86a311c8ff8f9e4ba867379a9b7fa102b5 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 19 Jun 2023 14:51:35 -0400 Subject: [PATCH 04/18] Fetch all git data for embedding correct version in docker image (#25361) Fix #25350 --- .github/workflows/release-nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index 71ec6dae841e3..1868673f172aa 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -55,6 +55,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + # fetch all commits instead of only the last as some branches are long lived and could have many between versions + # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567 + - run: git fetch --unshallow --quiet --tags --force - uses: docker/setup-qemu-action@v2 - uses: docker/setup-buildx-action@v2 - name: Get cleaned branch name From 33cd74ad70591c36dfd1d14bd75f3eb1c2f28906 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Tue, 20 Jun 2023 11:04:13 +0800 Subject: [PATCH 05/18] Fix LDAP sync when Username Attribute is empty (#25278) Fix #21072 ![image](https://github.com/go-gitea/gitea/assets/15528715/96b30beb-7f88-4a60-baae-2e5ad8049555) Username Attribute is not a required item when creating an authentication source. If Username Attribute is empty, the username value of LDAP user cannot be read, so all users from LDAP will be marked as inactive by mistake when synchronizing external users. This PR improves the sync logic, if username is empty, the email address will be used to find user. --- services/auth/source/ldap/source_sync.go | 62 ++++++++++++------------ tests/integration/auth_ldap_test.go | 51 +++++++++++++++++++ 2 files changed, 83 insertions(+), 30 deletions(-) diff --git a/services/auth/source/ldap/source_sync.go b/services/auth/source/ldap/source_sync.go index 4571ff6540c3e..3e0f47a37e296 100644 --- a/services/auth/source/ldap/source_sync.go +++ b/services/auth/source/ldap/source_sync.go @@ -6,7 +6,6 @@ package ldap import ( "context" "fmt" - "sort" "strings" asymkey_model "code.gitea.io/gitea/models/asymkey" @@ -24,7 +23,6 @@ import ( func (source *Source) Sync(ctx context.Context, updateExisting bool) error { log.Trace("Doing: SyncExternalUsers[%s]", source.authSource.Name) - var existingUsers []int isAttributeSSHPublicKeySet := len(strings.TrimSpace(source.AttributeSSHPublicKey)) > 0 var sshKeysNeedUpdate bool @@ -41,9 +39,14 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error { default: } - sort.Slice(users, func(i, j int) bool { - return users[i].LowerName < users[j].LowerName - }) + usernameUsers := make(map[string]*user_model.User, len(users)) + mailUsers := make(map[string]*user_model.User, len(users)) + keepActiveUsers := make(map[int64]struct{}) + + for _, u := range users { + usernameUsers[u.LowerName] = u + mailUsers[strings.ToLower(u.Email)] = u + } sr, err := source.SearchEntries() if err != nil { @@ -59,11 +62,6 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error { log.Warn("LDAP search found no entries but did not report an error. All users will be deactivated as per settings") } - sort.Slice(sr, func(i, j int) bool { - return sr[i].LowerName < sr[j].LowerName - }) - - userPos := 0 orgCache := make(map[string]*organization.Organization) teamCache := make(map[string]*organization.Team) @@ -86,21 +84,27 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error { return db.ErrCancelledf("During update of %s before completed update of users", source.authSource.Name) default: } - if len(su.Username) == 0 { + if len(su.Username) == 0 && len(su.Mail) == 0 { continue } - if len(su.Mail) == 0 { - su.Mail = fmt.Sprintf("%s@localhost", su.Username) + var usr *user_model.User + if len(su.Username) > 0 { + usr = usernameUsers[su.LowerName] + } + if usr == nil && len(su.Mail) > 0 { + usr = mailUsers[strings.ToLower(su.Mail)] } - var usr *user_model.User - for userPos < len(users) && users[userPos].LowerName < su.LowerName { - userPos++ + if usr != nil { + keepActiveUsers[usr.ID] = struct{}{} + } else if len(su.Username) == 0 { + // we cannot create the user if su.Username is empty + continue } - if userPos < len(users) && users[userPos].LowerName == su.LowerName { - usr = users[userPos] - existingUsers = append(existingUsers, userPos) + + if len(su.Mail) == 0 { + su.Mail = fmt.Sprintf("%s@localhost", su.Username) } fullName := composeFullName(su.Name, su.Surname, su.Username) @@ -203,19 +207,17 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error { // Deactivate users not present in LDAP if updateExisting { - existPos := 0 - for i, usr := range users { - for existPos < len(existingUsers) && i > existingUsers[existPos] { - existPos++ + for _, usr := range users { + if _, ok := keepActiveUsers[usr.ID]; ok { + continue } - if usr.IsActive && (existPos >= len(existingUsers) || i < existingUsers[existPos]) { - log.Trace("SyncExternalUsers[%s]: Deactivating user %s", source.authSource.Name, usr.Name) - usr.IsActive = false - err = user_model.UpdateUserCols(ctx, usr, "is_active") - if err != nil { - log.Error("SyncExternalUsers[%s]: Error deactivating user %s: %v", source.authSource.Name, usr.Name, err) - } + log.Trace("SyncExternalUsers[%s]: Deactivating user %s", source.authSource.Name, usr.Name) + + usr.IsActive = false + err = user_model.UpdateUserCols(ctx, usr, "is_active") + if err != nil { + log.Error("SyncExternalUsers[%s]: Error deactivating user %s: %v", source.authSource.Name, usr.Name, err) } } } diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 81f8d9ddd7503..d2160a3dbea2c 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -268,6 +268,57 @@ func TestLDAPUserSync(t *testing.T) { } } +func TestLDAPUserSyncWithEmptyUsernameAttribute(t *testing.T) { + if skipLDAPTests() { + t.Skip() + return + } + defer tests.PrepareTestEnv(t)() + + session := loginUser(t, "user1") + csrf := GetCSRF(t, session, "/admin/auths/new") + payload := buildAuthSourceLDAPPayload(csrf, "", "", "", "") + payload["attribute_username"] = "" + req := NewRequestWithValues(t, "POST", "/admin/auths/new", payload) + session.MakeRequest(t, req, http.StatusSeeOther) + + for _, u := range gitLDAPUsers { + req := NewRequest(t, "GET", "/admin/users?q="+u.UserName) + resp := session.MakeRequest(t, req, http.StatusOK) + + htmlDoc := NewHTMLParser(t, resp.Body) + + tr := htmlDoc.doc.Find("table.table tbody tr") + assert.True(t, tr.Length() == 0) + } + + for _, u := range gitLDAPUsers { + req := NewRequestWithValues(t, "POST", "/user/login", map[string]string{ + "_csrf": csrf, + "user_name": u.UserName, + "password": u.Password, + }) + MakeRequest(t, req, http.StatusSeeOther) + } + + auth.SyncExternalUsers(context.Background(), true) + + authSource := unittest.AssertExistsAndLoadBean(t, &auth_model.Source{ + Name: payload["name"], + }) + unittest.AssertCount(t, &user_model.User{ + LoginType: auth_model.LDAP, + LoginSource: authSource.ID, + }, len(gitLDAPUsers)) + + for _, u := range gitLDAPUsers { + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ + Name: u.UserName, + }) + assert.True(t, user.IsActive) + } +} + func TestLDAPUserSyncWithGroupFilter(t *testing.T) { if skipLDAPTests() { t.Skip() From ef6f5f01242421fd9df832f6143ed21693938838 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 20 Jun 2023 05:32:49 +0200 Subject: [PATCH 06/18] rename tributeValues to mentionValues (#25375) Very simple change, just rename this variable so it does not feature the name of the module. --- templates/base/head_script.tmpl | 2 +- web_src/js/features/tribute.js | 2 +- web_src/js/test/setup.js | 2 +- web_src/js/utils/match.js | 2 +- web_src/js/utils/match.test.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl index b6475a83cdba8..c7477ff4c0f2e 100644 --- a/templates/base/head_script.tmpl +++ b/templates/base/head_script.tmpl @@ -17,7 +17,7 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly. notificationSettings: {{NotificationSettings}}, {{/*a map provided by NewFuncMap in helper.go*/}} enableTimeTracking: {{EnableTimetracking}}, {{if or .Participants .Assignees .MentionableTeams}} - tributeValues: Array.from(new Map([ + mentionValues: Array.from(new Map([ {{- range .Participants -}} ['{{.Name}}', {key: '{{.Name}} {{.FullName}}', value: '{{.Name}}', name: '{{.Name}}', fullname: '{{.FullName}}', avatar: '{{.AvatarLink $.Context}}'}], {{- end -}} diff --git a/web_src/js/features/tribute.js b/web_src/js/features/tribute.js index e77ba299507b4..43fa79b2a4dce 100644 --- a/web_src/js/features/tribute.js +++ b/web_src/js/features/tribute.js @@ -31,7 +31,7 @@ function makeCollections({mentions, emoji}) { if (mentions) { collections.push({ - values: window.config.tributeValues, + values: window.config.mentionValues, requireLeadingSpace: true, menuItemTemplate: (item) => { return ` diff --git a/web_src/js/test/setup.js b/web_src/js/test/setup.js index d9f0b8b547f59..0b5719367414d 100644 --- a/web_src/js/test/setup.js +++ b/web_src/js/test/setup.js @@ -3,7 +3,7 @@ window.config = { pageData: {}, i18n: {}, appSubUrl: '', - tributeValues: [ + mentionValues: [ {key: 'user1 User 1', value: 'user1', name: 'user1', fullname: 'User 1', avatar: 'https://avatar1.com'}, {key: 'user2 User 2', value: 'user2', name: 'user2', fullname: 'User 2', avatar: 'https://avatar2.com'}, {key: 'user3 User 3', value: 'user3', name: 'user3', fullname: 'User 3', avatar: 'https://avatar3.com'}, diff --git a/web_src/js/utils/match.js b/web_src/js/utils/match.js index 31763b0940cf2..029fec8840abc 100644 --- a/web_src/js/utils/match.js +++ b/web_src/js/utils/match.js @@ -32,7 +32,7 @@ export function matchMention(queryText) { // results is a map of weights, lower is better const results = new Map(); - for (const obj of window.config.tributeValues) { + for (const obj of window.config.mentionValues) { const index = obj.key.toLowerCase().indexOf(query); if (index === -1) continue; const existing = results.get(obj); diff --git a/web_src/js/utils/match.test.js b/web_src/js/utils/match.test.js index 78710f2a5fbcb..f73ec56f8e0d6 100644 --- a/web_src/js/utils/match.test.js +++ b/web_src/js/utils/match.test.js @@ -42,6 +42,6 @@ test('matchEmoji', () => { }); test('matchMention', () => { - expect(matchMention('')).toEqual(window.config.tributeValues.slice(0, 6)); - expect(matchMention('user4')).toEqual([window.config.tributeValues[3]]); + expect(matchMention('')).toEqual(window.config.mentionValues.slice(0, 6)); + expect(matchMention('user4')).toEqual([window.config.mentionValues[3]]); }); From feda5063217b44a0b66e25726e8975795c308a87 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 20 Jun 2023 01:37:32 -0400 Subject: [PATCH 07/18] Use Actions git context instead of dynamically created buildkit one (#25381) The [docker/build-push-action@v2 action](https://github.com/docker/build-push-action) by default ignores the checkout created using the actions/checkout@v2 action. When you pass a git build context to docker build, it wouldn't include the .git directory. By passing `context: .` to the build step then it'll use the Actions git context which includes the git fetch from the earlier step. --- .github/workflows/release-nightly.yml | 2 ++ Makefile | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index 1868673f172aa..0e94f5217cb94 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -78,12 +78,14 @@ jobs: - name: build rootful docker image uses: docker/build-push-action@v4 with: + context: . platforms: linux/amd64,linux/arm64 push: true tags: gitea/gitea:${{ steps.clean_name.outputs.branch }} - name: build rootless docker image uses: docker/build-push-action@v4 with: + context: . platforms: linux/amd64,linux/arm64 push: true file: Dockerfile.rootless diff --git a/Makefile b/Makefile index f6d9b9d04fe88..08d439f422a72 100644 --- a/Makefile +++ b/Makefile @@ -79,6 +79,9 @@ endif STORED_VERSION_FILE := VERSION HUGO_VERSION ?= 0.111.3 +GITHUB_REF_TYPE ?= branch +GITHUB_REF_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) + ifneq ($(GITHUB_REF_TYPE),branch) VERSION ?= $(subst v,,$(GITHUB_REF_NAME)) GITEA_VERSION ?= $(GITHUB_REF_NAME) @@ -1011,9 +1014,5 @@ docker: docker build --disable-content-trust=false -t $(DOCKER_REF) . # support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite sqlite_unlock_notify" . -.PHONY: docker-build -docker-build: - docker run -ti --rm -v "$(CURDIR):/srv/app/src/code.gitea.io/gitea" -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build - # This endif closes the if at the top of the file endif From 005239535141cab8a7748be4a22ab93854b9e74e Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 21 Jun 2023 04:06:42 +0900 Subject: [PATCH 08/18] Use qwtel.sqlite-viewer instead of alexcvzz.vscode-sqlite (#25386) `alexcvzz.vscode-sqlite` doesn't work well in devcontainer. qwtel.sqlite-viewer works well, maybe we can use this one instead. --- .devcontainer/devcontainer.json | 2 +- .gitpod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6288e4d367c60..cc2e4a17f6bac 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -20,7 +20,7 @@ "Vue.volar", "ms-azuretools.vscode-docker", "zixuanchen.vitest-explorer", - "alexcvzz.vscode-sqlite" + "qwtel.sqlite-viewer" ] } }, diff --git a/.gitpod.yml b/.gitpod.yml index f1b2fb195712b..000f534e8539d 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -34,7 +34,7 @@ vscode: - Vue.volar - ms-azuretools.vscode-docker - zixuanchen.vitest-explorer - - alexcvzz.vscode-sqlite + - qwtel.sqlite-viewer ports: - name: Gitea From a95a7bcdf30505150c8c94e1700599fcfad9f98e Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 21 Jun 2023 04:28:46 +0900 Subject: [PATCH 09/18] Add git-lfs support to devcontainer (#25385) --- .devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index cc2e4a17f6bac..31e42d0ab30db 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,8 @@ // installs nodejs into container "ghcr.io/devcontainers/features/node:1": { "version":"20" - } + }, + "ghcr.io/devcontainers/features/git-lfs:1.1.0": {} }, "customizations": { "vscode": { From 54259dbf37f4a7f7d8865755484cbcad1c9ea8c0 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 21 Jun 2023 03:58:03 +0800 Subject: [PATCH 10/18] Fix blank dir message when uploading files from web editor (#25391) Fix #7883 --- routers/web/repo/editor.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 7433a0a56b16c..2fea8a9532b90 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -685,7 +685,11 @@ func UploadFilePost(ctx *context.Context) { message := strings.TrimSpace(form.CommitSummary) if len(message) == 0 { - message = ctx.Tr("repo.editor.upload_files_to_dir", form.TreePath) + dir := form.TreePath + if dir == "" { + dir = "/" + } + message = ctx.Tr("repo.editor.upload_files_to_dir", dir) } form.CommitMessage = strings.TrimSpace(form.CommitMessage) From e50c3e8431972a41fc9792939956c3281b1b4810 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 20 Jun 2023 22:35:25 +0200 Subject: [PATCH 11/18] Navbar styling rework (#25343) - Extract navbar CSS to own file - Reduce height from 52px to 50px - Give every item a hover effect of of 36px, including the logo and on mobile - Consistent horizontal padding of 10px left and right Screenshot 2023-06-18 at 13 41 16 Screenshot 2023-06-18 at 14 03 43 Screenshot 2023-06-18 at 14 03 18 Screenshot 2023-06-18 at 13 58 28 --------- Co-authored-by: wxiaoguang Co-authored-by: Giteabot --- templates/base/head_navbar.tmpl | 75 ++++++++--------- web_src/css/base.css | 96 ---------------------- web_src/css/index.css | 1 + web_src/css/modules/navbar.css | 138 ++++++++++++++++++++++++++++++++ 4 files changed, 177 insertions(+), 133 deletions(-) create mode 100644 web_src/css/modules/navbar.css diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index e46e276ed02e3..3086e674fd621 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -3,62 +3,63 @@ {{$notificationUnreadCount = call .NotificationUnreadCount}} {{end}} -