kolaente
9584d3f097
gofmt
2018-02-12 17:36:00 +01:00
kolaente
e322fa36b2
Added migration to update comments table
2018-02-12 17:35:26 +01:00
kolaente
0ea51f8d04
Use xorm engine from pararmeter instead of global one
2018-02-12 17:27:35 +01:00
Konrad
16b1636043
Merge branch 'master' of https://github.com/go-gitea/gitea
2018-02-12 17:20:47 +01:00
Ethan Koenig
6eaeb01ecf
Update code.gitea.io/git ( #3482 )
2018-02-10 20:19:26 +02:00
kolaente
9e29f711b0
Merge branch 'master' into master
2018-02-08 16:57:02 +01:00
Codruț Constantin Gușoi
011f128c89
Fixes missing avatars in offline mode ( #3471 )
...
Signed-off-by: Codruț Constantin Gușoi <codrut.gusoi@gmail.com>
2018-02-08 16:43:08 +01:00
Ethan Koenig
a89592d4ab
Reduce repo indexer disk usage ( #3452 )
2018-02-05 20:29:17 +02:00
Lauris BH
283e87d814
Fix rendering of wiki page list if wiki repo contains other files ( #3454 )
...
* Fix rendering of wiki page list if wiki repo contains other files
* Improve wiki filename tests
2018-02-05 16:56:30 +02:00
Ethan Koenig
b16c84de7b
Fix synchronization bug in repo indexer ( #3455 )
2018-02-05 10:39:51 +02:00
Morgan Bazalgette
17655cdf1b
Enable caching on assets and avatars ( #3376 )
...
* Enable caching on assets and avatars
Fixes #3323
* Only set avatar in user BeforeUpdate when there is no avatar set
* add error checking after stat
* gofmt
* Change cache time for avatars to an hour
2018-02-04 00:37:05 +02:00
kolaente
cdb5d6593a
Merge branch 'master' into master
2018-01-31 19:32:50 +01:00
Antoine GIRARD
b3fd94c13d
Add sensitive headers ( #3429 )
...
* Add HeaderWithSensitiveCase methods to respect casing
* Update webhook.go
2018-01-31 00:09:16 +02:00
Ethan Koenig
46c7fe371d
Fix PR merge error ( #3421 )
2018-01-29 12:18:20 +02:00
Ethan Koenig
3968c1149e
Fix SQL type error for webhooks ( #3424 )
2018-01-29 02:26:01 +02:00
Ethan Koenig
bac6ac033a
Fix race condition in repo renaming ( #3418 )
2018-01-28 14:24:59 +02:00
Ethan Koenig
c55a027da3
Fix empty checkout bug ( #3419 )
2018-01-28 13:27:42 +02:00
Wendell Sun
b627f1131b
Change local copy origin url after repository rename ( #3399 )
...
Fix #3378
2018-01-27 19:54:26 +02:00
Antoine GIRARD
9e842c8a72
Fix SSH auth lfs locks ( #3152 )
...
* Fix SSH auth LFS locks
* Activate SSH/lock test
* Remove debug
* Follow @lunny recommendation for AfterLoad method
2018-01-27 18:48:15 +02:00
kolaente
0ce2170031
Added only check if we're about to close an issue when closing an issue in "changeStatus"
2018-01-24 23:50:26 +01:00
Konrad Langenberg
f837429858
Added only check if we're about to close an issue when closing an issue in "changeStatus"
2018-01-24 23:44:20 +01:00
Konrad
647296ce63
Merge branch 'master' of https://github.com/go-gitea/gitea
2018-01-21 16:23:15 +01:00
Antoine GIRARD
1ce3572409
Remove useless check ( #3384 )
...
In #3377 , I put check inside all write key function. This one is useless no.
2018-01-19 21:45:53 +02:00
Sandro Santilli
05ab747054
Force-push to base repo's ref/pull/#/head ( #3393 )
...
* Force-push to base repo's ref/pull/#/head
Fixes force-pushing to pull request branches, otherwise failing with:
[...gitea/models/pull.go:1022 AddTestPullRequestTask()] [E] PushToBaseRepo: Push: exit status 1 - To /path/to/gitea-repositories/org/repo.git
! [rejected] issue-fix -> refs/pull/20/head (non-fast-forward)
* format
2018-01-19 08:53:45 +02:00
Lauris BH
ca306985d3
Change how merged PR commit info are prepared ( #3368 )
...
* Change how merged PR commits and diff are made
* Update code.gitea.io/git dependency
* Fix typo
* Remove unneeded local variable
2018-01-19 08:18:51 +02:00
Ethan Koenig
b0d5bb909b
Delete indexer DB entries when (re)creating index ( #3385 )
...
* comment
2018-01-17 23:51:07 +02:00
Antoine GIRARD
095fb9f2e3
Add integrations tests from git cli ( #3377 )
...
* test: integration add git cli tests
Extracted form for easing review process and debug #3152
* test: integration add git cli big file commit
* fix: Don't rewrite key if internal server
2018-01-16 13:07:47 +02:00
Lauris BH
a68bf746a4
Change reserved avatar name to correct - avatars ( #3375 )
2018-01-16 00:45:13 +02:00
kolaente
18fe48e7be
Change nothing to trigger CI
2018-01-14 21:22:11 +01:00
kolaente
60834bc3a7
Change nothing to trigger CI
2018-01-14 21:22:00 +01:00
kolaente
992e168687
Fixed lint + gofmt
2018-01-14 21:14:42 +01:00
Konrad
fdabcf1a25
Merge branch 'master' of https://github.com/go-gitea/gitea
2018-01-14 21:13:16 +01:00
kolaente
30ae70a4d0
Moved check for open dependencies to "changeStatus"
2018-01-14 19:12:25 +01:00
Ethan Koenig
ccdb94992d
Asynchronously populate the repo indexer ( #3366 )
...
* Populate repo indexer in background
* Check if no repos exist
* race cond
2018-01-14 19:34:41 +02:00
kolaente
f71f2d4e5d
Removed unnessecary errorcheck
2018-01-13 12:48:06 +01:00
kolaente
cf1b573c35
Merge branch 'master' into master
2018-01-13 11:20:57 +01:00
Bo-Yi Wu
7a2a3fbafc
refactor(model): update user method. ( #3360 )
2018-01-13 11:45:16 +02:00
Kim "BKC" Carlbäcker
e5b8b4b5ec
Cleanup models.User.HashPassword ( #3334 )
2018-01-12 00:19:38 +02:00
kolaente
d5b1c33f73
Merge branch 'master' into master
2018-01-11 21:09:56 +01:00
Lauris BH
be1330ec89
Remove hardcoded paths to fix randomly failing tests ( #3347 )
...
* Remove hardcoded paths to fix randomly failing tests
* Use correct function for merge path
2018-01-11 00:46:59 +01:00
kolaente
0fcc3b2273
Merge branch 'master' into master
2018-01-09 11:27:21 +01:00
Morgan Bazalgette
674cfb7cac
Change EncodePasswd to HashPassword ( #3329 )
...
* Change EncodePasswd to HashPassword
* Create test+benchmark for HashPassword
2018-01-08 23:28:18 +01:00
kolaente
1f8ef921e2
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# models/migrations/migrations.go
# models/migrations/v56.go
2018-01-08 19:08:41 +01:00
kolaente
4d15f28e04
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# models/migrations/migrations.go
# models/migrations/v56.go
2018-01-08 19:08:13 +01:00
Ethan Koenig
f48680888c
Remove IsOwner, NumTeams from OrgUser ( #3269 )
2018-01-08 09:48:37 +02:00
Antoine GIRARD
cb868b7851
Add missing indexer doc in configuration ( #3324 )
...
* Add missing indexer doc in configuration
* Unify MAX_FILE_SIZE to 1024 * 1024
2018-01-08 07:03:52 +02:00
Lunny Xiao
835b890329
fix bug when a user delete but assigned on issue ( #3318 )
2018-01-07 11:13:10 +02:00
kolaente
171715b21d
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# models/migrations/migrations.go
# models/migrations/v55.go
2018-01-07 00:06:10 +01:00
kolaente
eb295f40c0
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# models/migrations/migrations.go
# models/migrations/v55.go
2018-01-07 00:05:43 +01:00
Vlad Temian
e78786ef39
Writable deploy keys ( closes #671 ) ( #3225 )
...
* Add is_writable checkbox to deploy keys interface
* Add writable key option to deploy key form
* Add support for writable ssh keys in the interface
* Rename IsWritable to ReadOnly
* Test: create read-only and read-write deploy keys via api
* Add DeployKey access mode migration
* Update gitea sdk via govendor
* Fix deploykey migration
* Add unittests for writable deploy keys
* Move template text to locale
* Remove implicit column update
* Remove duplicate locales
* Replace ReadOnly field with IsReadOnly method
* Fix deploy_keys related integration test
* Rename v54 migration with v55
* Fix migration hell
2018-01-07 00:55:53 +02:00