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

120 Commits

Author SHA1 Message Date
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
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
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
b7ed097a8f
Fixed localization 2018-01-01 14:39:33 +01:00
kolaente
f48d6cdecd
Error messages moved to locale file 2017-12-29 15:43:12 +01:00
Konrad
ed4a47dcc8
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-12-29 14:27:23 +01:00
Ethan Koenig
515cdaa85d Fix ignored errors when checking if organization, team member (#3177) 2017-12-21 09:43:26 +02:00
kolaente
172b1f054a
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/v51.go
 2017-12-19 19:07:30 +01:00
harry
03ec35ed79 Mention completion for issue editor. (#3136) 
* new issue mention

* Mention completion on new issue and view issue page.

* Code format.

* Require tribute in pull request page.
 2017-12-11 14:03:04 +08:00
Konrad
c81041f80d
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-27 22:36:38 +01:00
Lauris BH
0d4c63fd70
Fix go-get, src and raw urls to new scheme (#2978) 2017-11-27 02:58:54 +02:00
Konrad
fc35252f68
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-26 18:41:38 +01:00
Ethan Koenig
40c545ddbc Fix files/commits of merged PRs (#2937) 2017-11-25 21:47:19 +08:00
kolaente
c4ba8d681f
Merge branch 'master' into master 2017-11-06 17:42:41 +01:00
Lunny Xiao
cdc4600725
Fix fork repository cycle to self (#2860) 
* fix fork repository cycle to self

* rename testForkRepo to traverseParentRepo
 2017-11-06 12:12:55 +08:00
Konrad
dd24b9ff5a
Implemented missing create table for Issue Dependencies table \ 
IssueNoDependenciesLeft now returns an error when something goes wrong
;
 2017-11-01 16:16:49 +01:00
Konrad Langenberg
30fe97a55e Merge branch 'master' of https://github.com/go-gitea/gitea 
Signed-off-by: Konrad <konrad@kola-entertainments.de>

# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v46.go
#	models/repo.go
#	public/js/index.js
 2017-10-30 21:17:36 +01:00
Lauris BH
1ec4dc6c1d Fix so that user can still fork his own repository to owned organizations (#2699) 
* Fix so that user can still fork his own repository to his organizations

* Fix to only use owned organizations

* Add integration test for forking own repository to owned organization
 2017-10-15 18:06:07 +03:00
Konrad Langenberg
d7a2ffcc69 Merge branch 'master' of https://github.com/go-gitea/gitea 
Signed-off-by: Konrad <konrad@kola-entertainments.de>

# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v44.go
 2017-10-04 23:15:30 +02:00
Kazuki Sawada
e1266a19c8 Change pull description text (#2075) (#2646) 
* Change pull description text

* move duplicated code into helper function
 2017-10-04 20:35:01 +03:00
Konrad Langenberg
1b8b2fc17d Simplified checks for open dependencies 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-23 16:11:16 +02:00
Konrad Langenberg
c1ee648998 fixed template issue, resolved conflicts 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:53:28 +02:00
Jonas Franz
fe6c1a9ae2 Fixing build process by syncing govendor dependencies and gofmt. 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
 2017-09-17 21:26:37 +02:00
Konrad Langenberg
74a0df7a3b Merged with upstream/master, resolved conflicts 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 20:38:30 +02:00
Lunny Xiao
1739e84ac0 improve protected branch to add whitelist support (#2451) 
* improve protected branch to add whitelist support

* fix lint

* fix style check

* fix tests

* fix description on UI and import

* fix test

* bug fixed

* fix tests and languages

* move isSliceInt64Eq to util pkg; improve function names & typo
 2017-09-14 16:16:22 +08:00
kolaente
67f66d6bb5 Resolved Conflicts 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-12 14:19:20 +02:00
Konrad Langenberg
0c9203d12b Implemented repo settings check on autoclose 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-09 14:09:44 +02:00
Ethan Koenig
b689bb6180 Webhooks for repo creation/deletion (#1663) 
* Webhooks for repo creation/deletion

* add createHookTask

* Add handles for GetSlackPayload and GetDiscordPayload
 2017-09-03 11:20:24 +03:00
Konrad Langenberg
a9607ed720 Implemented Dependencies for pull requests. 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-08-29 22:32:29 +02:00
Bwko
8f171210b9 Revert "Add ability to fork your own repos (#761)" (#2193) 2017-07-26 15:17:38 +08:00
Kim "BKC" Carlbäcker
cc6b3f60c6 Fix displaying commits and files of PR created from now deleted fork (#2023) 
Fix displaying commits and files of PR created from now deleted fork
 2017-06-22 19:40:47 +02:00
Lauris BH
0a5dc640a1 Make branch deletion URL more like GitHub's, fixes #1397 (#1994) 
* Make branch deletion URL more like GitHub's, fixes #1397

* Add PR branch deletion integration test

* Do not allow deleting protected branch

* Change http error code to 403 if user has no write rights to repository

* Add check to not panic if forked repository has alrady been deleted
 2017-06-21 09:00:03 +08:00
Lauris Bukšis-Haberkorns
63504bf132
Fix displaying commits and files of PR created from now deleted forked repository 2017-06-21 01:25:38 +03:00
Lauris BH
79494047b0 Show commit status icon in commits table (#1688) 
* Show commit status icon in commits table

* Add comments

* Fix icons

* Few more places where commit table is displayed

* Change integration test to use goquery for parsing html

* Add integration tests for commit table and status icons

* Fix status to return lates status correctly on all databases

* Rewrote lates commit status selects
 2017-05-07 22:40:31 +08:00
Lunny Xiao
d2165a5890 fix compare button failed when there is no fork repos (#1104) 2017-03-03 16:53:59 +08:00
Andrey Nering
27d30f1a61 Notifying on open PR, and Close/Reopen/Merge issue or PR 2017-01-28 13:59:58 -02:00
Bwko
e08421017c Add ability to fork your own repos (#761) 2017-01-26 22:44:37 +08:00
Manuel Kuhlmann
dc3ff9f2ab Rename .gogs to .gitea and comply with github template guidelines (#568) (#582) 
Signed-off-by: Manuel Kuhlmann <manuel@mkuhlmann.org>
 2017-01-05 08:48:23 +08:00
Lunny Xiao
70900bd167 bug fixed for fork repos (#560) 2017-01-03 12:41:10 +08:00
Lunny Xiao
2343feadd4 resolved #310: hide fork to self (#323) 2016-12-01 18:51:50 +08:00
Lunny Xiao
ec87a75c00 golint fixed for modules/auth 2016-11-27 21:39:06 +08:00