TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-11-04 00:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,892 Commits 38 Branches 199 Tags
5d4251eb78bd3672b7368e89c7519b95c3b8680b
Commit Graph

8892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zeripath
3dabfd4933 Convert plumbing.ErrReferenceNotFound to git.ErrNotExist in GetRefCommitID (#10676) (#10797) 
* Fix panic in API pulls when headbranch does not exist (#10676)

Backport #10676

* Fix panic in API pulls when headbranch does not exist
* refix other reference to plumbing.ErrReferenceNotFound

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

* Apply suggestions from code review

Co-Authored-By: Lauris BH <lauris@nix.lv>
 2020-03-23 15:01:25 +02:00
zeripath
6ee6731290 account for empty lines in receive-hook message (#10773) (#10784) 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-03-21 10:49:02 +08:00
Lunny Xiao
602fe45936 Fix bug on branch API (#10767) (#10775) 
* Fix bug on branch API (#10767)

* Fix branch api canPush and canMerge
 2020-03-20 23:31:01 +02:00
Lauris BH
e2da9cd21f FIx hiding of fields in authorization source page (#10734) (#10752) 2020-03-19 11:40:01 -04:00
Lauris BH
c0b917b7eb Migrate to go-git/go-git v5.0.0 (#10735) (#10753) 2020-03-18 22:36:31 -04:00
John Olheiser
54ea58ddf0 Prevent default for linkAction (#10742) (#10743) 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-03-16 20:41:02 -03:00
Lunny Xiao
0158725387 Changelog for v1.10.6 (#10699) (#10709) 
* Changelog for v1.10.6

* Add warnning

* Apply suggestions from code review

Co-Authored-By: John Olheiser <john.olheiser@gmail.com>

Co-authored-by: John Olheiser <john.olheiser@gmail.com>

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
 2020-03-10 23:09:56 -04:00
Lunny Xiao
f3cacf1332 Add changelog for v1.11.3 (#10700) 
* Add changelog for v1.11.3

* Apply suggestions from code review

Co-Authored-By: John Olheiser <john.olheiser@gmail.com>

* Update CHANGELOG.md

Co-Authored-By: Antoine GIRARD <sapk@users.noreply.github.com>

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
v1.11.3 		2020-03-10 17:11:15 +00:00
techknowlogick
a15dc93011 cross compile using go 1.13.x (#10684) 2020-03-09 21:11:02 +02:00
zeripath
66b31786d3 Prevent panic in stopwatch (#10670) (#10673) 
Signed-off-by: Andrew Thornton <art27@cantab.net>
 2020-03-08 21:14:27 +02:00
Lunny Xiao
931ddfec6d add changelog for v1.10.5 (#10628) (#10632) 2020-03-08 09:54:23 -05:00
Lunny Xiao
7e0a5b17db Fix bug on pull view when required status check no ci result (#10648) (#10651) 2020-03-07 17:32:08 +08:00
zeripath
07688231c2 Changelog for v1.11.2 (#10627) 
* Changelog for v1.11.2

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

* Update CHANGELOG.md

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

* as per @jolheiser

* as per @jolheiser x2

* Update CHANGELOG.md

Co-Authored-By: John Olheiser <john.olheiser@gmail.com>

* Update CHANGELOG.md

Co-Authored-By: John Olheiser <john.olheiser@gmail.com>

* another security pr

* another security pr

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
v1.11.2 		2020-03-06 15:38:11 +08:00
John Olheiser
21eaeb8418 Issue writers perms can modify issues (#10623) (#10626) 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-03-06 04:42:20 +00:00
Lauris BH
9a929ad17f Handle deleted base branch in PR (#10618) (#10619) 
Signed-off-by: Andrew Thornton <art27@cantab.net>
 2020-03-05 22:23:34 +02:00
zeripath
c19ac41b34 Delete dependencies when deleting a repository (#10608) (#10616) 
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: zeripath <art27@cantab.net>
 2020-03-05 13:56:53 +00:00
Lunny Xiao
fd85d31cb4 Ensure executable bit is kept on the web editor (#10607) (#10614) 
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
 2020-03-05 16:55:21 +08:00
guillep2k
c9e4d7a564 Update mergebase in pr checker (#10586) (#10605) 2020-03-04 18:56:09 -03:00
techknowlogick
9990430e32 Build gitea1.11 with go1.13 (#10584) 2020-03-03 07:09:27 +00:00
John Olheiser
6f5656ab0e Logout POST action (#10582) (#10585) 
* Change logout to POST

* Update for redirect

* Revert octicon to font

Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-03-03 13:54:15 +08:00
guillep2k
e4a876cee1 Admin page for managing user e-mail activation (#10557) (#10579) 
* Admin page for managing user e-mail activation (#10557)

* Implement mail activation admin panel

* Apply suggestions by @lunny

* Add UI for user activated emails

* Prevent admin from self-deactivate; add modal

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

* Fix pagination options downgrade

Co-authored-by: zeripath <art27@cantab.net>
 2020-03-02 17:09:37 -03:00
guillep2k
abb534ba7a Fix migration bug on v96.go (#10572) (#10573) 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-03-02 10:32:20 -06:00
James Lakin
65dceb6a40 Fix redirection path if Slack webhook channel is invalid (#10566) 
The path to the hook config is already defined by orgRepoCtx
 2020-03-02 13:54:07 +02:00
6543
db26f0aca9 head.tmpl og:image picture location (#10531) (#10556) 
* head.tmpl og:image picture location (#10531)

og:image picture location

* CI.restart()

* CI.restart()

Co-authored-by: FreeCipher <admin@freecipher.com>
 2020-03-01 15:33:18 -05:00
Andreas Shimokawa
76878fd69b Fix 404 after activating secondary email (backport of #10547) (#10553) 2020-03-01 13:27:13 +01:00
zeripath
3444fa2dd7 Fix appearance of unsigned sha box in view_list (#10543) (#10544) 
Unfortunately the fix in #10511 was slightly incorrect and placed the
detail box at one level too far out.

Signed-off-by: Andrew Thornton <art27@cantab.net>
 2020-02-29 17:20:32 +02:00
zeripath
caa2aeaa52 Show Signer in commit lists and add basic trust (#10425) (#10524) 
Backport #10425
Backport #10511

* Show Signer in commit lists and add basic trust (#10425)

Show the avatar of the signer in the commit list pages as we do not
enforce that the signer is an author or committer. This makes it
clearer who has signed the commit.

Also display commits signed by non-members differently from
members and in particular make it clear when a non-member signer
is different from the committer to help reduce the risk of
spoofing.

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

Fix the signing icon in the  view_list.tmpl page (#10511)

Co-Authored-By: silverwind <me@silverwind.io>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
 2020-02-28 14:18:02 -03:00
6543
11300ee582 Fix potential bugs (#10513) (#10518) 
* use e if it is an option
* potential nil so check err first
* check err first
* m == nil already checked
 2020-02-28 00:12:23 -03:00
John Olheiser
c6b78c3d31 Org action fixes and form cleanup (#10512) (#10514) 
* More org fixes

* Move form action query to inputs

Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-02-27 19:38:21 -06:00
zeripath
4c40aa5be9 Use [:space:] instead of \s (#10508) (#10509) 
Backport #10508
 2020-02-27 19:12:10 +00:00
6543
50f2e90b76 [BugFix] Avoid mailing explicit unwatched (#10475) (#10500) 
* [BugFix] Avoid mailing explicit unwatched (#10475)
 2020-02-27 11:42:51 -06:00
zeripath
5d11ccc9e1 Handle push rejection message in Merge & Web Editor (#10373) (#10497) 
Backport #10373

* Handle push rejection message in Merge

* Fix sanitize, adjust message handling

* Handle push-rejection in webeditor CRUD too

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

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-02-27 15:37:11 +02:00
guillep2k
93860af542 Fix SQLite concurrency problems by using BEGIN IMMEDIATE (#10368) (#10493) 2020-02-26 23:30:57 -03:00
James Lakin
7bf5834f2c Show the username as a fallback on feeds if full name is blank (#10461) 
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-02-26 20:59:07 -05:00
John Olheiser
1fbdd9335f Fix double PR notification from API (#10482) (#10486) 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-02-26 22:39:39 +02:00
John Olheiser
e9061a537c Fix admin notices (#10480) (#10483) 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-02-26 11:14:37 -06:00
John Olheiser
ed664a9e1d Change admin dashboard to POST (#10465) (#10466) 
* Change admin dashboard to POST (#10465)

* Add form and convert to POST

* Redirect for flash

* Convert octicons back to fa for 1.11

Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-02-25 17:42:43 -06:00
John Olheiser
4cb18601ff Change action GETs to POST (#10462) (#10464) 
* Change action GETs to POST

* submite = submit + smite

* No more # href

* Fix test

* Match other tests

* Explicit csrf

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

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
 2020-02-25 15:08:21 -06:00
oscar.lofwenhamn
3abb25166c Update markbates/goth (backport) (#10445) 
Update markbates/goth to v1.61.2
- Fixes a JWT decoding issue in the OpenID provider
- Updates the GitHub provider to use the authorization header for authentication
- Updates the Twitch provider for Twitch's v5 API changes
- Adds the email and is_private_email fields to the Apple provider's GetUser implementation
- Modifies gothic to export a non-collidable context key for setting the Provider in a context.Context
- Adds new scopes to the Spotify provider
- Adds the IDToken from OpenID providers on the user struct
- Make Apple provider's SecretParams public
- Adds support for sign in with Apple, and drops support for Go versions 1.7 and 1.8
- Fixes the Slack provider's FetchURL logic to use the appropriate scope for the info it needs
Signed-off-by: Oscar LÃfwenhamn <oscar.lofwenhamn@cgi.com>
 2020-02-24 13:19:25 -05:00
6543
9e6ad64d48 Trigger webhooks on issue label-change via API too (#10421) (#10439) 
* trigger webhooks with api too

* fix comment

* notify report old too

* CI restart

* restart CI again

* remove duplicated code
 2020-02-24 14:30:59 +00:00
Lunny Xiao
b51d7c459e Fix webhook bug (#10427) (#10432) 
Co-authored-by: techknowlogick <matti@mdranta.net>
 2020-02-24 01:48:30 -03:00
zeripath
d3b6f001fe Various fixes in login sources (#10428) (#10429) 
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
 2020-02-23 22:46:17 +02:00
silverwind
e938f1d945 Add frontend/backend make targets, fix source release (#10325) (#10414) 
* Add frontend/backend make targets, fix source release

- Add 'make backend' and 'make frontend' make targets which are used to
  build go and js/css/svg files respectively.

- The 'backend' target can be invoked without requiring Node.js to be
  present on the system if pre-built frontend assets are present like
  in the release source tarballs.

- Fix source releases missing 'dist' folders inside 'node_modules' which
  were erronously excluded from tar.

- Store VERSION in file VERSION for the release tarballs and prefer that
  file over git-derived version.

* fix release task

* fix typo

* fix another typo

Fixes: https://github.com/go-gitea/gitea/issues/10253
 2020-02-22 08:51:58 -03:00
guillep2k
7284327a00 Prevent panic on merge to PR (#10403) (#10408) 
If you attempt to merge to a branch which on a PR there will be a nil pointer error in the pull request checker.

This panic is uncaught and will bring down the gitea server.

This PR adds protection to prevent this.

Co-authored-by: zeripath <art27@cantab.net>
 2020-02-21 22:53:32 +00:00
guillep2k
919f3f11e2 update crypto vendors (#10398) 
Co-authored-by: @techknowlogick
 2020-02-21 11:27:18 -03:00
guillep2k
3cee15e6f9 Ensure only own addresses are updated (#10397) (#10399) 2020-02-21 10:35:17 -03:00
Lunny Xiao
34e3644ada Fix wrong num closed issues on repository when close issue via commit (#10364) (#10380) 
Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-02-20 15:52:19 +01:00
guillep2k
14bd120cdc Reading pull attachments should depend on read UnitTypePullRequests (#10346) (#10354) 
Co-authored-by: zeripath <art27@cantab.net>
 2020-02-18 21:02:50 -06:00
6543
3e40f8bebc Set max-width on review-box comment box (#10348) (#10353) 
Co-authored-by: zeripath <art27@cantab.net>
 2020-02-18 18:59:14 -06:00
zeripath
df5f1d9dca Prevent nil pointer in GetPullRequestCommitStatusState (#10342) (#10344) 
Backport #10344 

Ensure that pr.HeadRepo is loaded before using it in GetPullRequestCommitStatusState.

Fixes error on merging with successful commit merge statuses.
 2020-02-18 20:04:10 +00:00