Julian
c42bde719e
Only count users own actions for heatmap contributions ( #5647 )
...
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
2019-01-06 21:29:05 +02:00
Julian
97dafdc057
fix commit page showing status for current default branch ( #5650 )
...
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
2019-01-06 16:32:00 +02:00
Pierre-Alexis Ciavaldini
0236856924
migrate database if app.ini found ( #5290 )
...
* migrate database if app.ini found
* replacing hard-coded user id by env variable
* Update per @zeripath's feedback
2019-01-05 13:16:38 -05:00
Dane
cbc14df16a
Add docs on passing SSH through to container ( #5019 )
...
* Add docs on passing SSH through to container
Wasn't clear how to pass SSH connections through the container, found a
few blog posts which described roughly the same procedure I've
documented here.
Credit should really go to:
* https://blog.sakuragawa.moe/gitea-in-docker-container-and-sharing-ssh-with-host/
* http://www.ateijelo.com/blog/2016/07/09/share-port-22-between-docker-gogs-ssh-and-local-system
Signed-off-by: Dane Elwell <dane.elwell@ukfast.co.uk>
* Add note to resolve @lafriks feedback
2019-01-05 12:53:23 -05:00
zeripath
6311e4ce6a
Fix sqlite deadlock when assigning to a PR ( #5640 )
...
* Fix sqlite deadlock when assigning to a PR
Fix 5639
Signed-off-by: Andrew Thornton <art27@cantab.net>
* More possible deadlocks found and fixed
Signed-off-by: Andrew Thornton <art27@cantab.net>
2019-01-04 16:51:27 -05:00
Jonas Franz
9e901039e7
Add changelog for 1.6.3 and 1.7.0-rc2 ( #5636 )
...
* Add changelog for 1.6.3 and 1.7.0-rc2
Signed-off-by: Jonas Franz <info@jonasfranz.software>
* Add missing point for 1.6.3
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2019-01-04 18:44:26 +01:00
GiteaBot
405414d14e
[skip ci] Updated translations via Crowdin
2019-01-04 16:16:40 +00:00
zeripath
fd1e8563f8
SECURITY: protect DeleteFilePost et al with cleanUploadFileName ( #5631 )
...
This commit wraps more of the TreePaths with cleanUploadFileName
Signed-off-by: Andrew Thornton <art27@cantab.net>
2019-01-04 11:08:26 -05:00
GiteaBot
5a1ea37f57
[skip ci] Updated translations via Crowdin
2019-01-04 09:23:34 +00:00
Harshit Bansal
9f476b8d1e
Don't close issues via commits on non-default branch. ( #5622 )
...
Adds a small check to close the issues only if the referencing commits
are on the default branch.
Fixes: #2314 .
2019-01-04 11:22:58 +02:00
0x5c
0de57fd57c
Documentation: Clarity for HTTPS setups ( #5626 )
...
[https-setup]
- Made it clearer that HTTP redirection is possible
[config-cheat-sheet]
- Clarified the behavihour of the redirection-related config keys
2019-01-03 16:46:07 +01:00
GiteaBot
9863591dca
[skip ci] Updated translations via Crowdin
2019-01-03 10:19:43 +00:00
Jonas Franz
121da08730
Add changelog for 1.7.0-rc1 ( #5616 )
...
* Add changelog for 1.7.0-rc1
* Change position of refactoring of heatmap
* Refactoring some items in changelog
* Fix wrong PR title in changelog
Signed-off-by: Jonas Franz <info@jonasfranz.software>
* Remove backported PRs
Signed-off-by: Jonas Franz <info@jonasfranz.software>
* Fix wrong date
Signed-off-by: Jonas Franz <info@jonasfranz.software>
* Add new PR to list
* Security fixes have been backported
2019-01-03 11:17:28 +01:00
Moshi Binyamini
76060613ef
Fix bug on modifying sshd username ( #5624 )
...
Should fix #5623
2019-01-02 17:42:33 -05:00
techknowlogick
74b9a13f84
Update @jonasfranz's username ( #5619 )
...
* Update @jonasfranz's username
* lowercase'd username
2019-01-02 13:35:18 -05:00
techknowlogick
7c3722b366
Update owners & Date in contributing ( #5620 )
2019-01-02 13:00:19 -05:00
GiteaBot
f5be13efb6
[skip ci] Updated translations via Crowdin
2019-01-02 12:59:14 +00:00
Harshit Bansal
8764f1512d
branch: Trigger update when deleting branch via UI. ( #5617 )
...
Fixes: #5309 .
2019-01-02 20:56:58 +08:00
Rodrigo Villablanca Vásquez
4c52858c39
Issue is not overdue when it is on the same date #5566 ( #5568 )
...
* Due date time of issues and milestones is set to 23:59:59
* Add docs
* make gen swagger
* fix swagger gen
2019-01-01 18:56:47 +01:00
Harshit Bansal
63bd1b9203
mirror: Delete tags in mirror which are removed for original repo. ( #5609 )
...
This bug was being caused by an error in the logic in `release.go`.
Credit to @yasuokav for tracing the root of the issue.
Fixes: #5192 .
2018-12-31 18:00:54 -05:00
Daniel Wolf
b46c279587
update v71.go to resolve #5595 ( #5613 )
2018-12-31 21:23:03 +08:00
GiteaBot
64995bae0f
[skip ci] Updated translations via Crowdin
2018-12-31 12:03:07 +00:00
Harshit Bansal
2c7661a524
Fix wrong text getting saved on editing second comment on an issue. ( #5608 )
...
* comments: Fix an incorrent DOM element selection.
This commit fixes a bug that was causing text from previously edited
comment to get saved when two comments were edited one after other.
Text area with id of `#content` isn't unique on the page but it was
being treated as unique by the event handling code.
Fixes: #5581 .
* templates: Remove `id` from textarea in commit edit form.
An element is assigned an `id` only if it is unique for the whole page
but in this case there can be multiple textarea so it should have one.
2018-12-31 13:01:20 +01:00
Lanre Adelowo
945804f800
Webhook for Pull Request approval/rejection ( #5027 )
2018-12-27 13:04:30 -05:00
zeripath
8bb0a6f425
Synchronize SSH keys on login with LDAP + Fix SQLite deadlock on ldap ssh key deletion ( #5557 )
...
* Synchronize SSH keys on login with LDAP
* BUG: Fix hang on sqlite during LDAP key deletion
2018-12-27 12:28:48 -05:00
Tony Homrich
2058c362a8
LDAP via simple auth separate bind user and search base ( #5055 )
2018-12-27 11:51:19 -05:00
Shashvat Kedia
6e20b504b1
Delete organization endpoint added ( #5601 )
...
* Delete organization endpoint added
* Parameters added in comment
* Typo fix
* Newline character removed
2018-12-27 16:36:58 +01:00
Lanre Adelowo
21357a4ae0
fix nil pointer when adding a due date ( #5587 )
...
* fix nil pointer
* remove nil check and just call loadRepo regardless
2018-12-27 16:02:43 +01:00
Lanre Adelowo
a82ba73346
Make sure argsSet verifies string isn't empty too ( #4980 )
2018-12-27 14:38:38 +02:00
Julian
4a685f8b87
Add rebase with merge commit merge style ( #3844 ) ( #4052 )
...
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
2018-12-27 12:27:08 +02:00
Michael Lustfield
58bdff53cd
Remove MTecknology from MAINTAINERS ( #5599 )
2018-12-26 21:03:34 -05:00
GiteaBot
b0b35493ec
[skip ci] Updated translations via Crowdin
2018-12-26 19:16:27 +00:00
Shashvat Kedia
ba2c02b75d
Fix route in swagger ( #5598 )
2018-12-26 21:13:49 +02:00
GiteaBot
4586ae390f
[skip ci] Updated translations via Crowdin
2018-12-24 11:12:56 +00:00
Charles
f0db86b663
Gitlab does have discord integration now ( #5589 )
2018-12-24 19:11:18 +08:00
Antoine GIRARD
9f544e9356
drone/mssql: use golang 1.11 build like the other tests ( #5586 )
2018-12-23 23:11:22 +02:00
BetaCat
a06ae0bdc7
Fix translation errors in doc advanced part (zh-cn) ( #5112 )
...
* ZH-CN translation of Advanced part
* Fix translation errors
* Resolve issues
2018-12-23 18:57:49 +08:00
techknowlogick
b77c3eb5bd
backport 1.6.2 changelog ( #5576 )
2018-12-21 12:45:58 -05:00
Mura Li
9a33798b30
Fix type mismatch of format string ( #5574 )
2018-12-21 11:13:31 -05:00
zeripath
330bf8d3b3
Immediate fix to htmlEncode user added text ( #5570 )
...
There are likely problems remaining with the way that initCommentForm
is creating its elements. I suspect that a malformed avatar url could
be used maliciously.
2018-12-21 08:40:40 -05:00
Lunny Xiao
4a02a783c4
fix bug on upload file name ( #5571 )
2018-12-20 21:32:11 -05:00
Antoine GIRARD
7cb1d8296d
Create stale bot config ( #5243 )
2018-12-20 15:34:55 -05:00
GiteaBot
8dc09edb04
[skip ci] Updated translations via Crowdin
2018-12-19 13:00:35 +00:00
Lunny Xiao
9d0dee88d2
fix table name typo on SQL ( #5562 )
...
* fix table name typo on SQL
* fix reserved word user when on mssql
2018-12-19 20:58:46 +08:00
Lunny Xiao
b65e37ed72
fix indexer reindex bug when gitea restart ( #5563 )
...
* fix issue indexer bug reindex when restart gitea
* also fix code indexer reindex when gitea restart
2018-12-19 16:37:48 +08:00
zeripath
c64963553a
Update Licenses ( #5558 )
2018-12-18 21:04:43 -05:00
Lunny Xiao
7fd34c0517
fix lfs version check warning log when using ssh protocol ( #5501 )
2018-12-19 09:17:43 +08:00
zeripath
2a660a1de1
Support reverse proxy providing email ( #5554 )
...
This PR implements #2347
2018-12-18 12:05:48 -05:00
Lunny Xiao
fe55ab2a68
fix forgot removed records when deleting user ( #5429 )
...
* fix forgot removed records when deleting user
* fix migration
* fix rewritekey lock on sqlite
* remove unused codes
2018-12-18 11:26:26 -05:00
Jonas Franz
e726e4b828
Add base repo nil check ( #5555 )
...
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-12-17 12:35:21 -05:00