Skip to content

Commit 503ad3a

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix: Allow org team names of length 255 in create team form (go-gitea#31564) Remove docs sub folder since docs has been moved to https://gitea.com/gitea/docs (go-gitea#31536) Add bohde as maintainer (go-gitea#31601) Add `YEAR`, `MONTH`, `MONTH_ENGLISH`, `DAY` variables for template repos (go-gitea#31584) Allow disabling authentication related user features (go-gitea#31535) Add back esbuild-loader for .js files (go-gitea#31585)
2 parents 08cebd7 + 4ea2a6d commit 503ad3a

File tree

258 files changed

+610
-26096
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+610
-26096
lines changed

.github/workflows/files-changed.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
6464
docs:
6565
- "**/*.md"
66-
- "docs/**"
6766
- ".markdownlint.yaml"
6867
- "package.json"
6968
- "package-lock.json"

.github/workflows/pull-compliance.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ jobs:
191191
cache-dependency-path: package-lock.json
192192
- run: make deps-frontend
193193
- run: make lint-md
194-
- run: make docs
195194

196195
actions:
197196
if: needs.files-changed.outputs.actions == 'true' || needs.files-changed.outputs.actions == 'true'

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,4 @@ Gary Wang <[email protected]> (@BLumia)
6262
Tim-Niclas Oelschläger <[email protected]> (@zokkis)
6363
Yu Liu <[email protected]> (@HEREYUA)
6464
Kemal Zebari <[email protected]> (@kemzeb)
65+
Rowan Bohde <[email protected]> (@bohde)

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ WEB_DIRS := web_src/js web_src/css
146146

147147
ESLINT_FILES := web_src/js tools *.js *.ts tests/e2e
148148
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
149-
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml))
149+
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml))
150150
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
151151

152152
GO_SOURCES := $(wildcard *.go)
@@ -397,7 +397,7 @@ lint-swagger: node_modules
397397

398398
.PHONY: lint-md
399399
lint-md: node_modules
400-
npx markdownlint docs *.md
400+
npx markdownlint *.md
401401

402402
.PHONY: lint-spell
403403
lint-spell:
@@ -797,7 +797,7 @@ $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
797797
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
798798

799799
.PHONY: release
800-
release: frontend generate release-windows release-linux release-darwin release-freebsd release-copy release-compress vendor release-sources release-docs release-check
800+
release: frontend generate release-windows release-linux release-darwin release-freebsd release-copy release-compress vendor release-sources release-check
801801

802802
$(DIST_DIRS):
803803
mkdir -p $(DIST_DIRS)
@@ -843,10 +843,6 @@ release-sources: | $(DIST_DIRS)
843843
tar $(addprefix $(EXCL),$(TAR_EXCLUDES)) $(TRANSFORM) -czf $(DIST)/release/gitea-src-$(VERSION).tar.gz .
844844
rm -f $(STORED_VERSION_FILE)
845845

846-
.PHONY: release-docs
847-
release-docs: | $(DIST_DIRS) docs
848-
tar -czf $(DIST)/release/gitea-docs-$(VERSION).tar.gz -C ./docs .
849-
850846
.PHONY: deps
851847
deps: deps-frontend deps-backend deps-tools deps-py
852848

custom/conf/app.example.ini

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,15 +1488,19 @@ LEVEL = Info
14881488
;;
14891489
;; Default configuration for email notifications for users (user configurable). Options: enabled, onmention, disabled
14901490
;DEFAULT_EMAIL_NOTIFICATIONS = enabled
1491-
;; Disabled features for users, could be "deletion", "manage_ssh_keys","manage_gpg_keys" more features can be disabled in future
1491+
;; Disabled features for users could be "deletion", "manage_ssh_keys", "manage_gpg_keys", "manage_mfa", "manage_credentials" more features can be disabled in future
14921492
;; - deletion: a user cannot delete their own account
14931493
;; - manage_ssh_keys: a user cannot configure ssh keys
14941494
;; - manage_gpg_keys: a user cannot configure gpg keys
1495+
;; - manage_mfa: a user cannot configure mfa devices
1496+
;; - manage_credentials: a user cannot configure emails, passwords, or openid
14951497
;USER_DISABLED_FEATURES =
1496-
;; Comma separated list of disabled features ONLY if the user has an external login type (eg. LDAP, Oauth, etc.), could be `deletion`, `manage_ssh_keys`, `manage_gpg_keys`. This setting is independent from `USER_DISABLED_FEATURES` and supplements its behavior.
1498+
;; Comma separated list of disabled features ONLY if the user has an external login type (eg. LDAP, Oauth, etc.), could be "deletion", "manage_ssh_keys", "manage_gpg_keys", "manage_mfa", "manage_credentials". This setting is independent from `USER_DISABLED_FEATURES` and supplements its behavior.
14971499
;; - deletion: a user cannot delete their own account
14981500
;; - manage_ssh_keys: a user cannot configure ssh keys
14991501
;; - manage_gpg_keys: a user cannot configure gpg keys
1502+
;; - manage_mfa: a user cannot configure mfa devices
1503+
;; - manage_credentials: a user cannot configure emails, passwords, or openid
15001504
;;EXTERNAL_USER_DISABLE_FEATURES =
15011505

15021506
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

docs/.gitignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

docs/README.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/README_ZH.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

docs/content/actions.en-us.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/content/administration.en-us.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

docs/content/administration.zh-cn.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/content/administration/_index.en-us.md

Whitespace-only changes.

docs/content/administration/_index.zh-cn.md

Whitespace-only changes.

0 commit comments

Comments
 (0)