Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-24 18:56:11 +01:00
Commit graph

1504 commits

Author SHA1 Message Date
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543)
* Make auto check manual merge as a chooseable mod and add manual merge way on ui

as title, Before this pr, we use same way with GH to check manually merge.
It good, but in some special cases, misjudgments can occur. and it's hard
to fix this bug. So I add option to allow repo manager block "auto check manual merge"
function, Then it will have same style like gitlab(allow empty pr). and to compensate for
not being able to detect THE PR merge automatically, I added a manual approach.

Signed-off-by: a1012112796 <1012112796@qq.com>

* make swager

* api support

* ping ci

* fix TestPullCreate_EmptyChangesWithCommits

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* Apply review suggestions and add test

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* fix build

* test error message

* make fmt

* Fix indentation issues identified by @silverwind

Co-authored-by: silverwind <me@silverwind.io>

* Fix tests and make manually merged disabled error on API the same

Signed-off-by: Andrew Thornton <art27@cantab.net>

* a small nit

* fix wrong commit id error

* fix bug

* simple test

* fix test

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2021-03-03 22:41:23 -05:00
GiteaBot b2986ab8b2 [skip ci] Updated translations via Crowdin 2021-03-03 00:12:35 +00:00
GiteaBot f878c8231f [skip ci] Updated translations via Crowdin 2021-03-02 00:12:37 +00:00
Paweł Bogusławski 85e6e07346
Organization removal confirmation using name not password (#14738)
* Organization removal confirmation using name not password

Gitea is asking for user password to confirm organization
removal so this operation cannot be done in systems with
SSO authentication (where no user passwords are used).

This mod changes the way gitea confirms organization
removal - user must enter organization name (not user
password) to confirm operation (similar to repository
removal confirmation).

Author-Change-Id: IB#1107219

* Translation removed

Translation removed from PR - will be restored using Crowdin
after pull got merged.

Fixes: 95ddcdd8bd
Related: https://github.com/go-gitea/gitea/pull/14738
Author-Change-Id: IB#1107219
2021-03-01 16:33:05 +02:00
6543 a4148c0f12
Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)
* make repo as "pending transfer" if on transfer start doer has no right to create repo in new destination

