ca4f5c37e6 
								
							 
						 
						
							
							
								
								Fix branch deletion for squash or rebase merged pull requests ( #3425 )  
							
							
							
						 
						
							2018-01-30 14:29:39 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d663cef2a5 
								
							 
						 
						
							
							
								
								Fix branch name escaping in compare url  ( #3311 )  
							
							... 
							
							
							
							* Fixes  #3303  
							
						 
						
							2018-01-08 17:17:24 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								515cdaa85d 
								
							 
						 
						
							
							
								
								Fix ignored errors when checking if organization, team member ( #3177 )  
							
							
							
						 
						
							2017-12-21 09:43:26 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								0d4c63fd70 
								
							 
						 
						
							
							
								
								Fix go-get, src and raw urls to new scheme ( #2978 )  
							
							
							
						 
						
							2017-11-27 02:58:54 +02:00  
				
					
						
							
							
								 
						
							
								40c545ddbc 
								
							 
						 
						
							
							
								
								Fix files/commits of merged PRs ( #2937 )  
							
							
							
						 
						
							2017-11-25 21:47:19 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								8f171210b9 
								
							 
						 
						
							
							
								
								Revert "Add ability to fork your own repos ( #761 )" ( #2193 )  
							
							
							
						 
						
							2017-07-26 15:17:38 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								63504bf132 
								
							 
						 
						
							
							
								
								Fix displaying commits and files of PR created from now deleted forked repository  
							
							
							
						 
						
							2017-06-21 01:25:38 +03:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d2165a5890 
								
							 
						 
						
							
							
								
								fix compare button failed when there is no fork repos ( #1104 )  
							
							
							
						 
						
							2017-03-03 16:53:59 +08:00  
				
					
						
							
							
								 
						
							
								27d30f1a61 
								
							 
						 
						
							
							
								
								Notifying on open PR, and Close/Reopen/Merge issue or PR  
							
							
							
						 
						
							2017-01-28 13:59:58 -02:00  
				
					
						
							
							
								 
						
							
								e08421017c 
								
							 
						 
						
							
							
								
								Add ability to fork your own repos ( #761 )  
							
							
							
						 
						
							2017-01-26 22:44:37 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								70900bd167 
								
							 
						 
						
							
							
								
								bug fixed for fork repos ( #560 )  
							
							
							
						 
						
							2017-01-03 12:41:10 +08:00  
				
					
						
							
							
								 
						
							
								2343feadd4 
								
							 
						 
						
							
							
								
								resolved   #310 : hide fork to self ( #323 )  
							
							
							
						 
						
							2016-12-01 18:51:50 +08:00  
				
					
						
							
							
								 
						
							
								ec87a75c00 
								
							 
						 
						
							
							
								
								golint fixed for modules/auth  
							
							
							
						 
						
							2016-11-27 21:39:06 +08:00  
				
					
						
							
							
								 
						
							
								94da472717 
								
							 
						 
						
							
							
								
								Golint fixed for modules/setting ( #262 )  
							
							... 
							
							
							
							* golint fixed for modules/setting
* typo fixed and renamed UNIXSOCKET to UnixSocket 
							
						 
						
							2016-11-27 18:14:25 +08:00  
				
					
						
							
							
								 
						
							
								3917ed45de 
								
							 
						 
						
							
							
								
								golint fixed for routers ( #208 )  
							
							
							
						 
						
							2016-11-24 15:04:31 +08:00  
				
					
						
							
							
								 
						
							
								739f07c98e 
								
							 
						 
						
							
							
								
								Remember diff view style ( #163 )  
							
							
							
						 
						
							2016-11-13 10:54:04 +08:00  
				
					
						
							
							
								 
						
							
								ddee4c8b58 
								
							 
						 
						
							
							
								
								Normalize files with gofmt  
							
							
							
						 
						
							2016-11-11 13:11:45 +01:00  
				
					
						
							
							
								 
						
							
								4247304f5a 
								
							 
						 
						
							
							
								
								Update import paths from github.com/go-gitea to code.gitea.io ( #135 )  
							
							... 
							
							
							
							- Update import paths from github.com/go-gitea to code.gitea.io
- Fix import path for travis
See https://docs.travis-ci.com/user/languages/go#Go-Import-Path  
							
						 
						
							2016-11-10 17:24:48 +01:00  
				
					
						
							
							
								 
						
							
								80eea77953 
								
							 
						 
						
							
							
								
								Use MixedCase constant names  
							
							... 
							
							
							
							See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps  
							
						 
						
							2016-11-07 17:05:08 +01:00  
				
					
						
							
							
								 
						
							
								b7263f31a5 
								
							 
						 
						
							
							
								
								Replace GOGS with GITEA in variable names  
							
							... 
							
							
							
							Still use GOGS_WORK_DIR and GOGS_CUSTOM env variables
as a fallback if the equivalent GITEA_* are not set,
warning user about the need for change.
Does not change "gogs" to "gitea" in webhook type name
Because "gogs" hook type is part of the API (routes) and used
in templates...
Closes  #87  
							
						 
						
							2016-11-07 16:05:18 +01:00  
				
					
						
							
							
								 
						
							
								6e4252dad4 
								
							 
						 
						
							
							
								
								Replace gogits/git-module dependency with go-gitea/git ( #94 )  
							
							... 
							
							
							
							* Replace gogits/git-module dependency with go-gitea/git
Fixes  #92 
* Remove git alias for git module import (not needed) 
							
						 
						
							2016-11-06 11:18:34 -02:00  
				
					
						
							
							
								 
						
							
								f36544f98d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/goimports  
							
							
							
						 
						
							2016-11-05 22:54:20 +01:00  
				
					
						
							
							
								 
						
							
								bd898a10f8 
								
							 
						 
						
							
							
								
								Refactor editorconfig middleware  
							
							
							
						 
						
							2016-11-05 15:44:14 -02:00  
				
					
						
							
							
								 
						
							
								1f44b01e2a 
								
							 
						 
						
							
							
								
								Fix imports found by goimports.  
							
							
							
						 
						
							2016-11-05 17:56:35 +01:00  
				
					
						
							
							
								 
						
							
								984fa8d83b 
								
							 
						 
						
							
							
								
								Fix 500 when repo has invalid .editorconfig  
							
							... 
							
							
							
							Creating a notice instead 
							
						 
						
							2016-11-05 13:33:41 -02:00  
				
					
						
							
							
								 
						
							
								87b593f93e 
								
							 
						 
						
							
							
								
								Show issue/PR number on title  
							
							
							
						 
						
							2016-11-03 20:28:05 -02:00  
				
					
						
							
							
								 
						
							
								2d68bd1ef9 
								
							 
						 
						
							
							
								
								Change import reference to match gitea instead of gogs ( #37 )  
							
							
							
						 
						
							2016-11-03 10:29:56 -02:00  
				
					
						
							
							
								 
						
							
								6f9a95f830 
								
							 
						 
						
							
							
								
								#2246  add HTMLURL to webhook type  
							
							... 
							
							
							
							- Fill Milestone and Assignee field when available in webhook payload 
							
						 
						
							2016-08-16 10:19:09 -07:00  
				
					
						
							
							
								 
						
							
								61e27dedf7 
								
							 
						 
						
							
							
								
								#3466  fix response of pull request form validation error  
							
							
							
						 
						
							2016-08-15 14:04:44 -07:00  
				
					
						
							
							
								 
						
							
								d0a0239bac 
								
							 
						 
						
							
							
								
								Squashed commit of the following:  
							
							... 
							
							
							
							commit 0afcb843d7ffd596991c4885cab768273a6eb42c
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 17:13:29 2016 -0600
    Removed Upload stats as the upload table is just a temporary table
commit 7ecd73ff5535612d79d471409173ee7f1fcfa157
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:42:41 2016 -0600
    Fix for CodeMirror mode
commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:03:33 2016 -0600
    Made tabbing in editor use spaces
commit 23af384c53206a8a40e11e45bf49d7a149c4adcd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:56:46 2016 -0600
    Fix for data-url
commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9
Merge: 7fc8a89 991ce42ad7ea88cf85e9e1c7dcdd 
							
						 
						
							2016-08-14 23:52:24 -07:00  
				
					
						
							
							
								 
						
							
								3f7f4852ef 
								
							 
						 
						
							
							
								
								#2246  fully support of webhooks for pull request  
							
							
							
						 
						
							2016-08-14 03:32:24 -07:00  
				
					
						
							
							
								 
						
							
								dbed39ba05 
								
							 
						 
						
							
							
								
								On showing diff/file, use the tab_width specified on .editorconfig, if any ( #3241 )  
							
							... 
							
							
							
							Closes  #3182  
						
							2016-08-11 17:07:09 -07:00  
				
					
						
							
							
								 
						
							
								1f2e173a74 
								
							 
						 
						
							
							
								
								Refactor User.Id to User.ID  
							
							
							
						 
						
							2016-07-24 01:08:22 +08:00  
				
					
						
							
							
								 
						
							
								256cd6374a 
								
							 
						 
						
							
							
								
								#2790  fix not detect diff style in pull request file changes  
							
							
							
						 
						
							2016-07-23 23:46:49 +08:00  
				
					
						
							
							
								 
						
							
								4b5e09e4d6 
								
							 
						 
						
							
							
								
								#3181  detect situation when base branch is deleted in pull request  
							
							
							
						 
						
							2016-07-23 18:35:16 +08:00