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

1053 Commits

Author SHA1 Message Date
kolaente
a25e1dd0cf
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v59.go
#	modules/auth/repo_form.go
 2018-04-03 11:16:37 +02:00
Lunny Xiao
45d1fc03cb
fix go vet error (#3740) 2018-03-30 07:21:27 +08:00
Lauris BH
ab5cc6f3a9 Correctly check http git access rights for reverse proxy authorized users (#3721) 2018-03-29 09:39:51 +08:00
Allen Wild
15c6bb500b Add repository setting to enable/disable health checks (#3607) 
New Feature:
  * Repository struct field for IsFsckEnabled (default true of course)
  * Admin Settings section on repo options page, accessible only by
    admin users

Possible Enhancements:
  * There's no way to force running health checks on all repos
    regardless of their IsFsckEnabled setting. This would be useful if
    there were an admin API or dashboard button to run fsck immediately.

Issue: https://github.com/go-gitea/gitea/issues/1712
Signed-off-by: Allen Wild <allenwild93@gmail.com>
 2018-03-27 22:13:20 +08:00
Chri-s
9350ba7947 Add protected branch whitelists for merging (#3689) 
* Add database migrations for merge whitelist

* Add merge whitelist settings for protected branches

* Add checks for merge whitelists
 2018-03-25 13:01:32 +03:00
Chri-s
e64aa18dc9 Change protected branch settings title to existing locale entry (#3694) 2018-03-21 20:12:49 +02:00
Alex Ward
4ebdcbc5df Fix style of "In your repositories" when selected (#3699) 
Signed-off-by: Alex Ward <alxwrd@googlemail.com>
 2018-03-20 23:39:14 +02:00
kolaente
2950021ddf
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v58.go
 2018-03-18 15:23:32 +01:00
Lunny Xiao
9e5d0a09eb
Global code search support (#3664) 
* add global code search on explore

* fix bug when no anyone public repos

* change the icon

* fix typo and add UnitTypeCode check for login non-admin user

* fix ui description when no match
 2018-03-16 22:04:33 +08:00
Lauris BH
7b2b900e13 Refactor and simplify redirect to url (#3674) 2018-03-15 22:13:34 +01:00
Chri-s
a2a49c93c7 Added checks for protected branches in pull requests (#3544) 
* Added checks for protected branches in pull requests

Signed-off-by: Christian Wulff <NChris@posteo.net>

* Moved check for protected branch into new function CheckUserAllowedToMerge

Signed-off-by: Christian Wulff <NChris@posteo.net>

* Removed merge conflict lines from last commit

Signed-off-by: Christian Wulff <NChris@posteo.net>

* Explicit check for error type in ViewIssue

Signed-off-by: Christian Wulff <NChris@posteo.net>
 2018-03-13 11:46:14 +08:00
Lauris BH
c0d41b1b77 Add label descriptions (#3662) 
* Add label descriptions

* Add default descriptions to label template
 2018-03-13 10:03:55 +08:00
Lunny Xiao
20ed1e949e
Merge branch 'master' into master 2018-03-07 23:57:36 +08:00
Mahmoud Al-Qudsi
171914e9a7 Log attachment blocked events (#3615) 
Include both a log entry and the blocked mime type in the gitea log when
an attachment upload is blocked.

Chosen log level is info; this may need to be dialed down to trace.
 2018-03-05 08:51:10 +08:00
kolaente
e1f2a8e198 Fixed lint 2018-02-27 20:22:04 +01:00
kolaente
5e5139faed Simplify error 2018-02-27 20:03:10 +01:00
kolaente
91e0b53d26 Simplify redirect 2018-02-27 19:50:58 +01:00
kolaente
250138f88e Return JSON when trying to close issue dependencies and fail 2018-02-27 19:47:56 +01:00
kolaente
0c6f56d6c0 Remove redundant sprintf 2018-02-27 19:27:30 +01:00
kolaente
9313332fd4 Cleanup + fmt 2018-02-27 18:34:17 +01:00
Gitea
d2ab9e23ab Fixed http status code on redirect 2018-02-27 18:30:00 +01:00
Konrad
64e61d6aa5 Merge branch 'master' of https://github.com/go-gitea/gitea 2018-02-15 20:03:44 +01:00
Ethan Koenig
4c9d9c221a Improve wiki test (#3493) 2018-02-13 11:19:49 +02:00
kolaente
bd3cf60ddb
FIxed import order 2018-02-12 22:59:50 +01:00
kolaente
7566292e4e
Updated copyright header 2018-02-12 18:34:41 +01:00
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
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
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
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
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
cd470779e8
Merge branch 'master' into master 2018-01-03 17:17:08 +01:00