* if new pending transfer ocured, create UI & Mail notifications
2021-03-01 01:47:30 +01:00
GiteaBot e0900310c4 [skip ci] Updated translations via Crowdin 2021-03-01 00:12:52 +00:00
a1012112796 83cf1a894e
Create tag on ui (#13467)
Support create single tag directly

support create tag with message from create release ui

Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
2021-02-28 19:57:45 +00:00
6543 b4b4d765f3
Fix missleading sentence (#14829) 2021-02-28 07:54:12 +00:00
KN4CK3R 904a26c57c
Add Image Diff options in Pull Request Diff view (#14450)
Implemented GitHub style image diff
2021-02-27 18:25:00 +01:00
GiteaBot 42118c6bc8 [skip ci] Updated translations via Crowdin 2021-02-27 00:19:24 +00:00
GiteaBot 97e5a1d7b3 [skip ci] Updated translations via Crowdin 2021-02-26 00:19:27 +00:00
GiteaBot 7aa48fe6f3 [skip ci] Updated translations via Crowdin 2021-02-25 00:19:26 +00:00
GiteaBot 6c012b7e49 [skip ci] Updated translations via Crowdin 2021-02-23 00:19:34 +00:00
GiteaBot ff2a0e8dcd [skip ci] Updated translations via Crowdin 2021-02-22 13:46:10 +00:00
GiteaBot 73a093d60f [skip ci] Updated translations via Crowdin 2021-02-21 16:52:24 +00:00
GiteaBot b56c19d819 [skip ci] Updated translations via Crowdin 2021-02-21 10:00:43 +00:00
Bagas Sanjaya 1f13229830
Add helper descriptions on new repo page (#14591)
* Add helper descriptions on new repo page

Add helpers for:
  * repo description
  * .gitignore
  * license
  * README
  * default branch
  * signature trust model

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>

* Oops, rename trust_model_helper

To match similar helper.

trust_model_helper_intro -> trust_model_helper

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
2021-02-21 17:59:31 +08:00
GiteaBot 7118347bae [skip ci] Updated translations via Crowdin 2021-02-20 22:10:05 +00:00
GiteaBot 835f301063 [skip ci] Updated translations via Crowdin 2021-02-20 10:19:10 +00:00
GiteaBot db07aedd32 [skip ci] Updated translations via Crowdin 2021-02-20 04:28:10 +00:00
GiteaBot 404f3484ad [skip ci] Updated translations via Crowdin 2021-02-19 15:46:38 +00:00
Norwin d38ae597e1
Add UI to delete tracked times (#14100)
Co-authored-by: 6543 <6543@obermui.de>
2021-02-19 12:52:11 +02:00
GiteaBot 6a696b93b1 [skip ci] Updated translations via Crowdin 2021-02-19 10:06:49 +00:00
Lunny Xiao 430b3b7806
Fix misleading word on delete repositories' archives (#14737) 2021-02-19 01:24:51 -05:00
GiteaBot cc551dac97 [skip ci] Updated translations via Crowdin 2021-02-19 00:41:31 +00:00
GiteaBot 9c41ad03b4 [skip ci] Updated translations via Crowdin 2021-02-18 14:48:40 +00:00
GiteaBot dc707aea09 [skip ci] Updated translations via Crowdin 2021-02-16 22:38:34 +00:00
zeripath ad43b119a8
Add Password Algorithm option to install page (#14701)
Add Password Algorithm option to install page

Fix #14674 

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
2021-02-16 23:37:20 +01:00
GiteaBot ebddee8d2b [skip ci] Updated translations via Crowdin 2021-02-16 03:04:48 +00:00
GiteaBot 5e5b063c6f [skip ci] Updated translations via Crowdin 2021-02-14 14:52:16 +00:00
GiteaBot ed834126a6 [skip ci] Updated translations via Crowdin 2021-02-13 16:08:31 +00:00
a1012112796 ac701637b4
Add dismiss review feature (#12674)
* Add dismiss review feature

refs:
    https://github.blog/2016-10-12-dismissing-reviews-on-pull-requests/
    https://developer.github.com/v3/pulls/reviews/#dismiss-a-review-for-a-pull-request

* change modal ui and error message

* Add unDismissReview api

Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
2021-02-11 18:32:25 +01:00
GiteaBot f180009375 [skip ci] Updated translations via Crowdin 2021-02-08 01:01:27 +00:00
GiteaBot dcd20f4364 [skip ci] Updated translations via Crowdin 2021-02-01 21:58:33 +00:00
GiteaBot a9188631b9 [skip ci] Updated translations via Crowdin 2021-02-01 04:50:39 +00:00
GiteaBot 05365816ab [skip ci] Updated translations via Crowdin 2021-01-29 15:53:59 +00:00
Lunny Xiao 0cd87d64ff
Update docs and comments to remove macaron (#14491) 2021-01-29 16:35:30 +01:00
GiteaBot 25b6255b92 [skip ci] Updated translations via Crowdin 2021-01-29 13:44:05 +00:00
a1012112796 f19da14c34
enhancement: add signoff option in commit form (#14516)
Signed-off-by: a1012112796 <1012112796@qq.com>
2021-01-29 16:57:45 +08:00
delvh aec8029277
Fix missing locale bug introduced by #14429 (#14513)
Fixes #14512
2021-01-29 04:06:10 +01:00
GiteaBot e45bf12a34 [skip ci] Updated translations via Crowdin 2021-01-28 12:31:28 +00:00
GiteaBot fe5266a25b [skip ci] Updated translations via Crowdin 2021-01-27 17:47:55 +00:00
GiteaBot 2e90a256be [skip ci] Updated translations via Crowdin 2021-01-27 12:48:37 +00:00
GiteaBot 1080b27a39 [skip ci] Updated translations via Crowdin 2021-01-27 10:02:09 +00:00
Jui-Nan Lin c10503afec
[Feature] add precise search type for Elastic Search (#12869)
* feat: add type query parameters for specifying precise search

* feat: add select dropdown in search box

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2021-01-27 12:00:35 +02:00
GiteaBot 5845c87b31 [skip ci] Updated translations via Crowdin 2021-01-26 22:48:54 +00:00
Brad Albright a598877fdf
Cron job to cleanup hook_task table (#13080)
Close **Prune hook_task Table (#10741)**

Added a cron job to delete webhook deliveries in the hook_task table. It can be turned on/off and the schedule controlled globally via app.ini. The data can be deleted by either the age of the delivery which is the default or by deleting the all but the most recent deliveries _per webhook_.

Note: I had previously submitted pr #11416  but I closed it when I realized that I had deleted per repository instead of per webhook. Also, I decided allowing the settings to be overridden via the ui was overkill. Also this version allows the deletion by age which is probably what most people would want.
2021-01-26 22:02:42 +01:00
GiteaBot afbddf1f0e [skip ci] Updated translations via Crowdin 2021-01-26 15:38:19 +00:00
Lunny Xiao 6433ba0ec3
Move macaron to chi (#14293)
Use [chi](https://github.com/go-chi/chi) instead of the forked [macaron](https://gitea.com/macaron/macaron). Since macaron and chi have conflicts with session share, this big PR becomes a have-to thing. According my previous idea, we can replace macaron step by step but I'm wrong. :( Below is a list of big changes on this PR.

- [x] Define `context.ResponseWriter` interface with an implementation `context.Response`.
- [x] Use chi instead of macaron, and also a customize `Route` to wrap chi so that the router usage is similar as before.
- [x] Create different routers for `web`, `api`, `internal` and `install` so that the codes will be more clear and no magic .
- [x] Use https://github.com/unrolled/render instead of macaron's internal render
- [x] Use https://github.com/NYTimes/gziphandler instead of https://gitea.com/macaron/gzip
- [x] Use https://gitea.com/go-chi/session which is a modified version of https://gitea.com/macaron/session and removed `nodb` support since it will not be maintained. **BREAK**
- [x] Use https://gitea.com/go-chi/captcha which is a modified version of https://gitea.com/macaron/captcha
- [x] Use https://gitea.com/go-chi/cache which is a modified version of https://gitea.com/macaron/cache
- [x] Use https://gitea.com/go-chi/binding which is a modified version of https://gitea.com/macaron/binding
- [x] Use https://github.com/go-chi/cors instead of https://gitea.com/macaron/cors
- [x] Dropped https://gitea.com/macaron/i18n and make a new one in `code.gitea.io/gitea/modules/translation`
- [x] Move validation form structs from `code.gitea.io/gitea/modules/auth` to `code.gitea.io/gitea/modules/forms` to avoid dependency cycle.
- [x] Removed macaron log service because it's not need any more. **BREAK**
- [x] All form structs have to be get by `web.GetForm(ctx)` in the route function but not as a function parameter on routes definition.
- [x] Move Git HTTP protocol implementation to use routers directly.
- [x] Fix the problem that chi routes don't support trailing slash but macaron did.
- [x] `/api/v1/swagger` now will be redirect to `/api/swagger` but not render directly so that `APIContext` will not create a html render. 

Notices:
- Chi router don't support request with trailing slash
- Integration test `TestUserHeatmap` maybe mysql version related. It's failed on my macOS(mysql 5.7.29 installed via brew) but succeed on CI.

Co-authored-by: 6543 <6543@obermui.de>
2021-01-26 16:36:53 +01:00
GiteaBot 3adbbb4255 [skip ci] Updated translations via Crowdin 2021-01-26 01:22:19 +00:00