forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/dismissing_reviews
* master: (358 commits) [skip ci] Updated translations via Crowdin Use caddy's certmagic library for extensible/robust ACME handling (go-gitea#14177) Redirect on changed user and org name (go-gitea#11649) chore: bump minio to RELEASE.2021-01-16T02-19-44Z (go-gitea#14445) [skip ci] Updated translations via Crowdin CI: skip build steps for cron update works (go-gitea#14443) [skip ci] Updated licenses and gitignores [skip ci] Updated translations via Crowdin just overload to not get it by mistake again ... (go-gitea#14440) [skip ci] Updated translations via Crowdin Add link to packages in openSUSE build service (go-gitea#14439) Improve Description in new/ edit Project template (go-gitea#14429) Don't show "Reference in new issue" when issues unit is globally disabled (go-gitea#14437) CI: Update license & gitignore by cron (go-gitea#14419) Fix close/reopen with comment (go-gitea#14436) Add german translation guidelines (go-gitea#14283) [skip ci] Updated translations via Crowdin Fix lfs preview bug (go-gitea#14428) [skip ci] Updated translations via Crowdin Bump gsap from 3.5.1 to 3.6.0 (go-gitea#14410) ...
- Loading branch information
Showing
2,436 changed files
with
141,424 additions
and
70,356 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| open_collective: gitea | ||
| custom: https://www.bountysource.com/teams/gitea |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| audit=false | ||
| fund=false | ||
| package-lock=true | ||
| save-exact=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -158,7 +158,7 @@ import ( | |
| To maintain understandable code and avoid circular dependencies it is important to have a good structure of the code. The gitea code is divided into the following parts: | ||
|
|
||
| - **integration:** Integrations tests | ||
| - **models:** Contains the data structures used by xorm to construct database tables. It also contains supporting functions to query and update the database. Dependecies to other code in Gitea should be avoided although some modules might be needed (for example for logging). | ||
| - **models:** Contains the data structures used by xorm to construct database tables. It also contains supporting functions to query and update the database. Dependencies to other code in Gitea should be avoided although some modules might be needed (for example for logging). | ||
| - **models/fixtures:** Sample model data used in integration tests. | ||
| - **models/migrations:** Handling of database migrations between versions. PRs that changes a database structure shall also have a migration step. | ||
| - **modules:** Different modules to handle specific functionality in Gitea. | ||
|
|
@@ -181,16 +181,16 @@ The same applies to status responses. If you notice a problem, feel free to leav | |
| All expected results (errors, success, fail messages) should be documented | ||
| ([example](https://github.com/go-gitea/gitea/blob/c620eb5b2d0d874da68ebd734d3864c5224f71f7/routers/api/v1/repo/issue.go#L319-L327)). | ||
|
|
||
| All JSON input types must be defined as a struct in `models/structs/` | ||
| All JSON input types must be defined as a struct in [modules/structs/](modules/structs/) | ||
| ([example](https://github.com/go-gitea/gitea/blob/c620eb5b2d0d874da68ebd734d3864c5224f71f7/modules/structs/issue.go#L76-L91)) | ||
| and referenced in | ||
| [routers/api/v1/swagger/options.go](https://github.com/go-gitea/gitea/blob/c620eb5b2d0d874da68ebd734d3864c5224f71f7/routers/api/v1/swagger/options.go). | ||
| They can then be used like the following: | ||
| ([example](https://github.com/go-gitea/gitea/blob/c620eb5b2d0d874da68ebd734d3864c5224f71f7/routers/api/v1/repo/issue.go#L318)). | ||
|
|
||
| All JSON responses must be defined as a struct in `models/structs/` | ||
| All JSON responses must be defined as a struct in [modules/structs/](modules/structs/) | ||
| ([example](https://github.com/go-gitea/gitea/blob/c620eb5b2d0d874da68ebd734d3864c5224f71f7/modules/structs/issue.go#L36-L68)) | ||
| and referenced in its category in `routers/api/v1/swagger/` | ||
| and referenced in its category in [routers/api/v1/swagger/](routers/api/v1/swagger/) | ||
| ([example](https://github.com/go-gitea/gitea/blob/c620eb5b2d0d874da68ebd734d3864c5224f71f7/routers/api/v1/swagger/issue.go#L11-L16)) | ||
| They can be used like the following: | ||
| ([example](https://github.com/go-gitea/gitea/blob/c620eb5b2d0d874da68ebd734d3864c5224f71f7/routers/api/v1/repo/issue.go#L277-L279)) | ||
|
|
@@ -199,7 +199,7 @@ In general, HTTP methods are chosen as follows: | |
| * **GET** endpoints return requested object and status **OK (200)** | ||
| * **DELETE** endpoints return status **No Content (204)** | ||
| * **POST** endpoints return status **Created (201)**, used to **create** new objects (e.g. a User) | ||
| * **PUT** endpoints return status **No Content (204)**, used to **add/assign** existing Obejcts (e.g. User) to something (e.g. Org-Team) | ||
| * **PUT** endpoints return status **No Content (204)**, used to **add/assign** existing Objects (e.g. User) to something (e.g. Org-Team) | ||
| * **PATCH** endpoints return changed object and status **OK (200)**, used to **edit/change** an existing object | ||
|
|
||
|
|
||
|
|
@@ -293,6 +293,11 @@ and lead the development of Gitea. | |
| To honor the past owners, here's the history of the owners and the time | ||
| they served: | ||
|
|
||
| * 2021-01-01 ~ 2021-12-31 - https://github.com/go-gitea/gitea/issues/13801 | ||
| * [Lunny Xiao](https://gitea.com/lunny) <[email protected]> | ||
| * [Lauris Bukšis-Haberkorns](https://gitea.com/lafriks) <[email protected]> | ||
| * [Matti Ranta](https://gitea.com/techknowlogick) <[email protected]> | ||
|
|
||
| * 2020-01-01 ~ 2020-12-31 - https://github.com/go-gitea/gitea/issues/9230 | ||
| * [Lunny Xiao](https://gitea.com/lunny) <[email protected]> | ||
| * [Lauris Bukšis-Haberkorns](https://gitea.com/lafriks) <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
|
|
||
| ################################### | ||
| #Build stage | ||
| FROM golang:1.15-alpine3.12 AS build-env | ||
| FROM golang:1.15-alpine3.13 AS build-env | ||
|
|
||
| ARG GOPROXY | ||
| ENV GOPROXY ${GOPROXY:-direct} | ||
|
|
@@ -22,7 +22,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea | |
| RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ | ||
| && make clean-all build | ||
|
|
||
| FROM alpine:3.12 | ||
| FROM alpine:3.13 | ||
| LABEL maintainer="[email protected]" | ||
|
|
||
| EXPOSE 22 3000 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
|
|
||
| ################################### | ||
| #Build stage | ||
| FROM golang:1.15-alpine3.12 AS build-env | ||
| FROM golang:1.15-alpine3.13 AS build-env | ||
|
|
||
| ARG GOPROXY | ||
| ENV GOPROXY ${GOPROXY:-direct} | ||
|
|
@@ -22,7 +22,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea | |
| RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ | ||
| && make clean-all build | ||
|
|
||
| FROM alpine:3.12 | ||
| FROM alpine:3.13 | ||
| LABEL maintainer="[email protected]" | ||
|
|
||
| EXPOSE 2222 3000 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,5 +36,6 @@ Mura Li <[email protected]> (@typeless) | |
| 6543 <[email protected]> (@6543) | ||
| jaqra <[email protected]> (@jaqra) | ||
| David Svantesson <[email protected]> (@davidsvantesson) | ||
| CirnoT <[email protected]> (@CirnoT) | ||
| a1012112796 <[email protected]> (@a1012112796) | ||
| Karl Heinz Marbaise <[email protected]> (@khmarbaise) | ||
| Norwin Roosen <[email protected]> (@noerw) | ||
Oops, something went wrong.