Earl Warren
e654fbccb1
[BRANDING] add the forgejo webhook type & update webhook docs URLs
...
templates/swagger/v1_json.tmpl updated with `make generate-swagger`
(cherry picked from commit 88899c492e
)
(cherry picked from commit 7171bd9617
)
(cherry picked from commit 1a742446c1
)
(cherry picked from commit d7c189d7b2
)
Conflicts:
routers/web/web.go
(cherry picked from commit cbdea868e4
)
(cherry picked from commit 6cd150483b
)
(cherry picked from commit 47246da8d3
)
(cherry picked from commit f2aa0e6b76
)
(cherry picked from commit 5a4fc69a16
)
(cherry picked from commit 48e444ca09
)
(cherry picked from commit 888e537811
)
(cherry picked from commit 5121f493c9
)
(cherry picked from commit 9394e55fdf
)
(cherry picked from commit 3a2ce51768
)
(cherry picked from commit 719ead3a65
)
(cherry picked from commit 83e6f82e2a
)
(cherry picked from commit 494a429b21
)
(cherry picked from commit 4d775db6b4
)
(cherry picked from commit b68f777dc2
)
(cherry picked from commit 5b934023fa
)
(cherry picked from commit 3b1ed8b16c
)
(cherry picked from commit 6bc4a46c9f
)
(cherry picked from commit 8064bb24a3
)
Conflicts:
templates/admin/hook_new.tmpl
templates/org/settings/hook_new.tmpl
templates/repo/settings/webhook/base_list.tmpl
templates/repo/settings/webhook/new.tmpl
templates/user/settings/hook_new.tmpl
https://codeberg.org/forgejo/forgejo/pulls/1181
(cherry picked from commit 55f5588a91
)
(cherry picked from commit a428bc06b3
)
(cherry picked from commit d2186eceb9
)
(cherry picked from commit b4e126e9af
)
(cherry picked from commit e4c7a92c2d
)
(cherry picked from commit a7165c8146
)
Conflicts:
templates/admin/hook_new.tmpl
templates/repo/settings/webhook/new.tmpl
https://codeberg.org/forgejo/forgejo/pulls/1420
[BRANDING] add the forgejo webhook type & update webhook docs URLs (squash) gitea logo for gitea webhooks
Refs: https://codeberg.org/forgejo/forgejo/issues/1367
(cherry picked from commit 2d8c1b9373
)
(cherry picked from commit 9135a5e1db
)
(cherry picked from commit 270f4020b0
)
(cherry picked from commit 33e5e2f0d8
)
(cherry picked from commit 7af8bcf479
)
Conflicts:
tests/integration/links_test.go
https://codeberg.org/forgejo/forgejo/pulls/1548
(cherry picked from commit ce2a434dcf
)
(cherry picked from commit c2fa42b4fd
)
(cherry picked from commit 3858c8d4db
)
(cherry picked from commit ebb0ae4920
)
(cherry picked from commit 93d354c418
)
(cherry picked from commit d5b08a2a4b
)
(cherry picked from commit e5e5caffaa
)
(cherry picked from commit 974d405700
)
2023-12-04 13:55:49 +01:00
Gusted
83cae67aa3
[SHARED] make confirmation clearer for dangerous actions
...
- Currently the confirmation for dangerous actions such as transferring
the repository or deleting it only requires the user to ~~copy paste~~
type the repository name.
- This can be problematic when the user has a fork or another repository
with the same name as an organization's repository, and the confirmation
doesn't make clear that it could be deleting the wrong repository. While
it's mentioned in the dialog, it's better to be on the safe side and
also add the owner's name to be an element that has to be typed for
these dangerous actions.
- Added integration tests.
(cherry picked from commit bf679b24dd
)
(cherry picked from commit 1963085dd9
)
(cherry picked from commit fb94095d19
)
(cherry picked from commit e1d1e46afe
)
(cherry picked from commit 93993029e4
)
(cherry picked from commit df3b058179
)
(cherry picked from commit 8ccc6b9cba
)
(cherry picked from commit 9fbe28fca3
)
(cherry picked from commit 4ef2be6dc7
)
https://codeberg.org/forgejo/forgejo/pulls/1873
Moved test from repo_test.go to forgejo_confirmation_repo_test.go to
avoid conflicts.
2023-12-04 13:06:15 +01:00
KN4CK3R
14354e4f8e
Read `previous` info from git blame ( #28306 )
...
Fixes #28280
Reads the `previous` info from the `git blame` output instead of
calculating it afterwards.
2023-12-01 01:26:52 +00:00
JakobDev
3618715fab
Add missing variable in tag list ( #28305 )
...
This fixes a regression from #25859
If a tag has no Release, Gitea will show a Link to create a Release for
the Tag if the User has the Permission to do this, but the variable to
indicate that is no longer set.
Used here:
1bfcdeef4c/templates/repo/tag/list.tmpl (L39-L41)
2023-11-30 16:26:56 +01:00
yp05327
8572e71a7f
Fix issue will be detected as pull request when checking `First-time contributor` ( #28237 )
...
Fix #28224
2023-11-27 10:46:55 +00:00
Lunny Xiao
882e502327
Fix comment permissions ( #28213 )
...
This PR will fix some missed checks for private repositories' data on
web routes and API routes.
2023-11-25 17:21:21 +00:00
Lunny Xiao
df1e7d0067
Use db.Find instead of writing methods for every object ( #28084 )
...
For those simple objects, it's unnecessary to write the find and count
methods again and again.
2023-11-24 03:49:41 +00:00
Nanguan Lin
37ed92d6fd
Revert "Fix EOL handling in web editor" ( #28101 )
...
Reverts go-gitea/gitea#27141
close #28097
2023-11-22 09:14:16 +00:00
JakobDev
08552f0076
Add edit option for README.md ( #28071 )
...
Fix #28059
![grafik](https://github.com/go-gitea/gitea/assets/15185051/07adc216-954e-486b-bfda-df3bc15f2089 )
2023-11-20 11:47:55 +00:00
JakobDev
48b9d98593
Fix viewing wiki commit on empty repo ( #28040 )
...
Fixes https://codeberg.org/forgejo/forgejo/issues/1758
For some weird reason we need to cast this nil.
2023-11-14 19:42:23 +08:00
yp05327
f48a863b99
Fix citation error when the file size is larger than 1024 bytes ( #27958 )
...
Mentioned in:
https://github.com/go-gitea/gitea/pull/27931#issuecomment-1798016960
Same to #25131 , so use the same method to fix this problem.
2023-11-08 06:40:12 +00:00
Lunny Xiao
0ba4ecc3bd
Fix http protocol auth ( #27875 )
2023-11-02 22:14:33 +08:00
Brecht Van Lommel
1756e30e10
Allow pull requests Manually Merged option to be used by non-admins ( #27780 )
...
Currently this feature is only available to admins, but there is no
clear reason why. If a user can actually merge pull requests, then this
seems fine as well.
This is useful in situations where direct pushes to the repository are
commonly done by developers.
---------
Co-authored-by: delvh <dev.lh@web.de>
2023-10-30 11:13:06 +08:00
silverwind
ce83609ff6
Upgrade to golangci-lint@v1.55.0 ( #27756 )
...
https://github.com/golangci/golangci-lint/releases/tag/v1.55.0
2023-10-24 02:54:59 +00:00
Nanguan Lin
61d94b247a
Fix `link-action` redirect network error ( #27734 )
...
<img width="823" alt="image"
src="https://github.com/go-gitea/gitea/assets/70063547/99da3d5a-c28a-4fd0-8ae0-88461a9142e2 ">
---------
Co-authored-by: 6543 <6543@obermui.de>
2023-10-23 20:34:17 +08:00
6543
adbc995c34
Show total TrackedTime on issue/pull/milestone lists ( #26672 )
...
TODOs:
- [x] write test for `GetIssueTotalTrackedTime`
- [x] frontport kitharas template changes and make them mobile-friendly
---
![image](https://github.com/go-gitea/gitea/assets/24977596/6713da97-201f-4217-8588-4c4cec157171 )
![image](https://github.com/go-gitea/gitea/assets/24977596/3a45aba8-26b5-4e6a-b97d-68bfc2bf9024 )
---
*Sponsored by Kithara Software GmbH*
2023-10-19 14:08:31 +00:00
yp05327
8abc1aae4a
Improve the list header in milestone page ( #27302 )
...
The ui of list header in milestone page is not same as issue and pr list
page.
And they are using different template codes which can be merged into
one.
Before:
![image](https://github.com/go-gitea/gitea/assets/18380374/29eb426c-2dd6-4cf2-96e0-82339fb631bb )
![image](https://github.com/go-gitea/gitea/assets/18380374/b36c4dff-469a-4395-8a02-a8c54e17ab21 )
![image](https://github.com/go-gitea/gitea/assets/18380374/d882c74a-451b-431d-b58e-3635a15d9718 )
![image](https://github.com/go-gitea/gitea/assets/18380374/292cd38d-1b50-47f1-b32c-9b5de90ce5fb )
After:
![image](https://github.com/go-gitea/gitea/assets/18380374/4529234e-67dc-4e17-9440-e638be4fbc41 )
![image](https://github.com/go-gitea/gitea/assets/18380374/c15b4d86-0762-497b-b28d-72d09443d629 )
---------
Co-authored-by: puni9869 <80308335+puni9869@users.noreply.github.com>
2023-10-18 00:03:42 +00:00
JakobDev
76a85a4ce9
Final round of `db.DefaultContext` refactor ( #27587 )
...
Last part of #27065
2023-10-14 08:37:24 +00:00
silverwind
73b63d9311
Replace ajax with fetch, improve image diff ( #27267 )
...
1. Dropzone attachment removal, pretty simple replacement
2. Image diff: The previous code fetched every image twice, once via
`img[src]` and once via `$.ajax`. Now it's only fetched once and a
second time only when necessary. The image diff code was partially
rewritten.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-10-11 12:34:21 +00:00
JakobDev
ebe803e514
Penultimate round of `db.DefaultContext` refactor ( #27414 )
...
Part of #27065
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-10-11 04:24:07 +00:00
Eng Zer Jun
13d5d2e711
Remove redundant `len` check around loop ( #27464 )
...
This pull request is a minor code cleanup.
From the Go specification (https://go.dev/ref/spec#For_range ):
> "1. For a nil slice, the number of iterations is 0."
> "3. If the map is nil, the number of iterations is 0."
`len` returns 0 if the slice or map is nil
(https://pkg.go.dev/builtin#len ). Therefore, checking `len(v) > 0`
before a loop is unnecessary.
---
At the time of writing this pull request, there wasn't a lint rule that
catches these issues. The closest I could find is
https://staticcheck.dev/docs/checks/#S103
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
2023-10-06 14:49:37 +08:00
Lunny Xiao
fe68bbeea0
When comparing with an non-exist repository, return 404 but 500 ( #27437 )
2023-10-04 13:59:03 +00:00
JakobDev
cc5df26680
Even more `db.DefaultContext` refactor ( #27352 )
...
Part of #27065
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
2023-10-03 10:30:41 +00:00
delvh
e709bc199f
Differentiate between `push` and `pull` `mirror sync in progress` ( #27390 )
...
Previously, if you had both a push and a pull mirror, the message did
not clarify if you've accidentally synchronized the wrong one.
Additionally fixed two typos that were encountered while debugging.
## Screenshots
![grafik](https://github.com/go-gitea/gitea/assets/51889757/164d5d20-728d-4365-9cb5-c37e95857cdf )
![grafik](https://github.com/go-gitea/gitea/assets/51889757/90bfffd2-abd4-4847-b8e2-db4231700a6d )
2023-10-02 14:52:18 +00:00
wxiaoguang
e4313feefd
Document the line-number counting behavior ( #27386 )
...
Ref #27377
2023-10-02 07:23:18 +00:00
puni9869
50070550a8
Hide archived labels when filtering by labels on the issue list ( #27115 )
...
Followup https://github.com/go-gitea/gitea/pull/26820
## Archived labels UI for issue filter and issue filter actions for
issues/pull request pages.
Changed:
* Enhanced the Issue filter and Issue filter actions UI page to
seamlessly incorporate a list of archived labels.
* Pagination functionality is same as before. If archived label checkbox
is checked then we are adding a query string`archived=true` in the url
to save the state of page.
* Issue filter actions menu is separated into different template.
* Adding the archived flag in issue url labels.
* Pull Request page is also work the same.
Outsourced:
* Defer the implementation of specialized handling for archived labels
to upcoming pull requests. This step will be undertaken subsequent to
the successful merge of this pull request.
Screenshots
### Issue page
<img width="1360" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/d7efb2ef-5b2b-449d-83f0-d430a32ec432 ">
### Issue page with label filter on archived label checkbox when not
checked --> No archived label is there in list
<img width="1249" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/ceea68ef-91f2-4693-910f-2e25e236bfc9 ">
### Issue page with label filter on archived label checkbox when checked
--> Show archived label in the list.
<img width="710" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/2414d26b-2079-4c3c-bd9e-f2f5411bcabf ">
### Issue page with label filter on issue action menu on archived label
checkbox when checked --> Show archived label in the list.
<img width="409" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/259cac87-3e21-4778-99a2-a6a0b8c81178 ">
### Applied the archived=true in Issue labels when archived checkbox is
checked.
<img width="984" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/657ce3db-c0ae-402e-b12d-3b580d3c2ed0 ">
---
Part of https://github.com/go-gitea/gitea/issues/25237
---------
Signed-off-by: puni9869 <punitinani1@hotmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Giteabot <teabot@gitea.io>
2023-10-01 09:04:39 -04:00
yp05327
393193a3e0
Fix repo count in org action settings ( #27245 )
...
Only in org action settings, repo count is missing
Before:
![image](https://github.com/go-gitea/gitea/assets/18380374/4a74c090-c55f-4f06-810a-c390337efa9d )
![image](https://github.com/go-gitea/gitea/assets/18380374/e234f7e7-178c-4186-bbc0-0f291192b011 )
![image](https://github.com/go-gitea/gitea/assets/18380374/c1db70cd-973b-40d5-ba17-1f354aed9149 )
In other setting page:
![image](https://github.com/go-gitea/gitea/assets/18380374/43bfec6b-a1a4-48a9-8280-ab6f967b7ec4 )
After:
![image](https://github.com/go-gitea/gitea/assets/18380374/9a697bd8-ce9f-40e2-8749-b46726d68d84 )
![image](https://github.com/go-gitea/gitea/assets/18380374/3b6d1e59-64dd-4655-953b-064718e6aa7a )
![image](https://github.com/go-gitea/gitea/assets/18380374/5604c063-556c-4252-8778-4e5a5e23b7e1 )
2023-09-29 15:46:07 +00:00
6543
2a2b0cb1d2
rename TotalTimes() to TotalTimesForEachUser() ( #27261 )
...
make function name more descriptive as it would otherwise imply it could
be used for e.g. #26672 too ...
---
*Sponsored by Kithara Software GmbH*
2023-09-29 13:04:14 +00:00
JakobDev
cf0df023be
More `db.DefaultContext` refactor ( #27265 )
...
Part of #27065
This PR touches functions used in templates. As templates are not static
typed, errors are harder to find, but I hope I catch it all. I think
some tests from other persons do not hurt.
2023-09-29 12:12:54 +00:00
yp05327
3945c26722
Improve tree not found page ( #26570 )
...
Before:
![before](https://github.com/go-gitea/gitea/assets/18380374/383822d5-7d77-4ec3-b49b-4ab1e8b167ce )
After:
![after](https://github.com/go-gitea/gitea/assets/18380374/32afa0a3-fa05-4087-b96e-7d067f0ed756 )
In Github:
https://github.com/yp05327/test/blob/main/test.drawio
Updated:
UI changed
![image](https://github.com/go-gitea/gitea/assets/18380374/41ed07ff-b815-4b4e-9779-5ab36b5f3980 )
![image](https://github.com/go-gitea/gitea/assets/18380374/5d7b28d6-a2fc-4d4c-8d6d-d93f9c9a270b )
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-09-29 07:42:39 +00:00
Dmitry Sharshakov
5e02e3b7ee
Add support for forking single branch ( #25821 )
...
Fixes #25117
Add UI for choosing branch to fork
Change default branch on single-branch forks
![image](https://github.com/go-gitea/gitea/assets/19504461/28505f69-a9a2-43a8-8b19-a0cdac3ddc5a )
---------
Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-09-29 09:48:39 +08:00
Zettat123
3fcad582c9
Improvements of releases list and tags list ( #25859 )
...
Follow #23465 and #25624
This PR introduces the following improvements:
- We do not need to call `GetTags` to get tags because tags have been
loaded by `RepoAssignment`
ef90fdbd1d/modules/context/repo.go (L663-L668)
- Similarly, the number of tags and releases also have been loaded by
`RepoAssignment`, so the related code has been removed from the
handlers. The query condition of `GetReleaseCountByRepoID` in
`RepoAssignment` has been changed to include draft releases.
ef90fdbd1d/modules/context/repo.go (L538-L551)
- `releasesOrTags` function has been removed. The code for rendering
releases list and tags list moved to `Releases` and `TagList`
respectively.
2023-09-28 13:21:47 +00:00
wxiaoguang
72c68177ab
Improve issue history dialog and make poster can delete their own history ( #27323 )
...
Fix #27313 (see the comment)
And some UI improvements:
### Before
![image](https://github.com/go-gitea/gitea/assets/2114189/420a314d-8f34-4e30-a557-f41cf4f0d2f2 )
![image](https://github.com/go-gitea/gitea/assets/2114189/60ca0be4-b55e-4e65-be73-fd53e0d4fc36 )
### After
![image](https://github.com/go-gitea/gitea/assets/2114189/d354f815-5a0c-4e63-8d59-d03ed344dbea )
![image](https://github.com/go-gitea/gitea/assets/2114189/6ef437a4-aa6f-4917-a260-00625ee71e79 )
![image](https://github.com/go-gitea/gitea/assets/2114189/9d88a36c-616b-4dc9-8c6b-76adaad8acf6 )
2023-09-28 08:43:20 +00:00
Lunny Xiao
673cf6af76
make writing main test easier ( #27270 )
...
This PR removed `unittest.MainTest` the second parameter
`TestOptions.GiteaRoot`. Now it detects the root directory by current
working directory.
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-09-28 01:38:53 +00:00
JakobDev
7047df36d4
Another round of `db.DefaultContext` refactor ( #27103 )
...
Part of #27065
---------
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
2023-09-25 13:17:37 +00:00
silverwind
3a187eace5
Fix EOL handling in web editor ( #27141 )
...
Fixes https://github.com/go-gitea/gitea/issues/27136 .
This does the following for Monaco's EOL setting:
1. Use editorconfig setting if present
2. Use the file's dominant line ending as detected by monaco, which uses
LF for empty file
2023-09-24 19:51:02 +00:00
JakobDev
28f9b313ba
Updates to the API for archived repos ( #27149 )
2023-09-21 23:43:29 +00:00
Lunny Xiao
47b878858a
Search branches ( #27055 )
...
Resolve #25233
<img width="1315" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/3ba59b58-471a-4e1b-985c-87edac2268c0 ">
<img width="1297" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/b6caa12f-323b-4f70-9c44-ef91cb71a26c ">
2023-09-17 08:24:40 +00:00
KN4CK3R
ed64f1c2b8
Support `.git-blame-ignore-revs` file ( #26395 )
...
Closes #26329
This PR adds the ability to ignore revisions specified in the
`.git-blame-ignore-revs` file in the root of the repository.
![grafik](https://github.com/go-gitea/gitea/assets/1666336/9e91be0c-6e9c-431c-bbe9-5f80154251c8 )
The banner is displayed in this case. I intentionally did not add a UI
way to bypass the ignore file (same behaviour as Github) but you can add
`?bypass-blame-ignore=true` to the url manually.
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-09-16 17:42:34 +00:00
KN4CK3R
c766140dad
Add `RemoteAddress` to mirrors ( #26952 )
...
This PR adds a new field `RemoteAddress` to both mirror types which
contains the sanitized remote address for easier (database) access to
that information. Will be used in the audit PR if merged.
2023-09-16 16:03:02 +00:00
JakobDev
f91dbbba98
Next round of `db.DefaultContext` refactor ( #27089 )
...
Part of #27065
2023-09-16 14:39:12 +00:00
JakobDev
c548dde205
More refactoring of `db.DefaultContext` ( #27083 )
...
Next step of #27065
2023-09-15 06:13:19 +00:00
JakobDev
76659b1114
Reduce usage of `db.DefaultContext` ( #27073 )
...
Part of #27065
This reduces the usage of `db.DefaultContext`. I think I've got enough
files for the first PR. When this is merged, I will continue working on
this.
Considering how many files this PR affect, I hope it won't take to long
to merge, so I don't end up in the merge conflict hell.
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-09-14 17:09:32 +00:00
JakobDev
8d0343e028
Fix issue templates when blank isses are disabled ( #27061 )
...
Fixes #27060
---------
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: delvh <dev.lh@web.de>
2023-09-14 14:20:16 +00:00
Nanguan Lin
cda97a7253
Update status and code index after changing the default branch ( #27018 )
...
Fix #26723
Add `ChangeDefaultBranch` to the `notifier` interface and implement it
in `indexerNotifier`. So when changing the default branch,
`indexerNotifier` sends a message to the `indexer queue` to update the
index.
---------
Co-authored-by: techknowlogick <matti@mdranta.net>
2023-09-13 04:43:31 +00:00
Lunny Xiao
e3ed67859a
Move some functions to service layer ( #26969 )
2023-09-08 21:09:23 +00:00
Lunny Xiao
4f32abaf94
move repository deletion to service layer ( #26948 )
...
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-09-08 04:51:15 +00:00
Lunny Xiao
f20e317d6d
Improve hint when uploading a too large avatar ( #26935 )
...
Fix #26390
---------
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: silverwind <me@silverwind.io>
2023-09-07 13:35:45 +00:00
CaiCandong
a78c2eae24
Replace `util.SliceXxx` with `slices.Xxx` ( #26958 )
2023-09-07 09:37:47 +00:00
Lunny Xiao
b9df9fa2e2
Move createrepository from module to service layer ( #26927 )
...
Repository creation depends on many models, so moving it to service
layer is better.
2023-09-06 12:08:51 +00:00