github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-09 12:46:42 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

[PR #2874] [MERGED] Import docs into main repository #16642

New Issue
Closed
opened 2025-11-02 12:15:20 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 12:15:20 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/2874
Author: @techknowlogick
Created: 11/8/2017
Status: ✅ Merged
Merged: 11/26/2017
Merged by: @lafriks

Base: master ← Head: docs

📝 Commits (3)

  • 00848ec import docs into main repository
  • f70c7e2 update with latest commit from docs repo (f709ba38b1df6f70aea62a9e5de19374a9907aad)
  • f451771 Merge branch 'master' into docs

📊 Changes

68 files changed (+3720 additions, -0 deletions)

View changed files

📝 .drone.yml (+31 -0)
➕ docs/.editorconfig (+34 -0)
➕ docs/.gitignore (+2 -0)
➕ docs/Dockerfile (+22 -0)
➕ docs/LICENSE (+202 -0)
➕ docs/Makefile (+29 -0)
➕ docs/README.md (+55 -0)
➕ docs/config.yaml (+237 -0)
➕ docs/content/doc/advanced.en-us.md (+13 -0)
➕ docs/content/doc/advanced.zh-cn.md (+13 -0)
➕ docs/content/doc/advanced/config-cheat-sheet.en-us.md (+218 -0)
➕ docs/content/doc/advanced/config-cheat-sheet.zh-cn.md (+191 -0)
➕ docs/content/doc/advanced/customizing-gitea.en-us.md (+54 -0)
➕ docs/content/doc/advanced/hacking-on-gitea.en-us.md (+42 -0)
➕ docs/content/doc/advanced/hacking-on-gitea.zh-cn.md (+42 -0)
➕ docs/content/doc/advanced/make.en-us.md (+44 -0)
➕ docs/content/doc/advanced/specific-variables.en-us.md (+67 -0)
➕ docs/content/doc/features.en-us.md (+13 -0)
➕ docs/content/doc/features.zh-cn.md (+13 -0)
➕ docs/content/doc/features.zh-tw.md (+13 -0)

...and 48 more files

📄 Description

Fixes #2865 by merging docs repo and main gitea repo.

I've removed the following files from the docs subdir as they are the same as the contents in main repo:

  • MAINTAINERS
  • CONTRIBUTING.md
  • DCO
  • and the .github directory

but I've kept the LICENSE file as it differs from the one in the main repo.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/2874 **Author:** [@techknowlogick](https://github.com/techknowlogick) **Created:** 11/8/2017 **Status:** ✅ Merged **Merged:** 11/26/2017 **Merged by:** [@lafriks](https://github.com/lafriks) **Base:** `master` ← **Head:** `docs` --- ### 📝 Commits (3) - [`00848ec`](https://github.com/go-gitea/gitea/commit/00848ecd1746d7ad2f8c79ab7c29c152a18e3b37) import docs into main repository - [`f70c7e2`](https://github.com/go-gitea/gitea/commit/f70c7e2a60791365f8c89b366f4b98d6660d72d5) update with latest commit from docs repo (f709ba38b1df6f70aea62a9e5de19374a9907aad) - [`f451771`](https://github.com/go-gitea/gitea/commit/f4517717b27f715e6a730d994816640a934128ae) Merge branch 'master' into docs ### 📊 Changes **68 files changed** (+3720 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `.drone.yml` (+31 -0) ➕ `docs/.editorconfig` (+34 -0) ➕ `docs/.gitignore` (+2 -0) ➕ `docs/Dockerfile` (+22 -0) ➕ `docs/LICENSE` (+202 -0) ➕ `docs/Makefile` (+29 -0) ➕ `docs/README.md` (+55 -0) ➕ `docs/config.yaml` (+237 -0) ➕ `docs/content/doc/advanced.en-us.md` (+13 -0) ➕ `docs/content/doc/advanced.zh-cn.md` (+13 -0) ➕ `docs/content/doc/advanced/config-cheat-sheet.en-us.md` (+218 -0) ➕ `docs/content/doc/advanced/config-cheat-sheet.zh-cn.md` (+191 -0) ➕ `docs/content/doc/advanced/customizing-gitea.en-us.md` (+54 -0) ➕ `docs/content/doc/advanced/hacking-on-gitea.en-us.md` (+42 -0) ➕ `docs/content/doc/advanced/hacking-on-gitea.zh-cn.md` (+42 -0) ➕ `docs/content/doc/advanced/make.en-us.md` (+44 -0) ➕ `docs/content/doc/advanced/specific-variables.en-us.md` (+67 -0) ➕ `docs/content/doc/features.en-us.md` (+13 -0) ➕ `docs/content/doc/features.zh-cn.md` (+13 -0) ➕ `docs/content/doc/features.zh-tw.md` (+13 -0) _...and 48 more files_ </details> ### 📄 Description Fixes #2865 by merging docs repo and main gitea repo. I've removed the following files from the docs subdir as they are the same as the contents in main repo: * MAINTAINERS * CONTRIBUTING.md * DCO * and the .github directory but I've kept the LICENSE file as it differs from the one in the main repo. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-02 12:15:20 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#16642
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?