Skip to content

Commit ec4f7ba

Browse files
authored
Merge branch 'main' into lunny/milestone_filter
2 parents 4bf7da9 + 46addc1 commit ec4f7ba

File tree

516 files changed

+18668
-12804
lines changed

Some content is hidden

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

516 files changed

+18668
-12804
lines changed

.drone.yml

Lines changed: 436 additions & 188 deletions
Large diffs are not rendered by default.

.stylelintrc.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
plugins:
22
- stylelint-declaration-strict-value
33

4+
ignoreFiles:
5+
- "**/*.go"
6+
47
overrides:
5-
- files: ["**/*.less"]
6-
customSyntax: postcss-less
78
- files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console/*"]
89
rules:
910
scale-unlimited/declaration-strict-value: null
11+
- files: ["**/chroma/*", "**/codemirror/*"]
12+
rules:
13+
block-no-empty: null
1014

1115
rules:
1216
alpha-value-notation: null

CODE_OF_CONDUCT.md

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# Gitea Community Code of Conduct
2+
3+
## About
4+
5+
Online communities include people from many different backgrounds. The Gitea contributors are committed to providing a friendly, safe and welcoming environment for all, regardless of gender identity and expression, sexual orientation, disabilities, neurodiversity, physical appearance, body size, ethnicity, nationality, race, age, religion, or similar personal characteristics.
6+
7+
The first goal of the Code of Conduct is to specify a baseline standard of behavior so that people with different social values and communication styles can talk about Gitea effectively, productively, and respectfully.
8+
9+
The second goal is to provide a mechanism for resolving conflicts in the community when they arise.
10+
11+
The third goal of the Code of Conduct is to make our community welcoming to people from different backgrounds. Diversity is critical to the project; for Gitea to be successful, it needs contributors and users from all backgrounds.
12+
13+
We believe that healthy debate and disagreement are essential to a healthy project and community. However, it is never ok to be disrespectful. We value diverse opinions, but we value respectful behavior more.
14+
15+
## Community values
16+
17+
These are the values to which people in the Gitea community should aspire.
18+
19+
- **Be friendly and welcoming.**
20+
- **Be patient.**
21+
- Remember that people have varying communication styles and that not everyone is using their native language. (Meaning and tone can be lost in translation.)
22+
- **Be thoughtful.**
23+
- Productive communication requires effort. Think about how your words will be interpreted.
24+
- Remember that sometimes it is best to refrain entirely from commenting.
25+
- **Be respectful.**
26+
- In particular, respect differences of opinion.
27+
- **Be charitable.**
28+
- Interpret the arguments of others in good faith, do not seek to disagree.
29+
- When we do disagree, try to understand why.
30+
- **Be constructive.**
31+
- Avoid derailing: stay on topic; if you want to talk about something else, start a new conversation.
32+
- Avoid unconstructive criticism: don't merely decry the current state of affairs; offer—or at least solicit—suggestions as to how things may be improved.
33+
- Avoid snarking (pithy, unproductive, sniping comments)
34+
- Avoid discussing potentially offensive or sensitive issues; this all too often leads to unnecessary conflict.
35+
- Avoid microaggressions (brief and commonplace verbal, behavioral and environmental indignities that communicate hostile, derogatory or negative slights and insults to a person or group).
36+
- **Be responsible.**
37+
- What you say and do matters. Take responsibility for your words and actions, including their consequences, whether intended or otherwise.
38+
39+
People are complicated. You should expect to be misunderstood and to misunderstand others; when this inevitably occurs, resist the urge to be defensive or assign blame. Try not to take offense where no offense was intended. Give people the benefit of the doubt. Even if the intent was to provoke, do not rise to it. It is the responsibility of all parties to de-escalate conflict when it arises.
40+
41+
## Code of Conduct
42+
43+
### Our Pledge
44+
45+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
46+
47+
### Our Standards
48+
49+
Examples of behavior that contributes to creating a positive environment include:
50+
51+
- Using welcoming and inclusive language
52+
- Being respectful of differing viewpoints and experiences
53+
- Gracefully accepting constructive criticism
54+
- Focusing on what is best for the community
55+
- Showing empathy towards other community members
56+
57+
Examples of unacceptable behavior by participants include:
58+
59+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
60+
- Trolling, insulting/derogatory comments, and personal or political attacks
61+
- Public or private harassment
62+
- Publishing others’ private information, such as a physical or electronic address, without explicit permission
63+
- Other conduct which could reasonably be considered inappropriate in a professional setting
64+
65+
### Our Responsibilities
66+
67+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
68+
69+
Project maintainers have the right and responsibility to remove, edit, or reject: comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, as well as to ban (temporarily or permanently) any contributor for behaviors that they deem inappropriate, threatening, offensive, or harmful.
70+
71+
### Scope
72+
73+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
74+
75+
This Code of Conduct also applies outside the project spaces when the Project Stewards have a reasonable belief that an individual’s behavior may have a negative impact on the project or its community.
76+
77+
### Conflict Resolution
78+
79+
We do not believe that all conflict is bad; healthy debate and disagreement often yield positive results. However, it is never okay to be disrespectful or to engage in behavior that violates the project’s code of conduct.
80+
81+
If you see someone violating the code of conduct, you are encouraged to address the behavior directly with those involved. Many issues can be resolved quickly and easily, and this gives people more control over the outcome of their dispute. If you are unable to resolve the matter for any reason, or if the behavior is threatening or harassing, report it. We are dedicated to providing an environment where participants feel welcome and safe.
82+
83+
Reports should be directed to the Gitea Project Stewards at conduct@gitea.com. It is the Project Stewards’ duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the technical-oversight-committee.
84+
85+
We will investigate every complaint, but you may not receive a direct response. We will use our discretion in determining when and how to follow up on reported incidents, which may range from not taking action to permanent expulsion from the project and project-sponsored spaces. Under normal circumstances, we will notify the accused of the report and provide them an opportunity to discuss it before any action is taken. If there is a consensus between maintainers that such an endeavor would be useless (i.e. in case of an obvious spammer), we reserve the right to take action without notifying the accused first. The identity of the reporter will be omitted from the details of the report supplied to the accused. In potentially harmful situations, such as ongoing harassment or threats to anyone’s safety, we may take action without notice.
86+
87+
### Attribution
88+
89+
This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
90+
91+
## Summary
92+
93+
- Treat everyone with respect and kindness.
94+
- Be thoughtful in how you communicate.
95+
- Don’t be destructive or inflammatory.
96+
- If you encounter an issue, please mail conduct@gitea.com.

Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ AIR_PACKAGE ?= github.com/cosmtrek/air@v1.40.4
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.6.0
3030
ERRCHECK_PACKAGE ?= github.com/kisielk/errcheck@v1.6.2
3131
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.4.0
32-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.0
32+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2
3333
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.10
3434
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/misspell@v0.3.4
3535
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.4
@@ -105,7 +105,7 @@ GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/m
105105

106106
FOMANTIC_WORK_DIR := web_src/fomantic
107107

108-
WEBPACK_SOURCES := $(shell find web_src/js web_src/less -type f)
108+
WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
109109
WEBPACK_CONFIGS := webpack.config.js
110110
WEBPACK_DEST := public/js/index.js public/css/index.css
111111
WEBPACK_DEST_ENTRIES := public/js public/css public/fonts public/img/webpack public/serviceworker.js
@@ -131,7 +131,7 @@ TEST_TAGS ?= sqlite sqlite_unlock_notify
131131
TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)
132132

133133
GO_DIRS := cmd tests models modules routers build services tools
134-
WEB_DIRS := web_src/js web_src/less
134+
WEB_DIRS := web_src/js web_src/css
135135

136136
GO_SOURCES := $(wildcard *.go)
137137
GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -not -path modules/options/bindata.go -not -path modules/public/bindata.go -not -path modules/templates/bindata.go)
@@ -190,6 +190,7 @@ help:
190190
@echo " - deps install dependencies"
191191
@echo " - deps-frontend install frontend dependencies"
192192
@echo " - deps-backend install backend dependencies"
193+
@echo " - deps-tools install tool dependencies"
193194
@echo " - lint lint everything"
194195
@echo " - lint-frontend lint frontend files"
195196
@echo " - lint-backend lint backend files"
@@ -341,7 +342,7 @@ lint: lint-frontend lint-backend
341342
.PHONY: lint-frontend
342343
lint-frontend: node_modules
343344
npx eslint --color --max-warnings=0 --ext js,vue web_src/js build *.config.js docs/assets/js tests/e2e
344-
npx stylelint --color --max-warnings=0 web_src/less
345+
npx stylelint --color --max-warnings=0 web_src/css
345346
npx spectral lint -q -F hint $(SWAGGER_SPEC)
346347
npx markdownlint docs *.md
347348

@@ -821,14 +822,17 @@ docs:
821822
cd docs; make trans-copy clean build-offline;
822823

823824
.PHONY: deps
824-
deps: deps-frontend deps-backend
825+
deps: deps-frontend deps-backend deps-tools
825826

826827
.PHONY: deps-frontend
827828
deps-frontend: node_modules
828829

829830
.PHONY: deps-backend
830831
deps-backend:
831832
$(GO) mod download
833+
834+
.PHONY: deps-tools
835+
deps-tools:
832836
$(GO) install $(AIR_PACKAGE)
833837
$(GO) install $(EDITORCONFIG_CHECKER_PACKAGE)
834838
$(GO) install $(ERRCHECK_PACKAGE)

0 commit comments

Comments
 (0)