Commit Graph
4392 Commits
Author SHA1 Message Date
6543andGitHub a88f3663eb Fix merge dialog on protected branch with missing required statuses (#11074)
It is possible for misconfigured protected branches to have required status checks that are not in any of the current statuses: Pending, Success, Error, Failure, or Warning - presumably because the CI has not contacted us as yet.

Fix #10636 by adding case: missing StatusChecks when these are missing
2020-04-15 21:35:18 +01:00
6543andGitHub 70fab7e26a document 404 responce and meaning (#11073) 2020-04-15 16:03:05 +03:00
2e85ad665a Contents API should return 404 on not exist (#10323)
* Return 404 on not exist

* swagger update and use git.IsErrNotExist

* Handle delete too

* Handle delete too x2

* Fix pr 10323 (#3)

* fix TESTS

* leafe a note for fututre

* placate golangci-lint

Signed-off-by: Andrew Thornton <[email protected]>

* Update integrations/api_repo_file_delete_test.go

Co-Authored-By: 6543 <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: Antoine GIRARD <[email protected]>
Co-authored-by: 6543 <[email protected]>
Co-authored-by: guillep2k <[email protected]>
2020-04-15 02:18:51 -03:00
6543andGitHub 10e2f29144 Cache PullRequest Divergence (#10914)
* Cache PullRequest Divergence

* only re-calc divergence if AddTestPullRequestTask() is exec

* migrate already open pulls

* finalize

* take care of closed&not-merged+deleted-branch pull requests

* fix nil pointer exeption

Signed-off-by: 6543 <[email protected]>

* try this

* no error its a warn

* init gitea-repositories-meta

* dont use gitDivergence type

* CI.restart()

* CI.restart()

* CI.restart()

* CI.restart()

* check IsUserAllowedToUpdate independend from CommitsBehind
2020-04-14 09:53:34 -04:00
赵智超andGitHub 09aa122bd1 ui: Change icon on title for merged PR to git-merge (#11064)
Signed-off-by: a1012112796 <[email protected]>
2020-04-14 19:37:10 +08:00
281029529b ui: Add MergePull comment type instead of close for merge PR (#11058)
Signed-off-by: a1012112796 <[email protected]>

Co-authored-by: Lauris BH <[email protected]>
2020-04-14 09:06:23 +08:00
063b1d260f Fix language label vertical alignment (#11061)
Co-authored-by: guillep2k <[email protected]>
2020-04-13 17:00:32 -03:00
59c31b490f fix 404 and 500 image size in small size screen (#11043)
do it by define Semantic UI image class

Signed-off-by: a1012112796 <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
2020-04-11 17:31:17 -03:00
6543andGitHub 0dadea19bc [Api] Check Notify (always return json) (#10059)
* BEAKING: check return status based on struct not httpStatus

* update Tests

* CI.restart()
2020-04-10 19:49:39 -04:00
c97e988380 Prettify Timeline (#10972)
Co-authored-by: mrsdizzie <[email protected]>
2020-04-11 01:01:41 +03:00
6543andGitHub bc362ea3c6 remove package code.gitea.io/gitea/modules/git import out of models (#11025) 2020-04-10 14:26:37 +03:00
743022116d Add Get/Update for api/v1/user/applications/oauth2 (#11008)
Add api methods for getting and updating user oauth2 applications.

Signed-off-by: Dan Molik <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
2020-04-09 19:37:31 -05:00
John OlheiserandGitHub 4ec7a659ce Add git hook tooltip (#11030)
Signed-off-by: jolheiser <[email protected]>
2020-04-09 18:15:09 -05:00
08208cdfb8 Fix forked repo has no icon and language stat. (#10791)
* Update header.tmpl

* Update _repository.less

* Update pull.go

* Update indexer.go

* Update pull.go

* Update pull.go

* Update indexer.go

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

* fix forked repo doesn't have language stat

Thanks the advice from lunny and 6543.

* fix forked repo doesn't have language stat

Modified as suggested by 6543.

* fix forked repo doesn't have language stat

simplify the function.

* fix forked repo doesn't have language stat

update the indexer after the loop

Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: Lauris BH <[email protected]>
2020-04-08 15:13:04 +03:00
6543andGitHub 3d63caa542 [API] Get a single commit via Ref (#10915)
* GET /repos/:owner/:repo/commits/:ref

* add Validation Checks

* Fix & Extend TEST

* add two new tast cases
2020-04-07 22:54:46 -04:00
6543andGitHub ad31d6b5e8 Fix release counter on API repository info (#10968)
Use the same mechanism as the webpage for calculating the release count

Fix #10946
2020-04-06 19:42:30 +01:00
ef89e75d0e add request review from specific reviewers feature in pull request (#10756)
* add request review feature in pull request

add a way to notify specific reviewers to review like github , by add  or delet a  special type
review . The acton is  is similar to Assign ,  so many code reuse the function and items of
Assignee, but the meaning and result is different.

The Permission style is is similar to github, that only writer can add a review request from Reviewers,
but the poster can recall and remove a review request after a reviwer has revied even if he don't have
Write Premission. only manager , the poster and reviewer of a request review can remove it.

The reviewers can be requested to review contain all readers for private repo , for public, contain
all writers and watchers.

The offical Review Request will block merge if Reject can block it.

an other change: add ui otify for Assignees.

Co-authored-by: guillep2k <[email protected]>
Co-authored-by: Lauris BH <[email protected]>

Signed-off-by: a1012112796 <[email protected]>

* new change

* add placeholder string

* do some changes follow #10238 to add review requests num on lists also
change icon for review requests to eye

Co-authored-by: Lauris BH <[email protected]>
2020-04-06 19:33:34 +03:00
88c14326b1 Users should not be able to prohibit their own login (#10970)
* ui: limit managers prohibit themself to login

Because I think it's crazy and not reasonale , that if a user can
prohibit themself to login. so suggest limit this choice on ui

Signed-off-by: a1012112796 <[email protected]>

* skip self Prohibit Login in post event handle

* fix comment

Co-authored-by: zeripath <[email protected]>
Co-authored-by: John Olheiser <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
2020-04-06 10:23:15 -04:00
1bec60e02a Change default charset for MySQL on install to utf8mb4 (#10989)
Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: Lunny Xiao <[email protected]>
2020-04-06 09:33:15 -04:00
赵智超andGitHub 9814dd68ad fix merge box icon color bug (#10974)
that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <[email protected]>
2020-04-05 20:01:12 +03:00
14c97c0501 Add titles and improve messages on sidebar menus (#10872)
* ui: add more message on sidebar menus

* add title on the menus
* show some message instead of hide choose bar when have nothing to choose
* add simply filter for each menus
* do same changes in mew_form.tmpl
* remove some unusefull comments in mew_form.tmpl

Signed-off-by: a1012112796 <[email protected]>

* do review suggestions

* add filter message  on sidebar filter
* change IsIssueWriter to HasIssuesOrPullsWritePermission

Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: guillep2k <[email protected]>
2020-04-04 02:39:48 -03:00
f685edf510 Change review status icons on PR view style to Github style (#10737)
* change the icon of ApproveReview pr from "eye" to "check" like github
* change the icon of RejectReview pr from "x" to "request-change" like github
* add "-" after "{{" which need to be one line (TODO: may be not change all)

Signed-off-by: a1012112796 <[email protected]>

Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: John Olheiser <[email protected]>
Co-authored-by: guillep2k <[email protected]>
2020-04-03 02:12:42 -03:00
8d99ee2773 Add Organization Wide Labels (#10814)
* Add organization wide labels

Implement organization wide labels similar to organization wide
webhooks. This lets you create individual labels for organizations that can be used
for all repos under that organization (so being able to reuse the same
label across multiple repos).

This makes it possible for small organizations with many repos to use
labels effectively.

Fixes #7406

* Add migration

* remove comments

* fix tests

* Update options/locale/locale_en-US.ini

Removed unused translation string

* show org labels in issue search label filter

* Use more clear var name

* rename migration after merge from master

* comment typo

* update migration again after rebase with master

* check for orgID <=0 per guillep2k review

* fmt

* Apply suggestions from code review

Co-Authored-By: guillep2k <[email protected]>

* remove unused code

* Make sure RepoID is 0 when searching orgID per code review

* more changes/code review requests

* More descriptive translation var per code review

* func description/delete comment when issue label deleted instead of hiding it

* remove comment

* only use issues in that repo when calculating number of open issues for org label on repo label page

* Add integration test for IssuesSearch API with labels

* remove unused function

* Update models/issue_label.go

Co-Authored-By: guillep2k <[email protected]>

* Use subquery in GetLabelIDsInReposByNames

* Fix tests to use correct orgID

* fix more tests

* IssuesSearch api now uses new BuildLabelNamesIssueIDsCondition. Add a few more tests as well

* update comment for clarity

* Revert previous code change now that we can use the new BuildLabelNamesIssueIDsCondition

* Don't sort repos by date in IssuesSearch API

After much debugging I've found a strange issue where in some cases MySQL will return a different result than other enigines if a query is sorted by a null collumn. For example with our integration test data where we don't set updated_unix in repository fixtures:

SELECT `id`, `owner_id`, `owner_name`, `lower_name`, `name`, `description`, `website`, `original_service_type`, `original_url`, `default_branch`, `num_watches`, `num_stars`, `num_forks`, `num_issues`, `num_closed_issues`, `num_pulls`, `num_closed_pulls`, `num_milestones`, `num_closed_milestones`, `is_private`, `is_empty`, `is_archived`, `is_mirror`, `status`, `is_fork`, `fork_id`, `is_template`, `template_id`, `size`, `is_fsck_enabled`, `close_issues_via_commit_in_any_branch`, `topics`, `avatar`, `created_unix`, `updated_unix` FROM `repository` ORDER BY updated_unix DESC LIMIT 15 OFFSET 45

Returns different results for MySQL than other engines. However, the similar query:

SELECT `id`, `owner_id`, `owner_name`, `lower_name`, `name`, `description`, `website`, `original_service_type`, `original_url`, `default_branch`, `num_watches`, `num_stars`, `num_forks`, `num_issues`, `num_closed_issues`, `num_pulls`, `num_closed_pulls`, `num_milestones`, `num_closed_milestones`, `is_private`, `is_empty`, `is_archived`, `is_mirror`, `status`, `is_fork`, `fork_id`, `is_template`, `template_id`, `size`, `is_fsck_enabled`, `close_issues_via_commit_in_any_branch`, `topics`, `avatar`, `created_unix`, `updated_unix` FROM `repository` ORDER BY updated_unix DESC LIMIT 15 OFFSET 30

Returns the same results.

This causes integration tests to fail on MySQL in certain cases but would never show up in a real installation. Since this API call always returns issues based on the optionally provided repo_priority_id or the issueID itself, there is no change to results by changing the repo sorting method used to get ids earlier in the function.

* linter is back!

* code review

* remove now unused option

* Fix newline at end of files

* more unused code

* update to master

* check for matching ids before query

* Update models/issue_label.go

Co-Authored-By: 6543 <[email protected]>

* Update models/issue_label.go

* update comments

* Update routers/org/setting.go

Co-authored-by: Lauris BH <[email protected]>
Co-authored-by: guillep2k <[email protected]>
Co-authored-by: 6543 <[email protected]>
2020-04-01 01:14:46 -03:00
John OlheiserandGitHub 36d9237e60 Add accordion to release list and compact non-latest (#10910)
Signed-off-by: jolheiser <[email protected]>
2020-03-31 17:39:54 -05:00
972b3bf3b0 Split dashboard elements into separate template files (#10885)
* Split dashboard elements into separate template files

No code change just Move Heatmap and Repo list/search into separate
template files (like feeds and navbar already are). This will let a
user more easily replace dashboard.tmpl without regularly becoming
out of sync with fixes or changes to the actual code.

Fixes #10870

* End file with an empty line

Co-authored-by: zeripath <[email protected]>
2020-03-30 03:49:54 -03:00
828a27feeb Add Matrix webhook (#10831)
* Add Matrix webhook

Signed-off-by: Till Faelligen <[email protected]>

* Add template and related translations for Matrix hook

Signed-off-by: Till Faelligen <[email protected]>

* Add actual webhook routes and form

Signed-off-by: Till Faelligen <[email protected]>

* Add missing file

Signed-off-by: Till Faelligen <[email protected]>

* Update modules/webhook/matrix_test.go

* Use stricter regex to replace URLs

Signed-off-by: Till Faelligen <[email protected]>

* Escape url and text

Signed-off-by: Till Faelligen <[email protected]>

* Remove unnecessary whitespace

* Fix copy and paste mistake

Co-Authored-By: Tulir Asokan <[email protected]>

* Fix indention inconsistency

* Use Authorization header instead of url parameter

* Add raw commit information to webhook

Co-authored-by: Lauris BH <[email protected]>
Co-authored-by: Tulir Asokan <[email protected]>
2020-03-28 15:09:55 +02:00
bbd910ed1b Allow to set protected file patterns that can not be changed under no conditions (#10806)
Co-Authored-By: zeripath <[email protected]>
2020-03-27 00:26:34 +02:00
zeripathandGitHub 52cfd2743c Option to set default branch at repository creation (#10803)
* Option to set default branch at repository creation
* Handle template repos with non-default master branch
* Add DefaultBranch handling on creation to API

Fix #9542

Signed-off-by: Andrew Thornton <[email protected]>
2020-03-26 19:14:51 +00:00
John OlheiserandGitHub ad6f2323b7 Fix milestone template (#10824)
Signed-off-by: jolheiser <[email protected]>
2020-03-25 18:08:00 +01:00
85fb33a65f move jquery-datetimepicker to npm/webpack (#10713)
- update to latest version and move to npm
- adapt for api changes and css class rename
- add specificity to arc-green rules as dependency css now loads later
- use imports-loader to make it load correctly
- fix some wrong paths in librejs

Co-authored-by: techknowlogick <[email protected]>
2020-03-17 15:08:15 -04:00
赵智超andGitHub 2f928316db hide gear icon for user who can't use them on sidebar (#10750)
reason:
If user can't choose the Assignees labels and Milestone It's
not usefull to show a gear label , and it It will mislead the
user into thinking that it's a BUG rather than thy don't have
permission to chosse them.

Signed-off-by: a1012112796 <[email protected]>
2020-03-17 12:19:03 -04:00
Success GoandGitHub da1633a5d4 fix miss spelling (#10721) 2020-03-12 14:05:52 +01:00
984b85c1a7 Remove old vendored dropzone from serviceworker (#10703)
* Remove dropzone from serviceworker

* Remove CSS as well

Co-authored-by: Lunny Xiao <[email protected]>
2020-03-11 08:11:19 +00:00
ec4d0cdd56 Remove svg preload (#10654)
It triggers a warning in the Chrome console about it being unused, so I
think preloading of SVG assets may not be supported properly in current
browsers.

Co-authored-by: Lauris BH <[email protected]>
Co-authored-by: John Olheiser <[email protected]>
Co-authored-by: zeripath <[email protected]>
Co-authored-by: guillep2k <[email protected]>
2020-03-09 03:06:59 -03:00
a9f4489bbc System-wide webhooks (#10546)
* Create system webhook column (and migration)

* Create system webhook DB methods

Based on the default webhook ones

* Modify router to handle system webhooks and default ones

* Remove old unused admin nav template

* Adjust orgRepoCtx to differentiate system and default webhook URLs

* Assign IsSystemWebhook when creating webhooks

* Correctly use booleans for IsSystemWebhook

* Use system webhooks when preparing webhooks for payload

* Add UI and locale changes

* Use router params to differentiate admin hook pages

* Fix deleting admin webhooks and rename method

* Add clarity to webhook docs

* Revert "Remove old unused admin nav template"

This reverts commit 191a20a7389fe5f6256b0ad6aafd04b9b0e295c5.

* Rename WebHooksNewPost to GiteaHooksNewPost for clarity

* Reintroduce blank line lost during merge conflict

Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: Lauris BH <[email protected]>
2020-03-09 00:08:05 +02:00
silverwindandGitHub 9d3e69e867 Move dropzone.js to npm/webpack (#10645)
- unvendor dropzone and upgrade it from 4.2.0 to 5.7.0
- make `csrf` available on window.config
2020-03-07 21:06:15 +00:00
6543andGitHub 57c7a7aa72 Ensure Update button is enabled even when CI has failed (#10640)
* ignore pull status

* fix css

* fix css
2020-03-07 03:24:42 +02:00
James LakinandGitHub 123d386059 Remove admin/nav.tmpl (#10633) 2020-03-06 14:17:33 +02:00
3f1c0841cb Granular webhook events (#9626)
* Initial work

Signed-off-by: jolheiser <[email protected]>

* Add PR reviews and API coverage

Signed-off-by: jolheiser <[email protected]>

* Split up events

Signed-off-by: jolheiser <[email protected]>

* Add migration and locale

Signed-off-by: jolheiser <[email protected]>

* Format

Signed-off-by: jolheiser <[email protected]>

* Revert IsPull

Signed-off-by: jolheiser <[email protected]>

* Fix comments

Signed-off-by: jolheiser <[email protected]>

* Fix tests

Signed-off-by: jolheiser <[email protected]>

* Fix PR reviews

Signed-off-by: jolheiser <[email protected]>

* Fix issue_comment

Signed-off-by: jolheiser <[email protected]>

* Make fmt

Signed-off-by: jolheiser <[email protected]>

* Migrations

Signed-off-by: jolheiser <[email protected]>

* Backwards compatible API

Signed-off-by: jolheiser <[email protected]>

* Fix feishu

Signed-off-by: jolheiser <[email protected]>

* Move session commit

Signed-off-by: jolheiser <[email protected]>

Co-authored-by: Lauris BH <[email protected]>
Co-authored-by: guillep2k <[email protected]>
2020-03-06 07:10:48 +02:00
zeripathandGitHub 80db44267c Add Approval Counts to pulls list (#10238)
* Add Approval Counts to pulls list

Add simple approvals counts to pulls lists

* Remove non-official counts

* Add PR features to milestone_issues.tmpl
2020-03-06 03:44:06 +00:00
John OlheiserandGitHub f422a115f4 Issue writers perms can modify issues (#10623)
Signed-off-by: jolheiser <[email protected]>
2020-03-06 09:57:18 +08:00
Lauris BHandGitHub 37c3db7be6 Add restricted user filter to LDAP authentication (#10600)
* Add restricted user filter to LDAP authentification

* Fix unit test cases
2020-03-05 08:30:33 +02:00
3d5d21133c OAuth2: add Yandex provider (#8335) (#10564)
* OAuth2: add Yandex provider (#8335)

* remove changes from locale ru-RU

* fmt modules/auth/oauth2/oauth2.go

Co-Authored-By: 6543 <[email protected]>

* fix fmt

* Update templates/admin/auth/new.tmpl

* fix fmt

Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: 6543 <[email protected]>
Co-authored-by: guillep2k <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: Lauris BH <[email protected]>
2020-03-05 00:08:52 +02:00
John OlheiserandGitHub afa1e1af16 Fix templates (#10596)
Signed-off-by: jolheiser <[email protected]>
2020-03-04 08:56:53 +02:00
009990b0c0 Remove unnecessary parentheses in template (#10583)
Fix #10552

Co-authored-by: Lauris BH <[email protected]>
2020-03-03 16:00:36 +08:00
John OlheiserandGitHub 0e2217bd2d Logout POST action (#10582)
* Change logout to POST

* Update for redirect

Signed-off-by: jolheiser <[email protected]>
2020-03-02 22:50:31 -06:00
techknowlogickandGitHub bea497ff96 nextcloud oauth (#10562)
Fix #7078
2020-03-02 22:11:45 -05:00
5e1438ba92 Admin page for managing user e-mail activation (#10557)
* Implement mail activation admin panel

* Add export comments

* Fix another export comment

* again...

* And again!

* Apply suggestions by @lunny

* Add UI for user activated emails

* Make new activation UI work

* Fix lint

* Prevent admin from self-deactivate; add modal

Co-authored-by: zeripath <[email protected]>
2020-03-02 15:25:36 -03:00
zeripathandGitHub 421e7b7875 Fix appearance of unsigned sha box in view_list (#10543)
Unfortunately the fix in #10511 was slightly incorrect and placed the
detail box at one level too far out.

Signed-off-by: Andrew Thornton <[email protected]>
2020-02-29 13:27:19 +00:00
82be59e633 issue search on my related repositories (#9758)
* adding search capability to user's issues dashboard

* global issue search

* placement of search bar on issues dashboard

* fixed some bugs in the issue dashboard search

* added unit test because IssueIDs option was added to UserIssueStatsOptions

* some renaming of fields in the issue dashboard code to be more clear; also trying to fix issue of searching the right repos based on the filter

* added unit test fro GetRepoIDsForIssuesOptions; fixed search lost on pagination; using shown issue status for open/close count; removed some debugging

* fix issue with all count showing incorrectly

* removed todo comment left in by mistake

* typo pulling wrong count

* fxied all count being off when selecting repositories

* setting the opts.IsClosed after pulling repos to search, this is done so that the list of repo ids to serach for the keyword is not limited, we need to get all the issue ids for the shown issue stats

* added "accessibleRepositoryCondition" check on the query to pull the repo ids to search for issues, this is an added protection to ensure we don't search repos the user does not have access to

* added code so that in the issues search, we won't use an in clause of issues ids that goes over 1000

* fixed unit test

* using 950 as the limit for issue search, removed unneeded group by in GetRepoIDsForIssuesOptions, showing search on pulls dashboard page too (not just issues)

Co-authored-by: guillep2k <[email protected]>
2020-02-29 03:52:05 -03:00