Commit Graph

568 Commits

Author SHA1 Message Date
Lanre Adelowo 9d8178b3ac Add option to close issues via commit on a non master branch (#5992)
* fixes #5957

* add tests to make sure config option is respected

* use already defined struct

* - use migration to make the flag repo wide not for the entire gitea instance
Also note that the config value can still be set so as to be able to control the value for new repositories that are to be created

- fix copy/paste error in copyright header year and rearrange import

- use repo config instead of server config value to determine if a commit should close an issue

- update testsuite

* use global config only when creating a new repository

* allow repo admin toggle feature via UI

* fix typo and improve testcase

* fix fixtures

* add DEFAULT prefix to config value

* fix test
2019-02-10 21:27:19 +02:00
GiteaBot db58dbabfc [skip ci] Updated translations via Crowdin 2019-02-08 16:48:45 +00:00
Lanre Adelowo 2e85e70e38 Enhance closed PR and Issue status in the list (#6000)
* working version

* Update options/locale/locale_en-US.ini

Co-Authored-By: adelowo <adelowomailbox@gmail.com>

* update templates
2019-02-08 07:53:58 +00:00
GiteaBot f60b1d8fe2 [skip ci] Updated translations via Crowdin 2019-02-08 07:21:32 +00:00
GiteaBot 0c840a924a [skip ci] Updated translations via Crowdin 2019-02-06 16:20:58 +00:00
GiteaBot 1772893505 [skip ci] Updated translations via Crowdin 2019-02-05 16:55:17 +00:00
Lunny Xiao bf4badad1d Pull request conflict files detection (#5951)
* add conflict detection

* test pull request conflict files

* fix detection files number

* fix comments
2019-02-05 06:54:49 -05:00
GiteaBot 680a57ce92 [skip ci] Updated translations via Crowdin 2019-02-05 11:40:36 +00:00
Lanre Adelowo 5390791224 Automatically clear stopwatch on merging a PR (#4327)
* Don't display buttons if there are no notices

* clear stopwatch on merging a PR

* remove redundant gt check

* use ctx.Flash as per @bkcsoft comment

* stop timer on closing issues/PRs too

* updated translation as per review

* redirect to login page after successfully activating account

* remove unrelated changes

* stop timer for issues that are closed via commits too..Not just the 'close' UI button
2019-02-05 13:38:11 +02:00
GiteaBot 5bd594c858 [skip ci] Updated translations via Crowdin 2019-02-04 15:23:15 +00:00
GiteaBot f21ae12abb [skip ci] Updated translations via Crowdin 2019-02-04 00:59:52 +00:00
zeripath 01c10a951b
Fix ssh deploy and user key constraints (#1357) (#5939)
1. A key can either be an ssh user key or a deploy key. It cannot be both.
2. If a key is a user key - it can only be associated with one user.
3. If a key is a deploy key - it can be used in multiple repositories and the permissions it has on those repositories can be different.
4. If a repository is deleted, its deploy keys must be deleted too.

We currently don't enforce any of this and multiple repositories access with different permissions doesn't work at all. This PR enforces the following constraints:

- [x] You should not be able to add the same user key as another user
- [x] You should not be able to add a ssh user key which is being used as a deploy key
- [x] You should not be able to add a ssh deploy key which is being used as a user key
- [x] If you add an ssh deploy key to another repository you should be able to use it in different modes without losing the ability to use it in the other mode.
- [x] If you delete a repository you must delete all its deploy keys.

Fix #1357
2019-02-03 23:56:53 +00:00
GiteaBot 98feb0ef4d [skip ci] Updated translations via Crowdin 2019-01-31 13:39:54 +00:00
GiteaBot 002e898bcf [skip ci] Updated translations via Crowdin 2019-01-29 21:28:45 +00:00
GiteaBot bc748f205a [skip ci] Updated translations via Crowdin 2019-01-28 15:55:40 +00:00
Lanre Adelowo 7461c5a75f Fix "pulls.blocked_by_approvals" text (#5879) 2019-01-28 10:05:20 -05:00
GiteaBot 56415fa2fc [skip ci] Updated translations via Crowdin 2019-01-28 14:16:11 +00:00
zeripath 182a6d6885 Fix wording of #5858 issue.review.reject string (#5869)
As per @lafriks comment this should be: requested changes

Signed-off-by: Andrew Thornton <art27@cantab.net>
2019-01-27 19:39:49 +02:00
GiteaBot 34a1c4c514 [skip ci] Updated translations via Crowdin 2019-01-27 11:31:56 +00:00
GiteaBot 2d8520d039 [skip ci] Updated translations via Crowdin 2019-01-27 09:27:05 +00:00
Lanre Adelowo b8a81cb1b8 Rename reject to 'request changes' (#5858)
* remame reject to 'request changes

* make usee of requested changes in issue's view content
2019-01-26 12:20:56 -05:00
GiteaBot ac766fe3de [skip ci] Updated translations via Crowdin 2019-01-26 00:17:00 +00:00
GiteaBot 62da3bee1a [skip ci] Updated translations via Crowdin 2019-01-24 15:23:19 +00:00
GiteaBot 4aa2f4f45f [skip ci] Updated translations via Crowdin 2019-01-24 14:22:36 +00:00
GiteaBot b9f87376a2 [skip ci] Updated translations via Crowdin 2019-01-23 20:11:56 +00:00
kolaente 0b510725c9 Feature: Archive repos (#5009) 2019-01-23 13:58:38 -05:00
GiteaBot 6a949af8ca [skip ci] Updated translations via Crowdin 2019-01-22 20:31:11 +00:00
GiteaBot 2d9456137e [skip ci] Updated translations via Crowdin 2019-01-21 17:53:09 +00:00
Lanre Adelowo e1fcd6b742 Disallow empty titles (#5785)
* add util method and tests

* make sure the title of an issue cannot be empty

* wiki title cannot be empty

* pull request title cannot be empty

* update to make use of the new util methof
2019-01-21 13:45:32 +02:00
GiteaBot 8a92544a3e [skip ci] Updated translations via Crowdin 2019-01-21 10:14:44 +00:00
GiteaBot fba1f14779 [skip ci] Updated translations via Crowdin 2019-01-19 21:19:01 +00:00
GiteaBot f54e0d2f16 [skip ci] Updated translations via Crowdin 2019-01-19 20:41:54 +00:00
Lanre Adelowo c212c98463 Fix wording when user is unassigned from an issue (#5769)
Previous Gitea would display that the user had unassigned themselves even if the actor
was not the user. Fixes #4418
2019-01-19 19:16:46 +00:00
GiteaBot ac0d5517f4 [skip ci] Updated translations via Crowdin 2019-01-19 16:31:25 +00:00
GiteaBot af45648e26 [skip ci] Updated translations via Crowdin 2019-01-18 14:52:26 +00:00
GiteaBot b0478f1c42 [skip ci] Updated translations via Crowdin 2019-01-18 03:32:53 +00:00
GiteaBot 7d65ddf5e1 [skip ci] Updated translations via Crowdin 2019-01-18 00:01:50 +00:00
zeripath 07802a2bc5 Refactor repo.isBare to repo.isEmpty #5629 (#5714)
* Refactor repo.isBare to repo.isEmpty #5629

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

* Remove Sync call
2019-01-17 19:01:04 -05:00
GiteaBot ca3b9aa6a3 [skip ci] Updated translations via Crowdin 2019-01-15 21:33:19 +00:00
GiteaBot 5a081c7a80 [skip ci] Updated translations via Crowdin 2019-01-14 19:17:19 +00:00
techknowlogick 5c44f751a3
Discord Oauth2 support (#4476)
* add discord auth

* add vendor for discord

* fix syntax error

* make fmt

* update version of goth in use

* update markbates/goth
2019-01-13 14:06:22 -05:00
GiteaBot bf7a11254d [skip ci] Updated translations via Crowdin 2019-01-12 16:15:40 +00:00
Lanre Adelowo abb364f442 allow user fork repo even when as a guest.. This will prompt the user to login and if authentication was successful, the user will be redirected to fork the repo (#5690) 2019-01-10 23:25:14 -05:00
GiteaBot 6630a33ec1 [skip ci] Updated translations via Crowdin 2019-01-11 04:00:31 +00:00
GiteaBot c04fc677b5 [skip ci] Updated translations via Crowdin 2019-01-09 17:24:47 +00:00
Lanre Adelowo 8d2c24f7f9 Allow for user specific themes (#5668)
* add migration and basic UI for changing a user's theme

* update user themem

* use right text on button

* load theme based on users' selection

* load theme based on users' selection in pwa too

* update sample config

* delete older theme loading

* implement AfterLoad to set users' theme properly

* set up default theme when creating a user. This uses the installation wide theme

* use flash messages for error

* set default theme when creating a user from the cli

* fix @lunny review
2019-01-09 12:22:57 -05:00
GiteaBot 405414d14e [skip ci] Updated translations via Crowdin 2019-01-04 16:16:40 +00:00
GiteaBot 5a1ea37f57 [skip ci] Updated translations via Crowdin 2019-01-04 09:23:34 +00:00
GiteaBot 9863591dca [skip ci] Updated translations via Crowdin 2019-01-03 10:19:43 +00:00
GiteaBot f5be13efb6 [skip ci] Updated translations via Crowdin 2019-01-02 12:59:14 +00:00