tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions 1
8750 commits 11 branches 231 tags 586 MiB
Commit graph

8750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lauris BH
5ae6016fd9
Merge branch 'master' into feature/restricted-users 2020-01-11 12:34:38 +02:00
David Svantesson
32fb813133 Allow repo admin to merge PR regardless of review status (#9611) 
* Allow repo admin to merge even if review is not ok.
 2020-01-11 02:29:34 -05:00
Lunny Xiao
4d06d10dba Move tracked time api convert to convert package (#9665) 2020-01-10 21:59:41 -05:00
guillep2k
705b1e49a8 Don't attempt to close issue if already closed (#9696) 
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-01-11 09:20:11 +08:00
Manush Dodunekov
d775c3b22b fix yet another thinko 2020-01-11 01:58:45 +01:00
Ryan
438e159d04 Remove deprecation comment for CreateOrgRepo (#9670) 
Remove mistakenly added `deprecated: true` swagger comment from the `/orgs/{orgr}/repos` handler
 2020-01-10 16:54:46 -05:00
John Olheiser
480ef9d410 Load milestone in API PR list (#9671) 
* Load milestone for Issue API format

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

* Move further down

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

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <matti@mdranta.net>
 2020-01-10 16:17:56 -05:00
Antoine GIRARD
e90e435f04 Remove un-needed script import since #9554 (#9694) 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-01-10 15:36:32 -05:00
Manush Dodunekov
57744b54c4 merge upstream & fix conflicts 2020-01-10 19:06:42 +01:00
Lunny Xiao
7a3a90aca3
Fix wrong original git service type on a migrated repository (#9693) 2020-01-10 23:35:17 +08:00
silverwind
3143bb10da update js dependencies (#9676) 
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-01-10 13:39:01 +01:00
Lunny Xiao
99d869fa63
Move push commits from models to modules/repository (#9370) 
* Move push commits from models to modules/repository

* fix test

* fix test

* fix test

* fix test

* fix test

Co-authored-by: zeripath <art27@cantab.net>
 2020-01-10 17:34:21 +08:00
Lunny Xiao
384c2b342e
Move pull request api convert to convert package (#9664) 
* Move pull request api convert to convert package

* Rename ToPullRequest to ToAPIPullRequest
 2020-01-10 15:53:53 +08:00
Lunny Xiao
8878cfa4a1
Fix lint (#9688) 2020-01-10 13:50:23 +08:00
zeripath
17b844a3ec Move Errored PRs out of StatusChecking (#9675) 
* Set Errored PRs out of StatusChecking

* Ensure that api status is correctly set too

* Update models/pull.go

Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com>

Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com>
 2020-01-10 08:14:14 +08:00
zeripath
6c46a56360 Prevent redirect to Host (#9678) 2020-01-09 16:34:25 -05:00
techknowlogick
8f31c2fc76
remove google font call (#9668) 2020-01-09 15:48:47 -05:00
silverwind
b3722114ce eliminate horizontal scroll caused by footer (#9669) 2020-01-09 19:33:39 +00:00
GiteaBot
a311ace354 [skip ci] Updated translations via Crowdin 2020-01-09 16:43:29 +00:00
6543
e8ea0695b0 [API] creat org repo call same as github (#9186) 
* deprecate /api/v1/org/{org}/repos in favour of /api/v1/orgs/{org}/repos + cleanup api repository routes a bit

* remove redundant code

* use upstream function for api cal

* make generate-swagger

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: Lauris BH <lauris@nix.lv>
 2020-01-09 16:40:01 +00:00
Bo-Yi Wu
07520431ae chore(PR): Add Reviewed-on in commit message (#9623) 2020-01-09 14:31:09 +00:00
6543
1080c768d3 [API] orgEditTeam make Fields optional (#9556) 
* API: orgEditTeam make Fields optional

* add TestCase

* Update integrations/api_team_test.go

* suggestions from lafriks

use len() to check if string is empty

Co-Authored-By: Lauris BH <lauris@nix.lv>

* change ...

* use Where not ID to get mssql

* add return and code format

* fix test

* fix test ... null pointer exept

* update specific colums

* only specific colums too

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-01-09 13:15:14 +00:00
GiteaBot
71fe018977 [skip ci] Updated translations via Crowdin 2020-01-09 11:58:47 +00:00
6543
6baa5d7588 [API] Add notification endpoint (#9488) 
* [API] Add notification endpoints

 * add func GetNotifications(opts FindNotificationOptions)
 * add func (n *Notification) APIFormat()
 * add func (nl NotificationList) APIFormat()
 * add func (n *Notification) APIURL()
 * add func (nl NotificationList) APIFormat()
 * add LoadAttributes functions (loadRepo, loadIssue, loadComment, loadUser)
 * add func (c *Comment) APIURL()
 * add func (issue *Issue) GetLastComment()
 * add endpoint GET /notifications
 * add endpoint PUT /notifications
 * add endpoint GET /repos/{owner}/{repo}/notifications
 * add endpoint PUT /repos/{owner}/{repo}/notifications
 * add endpoint GET /notifications/threads/{id}
 * add endpoint PATCH /notifications/threads/{id}

* Add TEST

* code format

* code format
 2020-01-09 11:56:32 +00:00
Manush Dodunekov
eeecdab5db Use an array of VisibleType for filtering 2020-01-09 09:15:10 +01:00
Manush Dodunekov
ee2f31f32b Don't assume block only applies to orgs 2020-01-09 08:43:15 +01:00
Manush Dodunekov
b788ef32ff Don't disclose limited orgs to unauthenticated users 2020-01-09 08:28:11 +01:00
Manush Dodunekov
3459547fca merge upstream, resolve migration conflicts 2020-01-09 07:51:45 +01:00
John Olheiser
ee9ce0cfa9 Fix nil reference in repo generation (#9660) 
* Fix nil reference

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

* Tighten

Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-01-09 08:22:37 +02:00
David Svantesson
25531c71a7 Mark PR reviews as stale at push and allow to dismiss stale approvals (#9532) 
Fix #5997.

If a push causes the patch/diff of a PR towards target branch to change, all existing reviews for the PR will be set and shown as stale.
New branch protection option to dismiss stale approvals are added.
To show that a review is not based on the latest PR changes, an hourglass is shown
 2020-01-09 01:47:45 +00:00
Manush Dodunekov
7d74b8596c Avoid extra loop 2020-01-09 01:37:39 +01:00
Manush Dodunekov
7d17aad805 even tighter 2020-01-09 00:31:40 +01:00
Manush Dodunekov
10de9b6b89 updateUserAccess(): use tighter syntax as suggested by lafriks 2020-01-09 00:12:43 +01:00
John Olheiser
5b2d9333f1 Add HTML URL to API Issues (#9654) 
* Add HTML URL to API Issues

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

* Swagger

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

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-01-08 23:10:34 +00:00
Manush Dodunekov
06ad61aad3 or even better: map[int64]*userAccess 2020-01-08 22:19:00 +01:00
6543
14a9687444 times Add filters (#9373) 
(extend #9200)
 * add query param for GET functions (created Bevore & after)
 * add test
 * generalize func GetQueryBeforeSince

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-01-08 16:14:00 -05:00
Manush Dodunekov
124f056e19 Revert to an int64 keyed accessMap 
* Add type `userAccess`
* Add convenience func updateUserAccess()
* Turn accessMap into a `map[int64]userAccess`

Signed-off-by: Manush Dodunekov <manush@stendahls.se>
 2020-01-08 21:42:59 +01:00
Manush Dodunekov
5b652427c0 Remove unnecessary org.IsOrganization() call 
Signed-off-by: Manush Dodunekov <manush@stendahls.se>
 2020-01-08 18:48:32 +01:00
John Olheiser
f8dcc5f9f8 Add PR review webhook to Telegram (#9653) 
Signed-off-by: jolheiser <john.olheiser@gmail.com>

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
 2020-01-08 18:45:24 +01:00
Bagas Sanjaya
b822518e39 [Docs] Linux Service Edit (#9633) 
* Rename h3 title

* Add intro

Should work on Ubuntu Xenial, but should work on any Linux distros.

* Indirect edit files

Instead of providing `sudo vim`, invite to edit files.

* enable now instead of enable and start

* Re-add systemctl enable && systemctl start

* Revert service enablement back to status quo

* Add enable now counterpart for systemd > v220

* Apply suggestions from @sapk

Strip `vim` from editor usage

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

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
 2020-01-08 17:33:13 +01:00
6543
c779ac12c9 fix #9648 | use filepath.IsAbs instead of path.IsAbs (#9651) 
* fix #9648

* found next

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
 2020-01-08 15:30:58 +01:00
Manush Dodunekov
4501f22d98 Revert unnecessary change .isUserPartOfOrg -> .IsUserPartOfOrg 
Signed-off-by: Manush Dodunekov <manush@stendahls.se>
 2020-01-08 14:55:36 +01:00
Manush Dodunekov
dc7e423afc Mention restricted users in the faq 
Signed-off-by: Manush Dodunekov <manush@stendahls.se>
 2020-01-08 15:38:56 +02:00
GiteaBot
98772d376c [skip ci] Updated translations via Crowdin 2020-01-08 12:45:05 +00:00
Shashvat Kedia
632fb5badc Fix #9552: Merge commits generated by pull request capture pull request details (#9635) 2020-01-08 11:53:07 +00:00
Antoine GIRARD
1f7b0fc4f4
Merge branch 'master' into feature/restricted-users 2020-01-08 12:31:28 +01:00
Bagas Sanjaya
74d6ec6807 [Docs] Grammar Edit on Enabling HTTPS Using Reverse Proxy (#9649) 
* Use infinitives for accept and pass

* Close parentheeses for proxy exposed
 2020-01-08 10:20:15 +01:00
6543
e88d67b774 [API] add comments endpoint for single comment (#9494) 
* add GET /repos/{owner}/{repo}/issues/comments/{id}
 and complete error list for swagger in other func

* add repo check
 2020-01-08 15:00:59 +08:00
techknowlogick
c884735740
Plural form for changelog (#9645) 
Fix: https://gitea.com/gitea/changelog/issues/16
 2020-01-08 00:08:49 -05:00
techknowlogick
8e132cd16a
Update date for new year (#9644) 2020-01-07 23:06:45 -05:00