Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-15 03:42:32 +01:00
Code Issues Activity

Merge branch 'main' into admin-ip-info

Browse Source
This commit is contained in:
techknowlogick 2025-04-15 01:22:41 -04:00 committed by GitHub
commit 7a44d4afc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release-nightly.yml vendored
View File

@ -99,7 +99,7 @@ jobs:
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64,linux/riscv64
push: true push: true
tags: |- tags: |-
gitea/gitea:${{ steps.clean_name.outputs.branch }} gitea/gitea:${{ steps.clean_name.outputs.branch }}

4
.github/workflows/release-tag-rc.yml vendored
View File

@ -104,7 +104,7 @@ jobs:
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64,linux/riscv64
push: true push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
@ -147,7 +147,7 @@ jobs:
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64,linux/riscv64
push: true push: true
file: Dockerfile.rootless file: Dockerfile.rootless
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}

4
.github/workflows/release-tag-version.yml vendored
View File

@ -112,7 +112,7 @@ jobs:
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64,linux/riscv64
push: true push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
@ -158,7 +158,7 @@ jobs:
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64,linux/riscv64
push: true push: true
file: Dockerfile.rootless file: Dockerfile.rootless
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}

2
Makefile
View File

@ -110,7 +110,7 @@ endif
LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64 LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/riscv64
GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/)) GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...)

5
docker/manifest.rootless.tmpl
View File

@ -22,3 +22,8 @@ manifests:
architecture: arm64 architecture: arm64
os: linux os: linux
variant: v8 variant: v8
-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}nightly{{/if}}-linux-riscv64-rootless
platform:
architecture: riscv64
os: linux

5
docker/manifest.tmpl
View File

@ -22,3 +22,8 @@ manifests:
architecture: arm64 architecture: arm64
os: linux os: linux
variant: v8 variant: v8
-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}nightly{{/if}}-linux-riscv64
platform:
architecture: riscv64
os: linux

1
options/gitignore/Processing
View File

@ -2,6 +2,7 @@
applet applet
application.linux-arm64 application.linux-arm64
application.linux-armv6hf application.linux-armv6hf
application.linux-riscv64
application.linux32 application.linux32
application.linux64 application.linux64
application.windows32 application.windows32

6
package-lock.json generated
View File

@ -13247,9 +13247,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "6.2.2", "version": "6.2.6",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.2.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz",
"integrity": "sha512-yW7PeMM+LkDzc7CgJuRLMW2Jz0FxMOsVJ8Lv3gpgW9WLcb9cTW+121UEr1hvmfR7w3SegR5ItvYyzVz1vxNJgQ==", "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

15
templates/admin/user/view.tmpl
View File

@ -15,10 +15,7 @@
</div> </div>
<div class="tw-flex-1"> <div class="tw-flex-1">
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{ctx.Locale.Tr "admin.emails"}} {{ctx.Locale.Tr "admin.emails"}} ({{ctx.Locale.Tr "admin.total" .EmailsTotal}})
<div class="ui right">
{{.EmailsTotal}}
</div>
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
{{template "admin/user/view_emails" .}} {{template "admin/user/view_emails" .}}
@ -34,19 +31,13 @@
</div> </div>
{{end}} {{end}}
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{ctx.Locale.Tr "admin.repositories"}} {{ctx.Locale.Tr "admin.repositories"}} ({{ctx.Locale.Tr "admin.total" .ReposTotal}})
<div class="ui right">
{{.ReposTotal}}
</div>
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
{{template "explore/repo_list" .}} {{template "explore/repo_list" .}}
</div> </div>
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{ctx.Locale.Tr "settings.organization"}} {{ctx.Locale.Tr "settings.organization"}} ({{ctx.Locale.Tr "admin.total" .OrgsTotal}})
<div class="ui right">
{{.OrgsTotal}}
</div>
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
{{template "explore/user_list" .}} {{template "explore/user_list" .}}

5
web_src/fomantic/build/components/dropdown.css
View File

@ -1173,6 +1173,11 @@ select.ui.dropdown {
border-radius: 0.28571429rem !important; border-radius: 0.28571429rem !important;
} }
/* GITEA-PATCH: gitea also have "right menu" support */
.ui.dropdown > .right.menu {
left: auto;
right: 0;
}
/* Leftward Opening Menu */ /* Leftward Opening Menu */
.ui.dropdown > .left.menu { .ui.dropdown > .left.menu {
left: auto !important; left: auto !important;

4
web_src/js/components/RepoContributors.vue
View File

@ -354,11 +354,11 @@ export default defineComponent({
<div> <div>
<!-- Contribution type --> <!-- Contribution type -->
<div class="ui dropdown jump" id="repo-contributors"> <div class="ui dropdown jump" id="repo-contributors">
<div class="ui basic compact button"> <div class="ui basic compact button tw-mr-0">
<span class="not-mobile">{{ locale.filterLabel }}</span> <strong>{{ locale.contributionType[type] }}</strong> <span class="not-mobile">{{ locale.filterLabel }}</span> <strong>{{ locale.contributionType[type] }}</strong>
<svg-icon name="octicon-triangle-down" :size="14"/> <svg-icon name="octicon-triangle-down" :size="14"/>
</div> </div>
<div class="menu"> <div class="right menu">
<div :class="['item', {'selected': type === 'commits'}]" data-value="commits"> <div :class="['item', {'selected': type === 'commits'}]" data-value="commits">
{{ locale.contributionType.commits }} {{ locale.contributionType.commits }}
</div> </div>