peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,362 Commits 12 Branches 32 Tags 139 MiB
1b63df7ad4
Commit Graph

1814 Commits

Author SHA1 Message Date
kolaente
1b63df7ad4
Fixed status codes 2018-02-12 17:42:38 +01:00
kolaente
9584d3f097
gofmt 2018-02-12 17:36:00 +01:00
kolaente
be51a479dc
Merged 'routers/issue_dependency_add' and 'routers/issue_dependency_remove' into one single file 2018-02-12 17:22:43 +01:00
kolaente
9e29f711b0
Merge branch 'master' into master 2018-02-08 16:57:02 +01: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
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
Lauris BH
ca4f5c37e6
Fix branch deletion for squash or rebase merged pull requests (#3425) 2018-01-30 14:29:39 +02:00
Konrad
647296ce63
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-01-21 16:23:15 +01: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
Marc Brückner
695b10bedd Fix API-Endpoint release (#3012) 
* Fixes API-Endpoint release (#3005)

* Using context.ReferencesGitRepo(); doing the same in the PATCH route.

* Add release create, get and update test
 2018-01-16 10:54:13 +02:00
kolaente
dd5cfbf656
Simplified "CanCreateIssueDependencies" 2018-01-14 20:20:18 +01:00
kolaente
30ae70a4d0
Moved check for open dependencies to "changeStatus" 2018-01-14 19:12:25 +01:00
kolaente
cf1b573c35
Merge branch 'master' into master 2018-01-13 11:20:57 +01:00
Morgan Bazalgette
eb0f166f50 Address issues pointed out by @lunny in #3339 (#3352) 2018-01-12 08:37:30 -06:00
Kim "BKC" Carlbäcker
e5b8b4b5ec Cleanup models.User.HashPassword (#3334) 2018-01-12 00:19:38 +02:00
kolaente
a5b696afe0
typo 2018-01-11 21:33:01 +01:00
kolaente
c44e13b3ad
typo 2018-01-11 21:32:37 +01:00
kolaente
5f187df6b2
Fixed communicating errors to the user 2018-01-11 21:22:39 +01:00
kolaente
d5b1c33f73
Merge branch 'master' into master 2018-01-11 21:09:56 +01:00
Morgan Bazalgette
65861900cd Handle refactor (#3339) 
* Replace all ctx.Handle with ctx.ServerError or ctx.NotFound

* Change Handle(403) to NotFound, avoid using macaron's NotFound
 2018-01-10 23:34:17 +02:00
Antoine GIRARD
84feb016f5 Remove useless fmt.Errorf("%v", err) (#3337) 2018-01-09 16:40:05 -02: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
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
Deyong Zhu
d663cef2a5 Fix branch name escaping in compare url (#3311) 
* Fixes #3303
 2018-01-08 17:17:24 +02:00
Sandro Santilli
44053532bb Serve .patch for pull requests (#3305) 
* Serve .patch for pull requests

Closes #3259
Updates "git" module, for GetFormatPatch

* Handle io.Copy error
 2018-01-07 15:10:20 +02: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
kolaente
37dc550bc8
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	docs/content/doc/advanced/config-cheat-sheet.en-us.md
#	models/migrations/migrations.go
#	models/migrations/v54.go
#	routers/repo/pull.go
 2018-01-06 22:41:44 +01:00
Lauris BH
8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 
* Pull request options migration and UI in settings

* Add ignore whitespace functionality

* Fix settings if pull requests are disabled

* Fix migration transaction

* Merge with Rebase functionality

* UI changes and related functionality for pull request merging button

* Implement squash functionality

* Fix rebase merging

* Fix pull request merge tests

* Add squash and rebase tests

* Fix API method to reuse default message functions

* Some refactoring and small fixes

* Remove more hardcoded values from tests

* Remove unneeded check from API method

* Fix variable name and comment typo

* Fix reset commit count after PR merge
 2018-01-05 20:56:50 +02:00
Sandro Santilli
a192f3052e Serve pull request .diff files (#3293) 
* Serve pull request .diff files

Closes #3259

* Add test for pull request redirection and .diff access

* Typo

* There's no need to test for pr.BaseRepo being nil after calling GetBaseRepo
 2018-01-05 12:56:52 +02:00
kolaente
8735bc2f82
Merge branch 'master' into master 2018-01-04 13:16:19 +01:00
Ethan Koenig
ce7ae17b81 Fix swagger docs (#3300) 2018-01-04 14:31:40 +08:00
kolaente
cd470779e8
Merge branch 'master' into master 2018-01-03 17:17:08 +01:00
Elouan Martinet
5057c6b43f Fix guide link for webhooks in repository settings (#3291) (#3292) 
Signed-off-by: Elouan Martinet <exa@elou.world>
 2018-01-03 23:50:09 +08:00
kolaente
b7ed097a8f
Fixed localization 2018-01-01 14:39:33 +01:00
kolaente
df638db68e
Removed unused import 2017-12-29 22:21:21 +01:00
kolaente
8931ced50e
Fixed error messages 2017-12-29 15:47:05 +01:00
kolaente
f48d6cdecd
Error messages moved to locale file 2017-12-29 15:43:12 +01:00
kolaente
5dc9c22972
Renamed "c" to "ctx" for consistency 2017-12-29 15:41:08 +01:00
kolaente
2058f4e5c5
Fixed error message 2017-12-29 15:37:19 +01:00
kolaente
5e20447c66
Replaced c with ctx for consistency 2017-12-29 15:36:18 +01:00
kolaente
70589e6c96
Added Custom error types for issue dependencies 2017-12-29 15:30:43 +01:00
kolaente
1f0bac04c7
Fixed using strconvert 2017-12-29 14:50:07 +01:00
kolaente
2c8103fc12
Fixed import order 2017-12-29 14:48:45 +01:00
kolaente
97140246f1
Renamed "CanUseDependencies" to "CanCreateDependencies" to be more precise 2017-12-29 14:46:07 +01:00
Konrad
ed4a47dcc8
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-12-29 14:27:23 +01:00
Ethan Koenig
4c9341f689 Fix bugs in issue dashboard stats (#3073) 2017-12-26 01:25:16 +02:00
Ethan Koenig
515cdaa85d Fix ignored errors when checking if organization, team member (#3177) 2017-12-21 09:43:26 +02:00