Commit Graph

610 Commits

Author SHA1 Message Date
40f41dc694 Correctly adjust mirror url (#6593) (#6594) 2019-04-12 22:25:06 +01:00
245089b9c9 Prevent server 500 on compare branches with no common history (#6555) (#6558)
* Prevent server 500 on compare branches with no common history (#6555)
* Update code.gitea.io/git module
2019-04-11 21:31:17 +01:00
82fbc82b63 [skip ci] Updated translations via Crowdin 2019-03-18 12:51:30 +00:00
1155f1b02d [skip ci] Updated translations via Crowdin 2019-03-17 19:20:28 +00:00
7c205607b5 [skip ci] Updated translations via Crowdin 2019-03-11 11:37:48 +00:00
e0eb6514d2 [skip ci] Updated translations via Crowdin 2019-03-10 21:58:54 +00:00
e836b8869b [skip ci] Updated translations via Crowdin 2019-03-09 21:18:31 +00:00
f7ffb190c6 [skip ci] Updated translations via Crowdin 2019-03-08 20:28:33 +00:00
062de8e86f [skip ci] Updated translations via Crowdin 2019-03-08 17:43:26 +00:00
489419c330 [skip ci] Updated translations via Crowdin 2019-03-08 16:45:46 +00:00
e777c6bdc6 Integrate OAuth2 Provider (#5378) 2019-03-08 11:42:50 -05:00
01bd1fcd33 [skip ci] Updated translations via Crowdin 2019-03-07 19:16:42 +00:00
ad86b843e1 [skip ci] Updated translations via Crowdin 2019-03-06 00:50:36 +00:00
6460cff222 [skip ci] Updated translations via Crowdin 2019-03-05 20:18:01 +00:00
b257e0456b Add ability to sort issues by due date (#6206) (#6244)
Signed-off-by: Steve Traugott <stevegt@t7a.org>
2019-03-05 09:39:41 -05:00
afdc0ca41d [skip ci] Updated translations via Crowdin 2019-03-01 20:41:52 +00:00
1cf3fc3bc5 [skip ci] Updated translations via Crowdin 2019-02-28 08:04:31 +00:00
a1214978b3 [skip ci] Updated translations via Crowdin 2019-02-27 16:58:32 +00:00
b03d780ccb [skip ci] Updated translations via Crowdin 2019-02-26 23:10:22 +00:00
795f6e04ad [skip ci] Updated translations via Crowdin 2019-02-25 10:39:39 +00:00
eea1155afe [skip ci] Updated translations via Crowdin 2019-02-19 23:12:29 +00:00
2982413f8d [skip ci] Updated translations via Crowdin 2019-02-19 19:28:43 +00:00
b79820f610 [skip ci] Updated translations via Crowdin 2019-02-18 20:57:13 +00:00
44114b38e6 Implement "conversation lock" for issue comments (#5073) 2019-02-18 22:55:04 +02:00
64ce159a6e Allow to set organization visibility (public, internal, private) (#1763) 2019-02-18 18:00:27 +02:00
ae3a913122 [skip ci] Updated translations via Crowdin 2019-02-18 12:37:04 +00:00
8d3bb86e20 [skip ci] Updated translations via Crowdin 2019-02-17 05:46:51 +00:00
0b72c00fad Allow labels to contain emoji (#6063)
* Add emoji to labels
Minor cleanup of tribute code in footer.tmpl

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

* Quick find/replace in other i18n files containing label translations

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

* Revert "Quick find/replace in other i18n files containing label translations"

This reverts commit ec3e1a3a17.

* Add style to overwrite emoji height in labels

* Revert Makefile change that makes Windows work
2019-02-16 19:33:09 +02:00
7ae59567a2 [skip ci] Updated translations via Crowdin 2019-02-14 18:23:25 +00:00
7a72aa623e [skip ci] Updated translations via Crowdin 2019-02-13 15:47:39 +00:00
2a03e96bce Allow markdown files to read from the LFS (#5787)
This PR makes it possible for the markdown renderer to render images and media straight from the LFS.

Fix #5746

Signed-off-by: Andrew Thornton [art27@cantab.net](mailto:art27@cantab.net)
2019-02-12 15:09:43 +00:00
48a9025346 [skip ci] Updated translations via Crowdin 2019-02-12 08:40:40 +00:00
baffea1ddb [skip ci] Updated translations via Crowdin 2019-02-11 17:12:45 +00:00
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
db58dbabfc [skip ci] Updated translations via Crowdin 2019-02-08 16:48:45 +00:00
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
f60b1d8fe2 [skip ci] Updated translations via Crowdin 2019-02-08 07:21:32 +00:00
0c840a924a [skip ci] Updated translations via Crowdin 2019-02-06 16:20:58 +00:00
1772893505 [skip ci] Updated translations via Crowdin 2019-02-05 16:55:17 +00:00
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
680a57ce92 [skip ci] Updated translations via Crowdin 2019-02-05 11:40:36 +00:00
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
5bd594c858 [skip ci] Updated translations via Crowdin 2019-02-04 15:23:15 +00:00
f21ae12abb [skip ci] Updated translations via Crowdin 2019-02-04 00:59:52 +00:00
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
98feb0ef4d [skip ci] Updated translations via Crowdin 2019-01-31 13:39:54 +00:00
002e898bcf [skip ci] Updated translations via Crowdin 2019-01-29 21:28:45 +00:00
bc748f205a [skip ci] Updated translations via Crowdin 2019-01-28 15:55:40 +00:00
7461c5a75f Fix "pulls.blocked_by_approvals" text (#5879) 2019-01-28 10:05:20 -05:00
56415fa2fc [skip ci] Updated translations via Crowdin 2019-01-28 14:16:11 +00:00