m79305216
/
gitea
forked from p85947160/gitea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,788 Commits 31 Branches 0 Tags 198 MiB
Commit Graph

8788 Commits

Author SHA1 Message Date
zeripath ff24f81a05
Create Changelog for v1.11.1 release (#10286) 
* Create Changelog

* Update CHANGELOG.md

Co-Authored-By: techknowlogick <matti@mdranta.net>

* Include

Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
 2020-02-17 01:22:39 +02:00
Antoine GIRARD e3cb4f9d0e
fix: set explicit POSTGRES_PASSWORD for pgsql on drone CI (#10303) 2020-02-16 16:38:54 -05:00
zeripath 9b7890f1cc
v1.10.4 Changelog (#10294) (#10305) 
* v1.10.4 Changelog

* Add backport identifier for #10261

* Update CHANGELOG.md entry for #9884
 2020-02-16 16:38:06 -05:00
Antoine GIRARD eb064dfda2
make: add release-sources #10295 (#10298) 
* make: add release-sources

* make: release-sources exclude .git and make_evidence

* fix: skip exclude MAKE_EVIDENCE_DIR not present in 1.11
 2020-02-16 13:23:41 -05:00
zeripath f9e66e5a46
Blacklist manifest.json & milestones user (#10292) (#10293) 
Fix #10290

Co-authored-by: techknowlogick <matti@mdranta.net>
 2020-02-16 13:20:59 +02:00
zeripath ef89260cf1
Repo name added to automatically generated commit message when mergin… (#9997) (#10285) 
* Repo name added to automatically generated commit message when merging pull request

* As per @lunny

Co-authored-by: Shashvat Kedia <sk261@snu.edu.in>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-02-15 21:17:01 +00:00
zeripath 315d928626
Fix Workerpool deadlock (#10283) (#10284) 
* Prevent deadlock on boost

* Force a boost in testchannelqueue
 2020-02-15 19:28:25 +00:00
guillep2k 5525452bdf
Divide GetIssueStats query in smaller chunks (#10176) (#10282) 
* Divide GetIssueStats query in smaller chunks

* Skip chunking if count is low enough

* Fix lint

* Define maxQueryParameters

* Remove absMaxQueryParameters because of lint

* Restart CI

* Restart CI

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-02-15 19:07:09 +02:00
Lunny Xiao 987cd277f6
Fix reply on code review (#10227) (#10257) 
Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: zeripath <art27@cantab.net>
 2020-02-13 11:32:30 +02:00
zeripath 5cdfde2ebf
Stop hanging issue indexer initialisation from preventing shutdown (#10243) (#10249) 
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
 2020-02-12 12:22:10 +02:00
jaqra 1cd6233cef
fix filter label emoji width (#10241) (#10244) 2020-02-12 00:39:06 +01:00
James Lakin cb81e39f7a
Fix issue sidebar menus having an infinite height (#10240) 2020-02-11 22:26:33 +01:00
Lauris BH 8efd6b32e2
Fix commit between two commits calculation if there is only last commit (#10225) (#10226) 2020-02-11 11:10:12 +08:00
6543 c95d9603ea
Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 
* Only check for conflicts/merging if the PR has not been merged in the interim (#10132)

* Only check for merging if the PR has not been merged in the interim

* fixup! Only check for merging if the PR has not been merged in the interim

* Try to fix test failure

* Use PR2 not PR1 in tests as PR1 merges automatically

* return already merged error

* enforce locking

* move pullrequest checking to after merge

This might improve the chance that the race does not affect us but does not prevent it.

* Remove minor race with getting merge commit id

move check pr after merge

* Remove unnecessary prepareTestEnv - onGiteaRun does this for us

* Add information about when merging occuring

* More logging

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>

* re order

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
 2020-02-10 13:09:08 +00:00
John Olheiser 9169b39458
Changelog 1.11.0 (#10204) 
* Changelog 1.11.0

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Backport snackport

Co-Authored-By: techknowlogick <matti@mdranta.net>

* Update CHANGELOG.md

Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>

Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
 2020-02-10 13:34:30 +02:00
Lauris BH 80eb50655a Fix followers and following tabs in profile (#10202) (#10203) 2020-02-09 21:00:24 +00:00
6543 b16c555541
Fix code-expansion arc-green theme bug (#10180) (#10185) 
* fix code-expansion theme bug

* working solution without important

* no new color

* the midle
 2020-02-08 00:04:03 +01:00
guillep2k b5b44364e3
Allow emoji on review head comments (#10159) (#10174) 
Co-authored-by: techknowlogick <matti@mdranta.net>

Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
 2020-02-07 21:39:24 +01:00
guillep2k 6af58022c8
Prevent double waitgroup decrement (#10170) (#10175) 
* Prevent double waitgroup decrement

Co-authored-by: zeripath <art27@cantab.net>
 2020-02-07 17:12:49 +00:00
guillep2k e48b460a0a
Fix issue/pull link (#10158) (#10173) 2020-02-07 11:51:23 +08:00
John Olheiser 2cd2614eaa
Fix push-create SSH bugs (#10145) (#10151) 
* Attempt to fix push-create SSH bugs

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Fix binding

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Invalid ctx

Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-02-05 15:50:06 +01:00
6543 0129e76ef5
Prevent DeleteUser API abuse (#10125) (#10128) 
* fix & co

* word suggestions from @jolheiser
 2020-02-03 19:44:06 +02:00
6543 6896dad675
working part of #9998 (#10114) (#10115) 
Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: zeripath <art27@cantab.net>
 2020-02-03 11:19:04 +08:00
zeripath 1ed4323005
Add button to revert SimpleMDE to plain textarea (#10099) (#10102) 2020-02-01 22:24:58 +02:00
Lunny Xiao 049af0d3d0
Fix branch page pull request title and link error (#10092) (#10097) 
* Fix branch page pull request title and link error (#10092)
 2020-02-01 15:14:56 +00:00
6543 f5727d83dd
[BugFix] [API] Pull.API.Convert: Only try to get HeadBranch if HeadRepo exist (#10029) (#10088) 2020-01-31 20:49:45 -05:00
Lauris BH 912ce27421
Update topics repo count when deleting repository (#10081) 2020-01-31 08:04:49 +00:00
6543 b3549bb5ec
[UI] Show pull icon on pull (#10061) (#10062) 2020-01-29 20:40:43 +00:00
Lunny Xiao 491cbeca67
Fix milestone API state parameter unhandled (#10049) (#10052) 
* Fix milestone API state parameter unhandled

* Fix test
 2020-01-29 18:01:44 +02:00
zeripath 895d92ffe5 Ensure that feeds are appropriately restricted (#10018) (#10019) 
* Ensure that feeds are appropriately restricted

* Placate golangci-lint
 2020-01-28 23:54:09 +02:00
zeripath 4b11f967bd
PRs: Move to use a temporary repo for pushing new prs (#10009) (#10042) 
* Move to use a temporary repo for pushing new prs
 2020-01-28 18:46:59 +00:00
Lunny Xiao 1e73dd2446 Fix wiki raw view on sub path (#10002) (#10040) 
* Fix wiki raw view on sub path

* Add test for subpath wiki raw file

* Fix bug
 2020-01-28 15:10:25 +00:00
6543 315026c2c5 trim whitespace of MilestoneName at creation/rename (#10017) (#10034) 2020-01-28 16:52:24 +08:00
Lunny Xiao 16dfd9ffbe Sanitize credentials in mirror form (#9975) (#9991) 2020-01-26 08:16:53 +00:00
Lunny Xiao 16f7b43903
Fix pull view when head repository or head branch missed and close related pull requests when delete head repository or head branch (#9927) (#9974) 
* fix pull view when head repository or head branch missed and close related pull requests when delete branch

* fix pull view broken when head repository deleted

* close pull requests when head repositories deleted

* Add tests for broken pull request head repository or branch

* fix typo

* ignore special error when close pull request

Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-01-25 17:39:53 +08:00
techknowlogick 043febdbc9
Switch to use -f instead of -F for sendmail (#9961) (#9970) 
Fix #9385

Co-authored-by: zeripath <art27@cantab.net>
 2020-01-24 20:45:53 -05:00
guillep2k 60f91d56f0 Fix check for push on default branch (#9963) 
Co-authored-by: techknowlogick <matti@mdranta.net>
 2020-01-24 19:56:30 -05:00
guillep2k 16fc15ae6a Fix file rename/copy not supported by indexer (#9967) 2020-01-24 18:25:00 -05:00
techknowlogick ef8f6d99f1
Fix regression with tag test running (#9941) 2020-01-22 15:49:08 -05:00
John Olheiser 4b688135f9 Changelog 1.11.0-rc2 (#9853) 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-01-22 14:56:55 -05:00
John Olheiser e24861a546 Don't convert ellipsis in markdown (#9905) (#9937) 
* Don't convert ellipsis

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Formatting

Co-Authored-By: zeripath <art27@cantab.net>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
 2020-01-22 16:24:04 +00:00
6543 128cc34344 Fixed repo link in generated comment for cross repository dependency (#9863) (#9935) 
* fixed link to issue in issue comments after adding/removing a dependency, before links assumed the issue was in the same repository. also changed the format of the displayed issue since the issue will not necessarily be in the same repo

* based on pr comments, changed to use HTMLURL instead of piecing together the issue url, and added an if statement around the issue link display as a nil protection

* only showing repo name in dependency comment if the issue is from another repo

Co-authored-by: Brad Albright <32200834+bhalbright@users.noreply.github.com>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
 2020-01-22 12:54:40 +02:00
Lauris BH f82a805478 Check if diff actually contains sections when rendering (#9926) (#9933) 2020-01-22 08:02:57 +00:00
Lunny Xiao 0dced15c1a Fix wrong hint when status checking is running on pull request view (#9886) (#9928) 
* Fix wrong hint when status checking is running on pull request view

* fix lint

* fix test

* fix test

* fix wrong tmpl

* fix import

* rename function name
 2020-01-22 08:06:11 +02:00
John Olheiser db9342c854 Fix RocketChat (#9908) (#9921) 
* Fix RocketChat??

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Don't send attachment for repo create/delete

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Make fmt

Signed-off-by: jolheiser <john.olheiser@gmail.com>

Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-01-21 17:24:18 -05:00
zeripath 79c1d48532 Do not try to recreate ldap user if they are already created (#9900) (#9919) 
* Do not try to recreate ldap user if they are already created

* just remove autoregister

Co-authored-by: techknowlogick <matti@mdranta.net>

Co-authored-by: techknowlogick <matti@mdranta.net>
 2020-01-21 21:17:00 +01:00
zeripath 05b9864086 Update queue_redis.go (#9911) 2020-01-21 20:02:25 +08:00
zeripath ff508c9c9b Add option to prevent LDAP from deactivating everything on empty search (#9879) (#9896) 
* Add option to prevent LDAP from deactivating everything on empty search

* Update options/locale/locale_en-US.ini

Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-01-20 21:18:23 +02:00
Lunny Xiao f96c1a2c79 Fix wrong permissions check when issues/prs shared operations (#9885) (#9889) 
* Fix wrong permissions check when issues/prs shared operations

* move redirect to the last of the function

* fix swagger

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-01-20 17:59:33 +02:00
6543 ce756ee89f Check user != nil before checking values (#9881) (#9883) 
* Check user != nil before checking values

* Handle autoAdmin

Co-authored-by: zeripath <art27@cantab.net>
 2020-01-19 22:01:39 -05:00