Ethan Koenig 
								
							 
						 
						
							
							
								
							
							
	1207bda94b  
						 
						
							
							
								
								
								Fix typos in models/ ( #576 )  
							
							
							
							
						 
						
							2017-01-05 08:50:34 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									typeless 
								
							 
						 
						
							
							
								
							
							
	937b4b5aa1  
						 
						
							
							
								
								
								Speed up conflict checking in pull request creation ( #276 )  
							
							... 
							
							
							
							
							* Speed up conflict checking in pull request creation
In order to check conflicts of a PR, we set up a working tree by
cloning the base branch, which is quite time-consuming when the repository is huge.
Instead, this PR uses `git read-tree` and `git apply --check --cached` to check conflicts.
For #258 
* Use $GIT_INDEX_FILE instead of --index-output to avoid lockfile problem
The lockfile gets renamed to the final destination after the operation
finishes. But it must be located in the same filesystem, which prevents
us from using /tmp.
* Temporary file names should not prefixed with '-' 
							
						 
						
							2016-12-29 22:59:52 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	47a7529d96  
						 
						
							
							
								
								
								update code.gitea.io/git ( #450 )  
							
							
							
							
						 
						
							2016-12-22 10:30:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Lunegov 
								
							 
						 
						
							
							
								
							
							
	d5d21b67d2  
						 
						
							
							
								
								
								Fix string format verbs ( #3637 )  
							
							
							
							
						 
						
							2016-12-22 08:18:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richie B2B 
								
							 
						 
						
							
							
								
							
							
	44428fdc38  
						 
						
							
							
								
								
								Remove fixed FIXME ( #408 )  
							
							
							
							
						 
						
							2016-12-16 17:00:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Bwko 
								
							 
						 
						
							
							
								
							
							
	cbcb4361d5  
						 
						
							
							
								
								
								Fixes issue  #283  
							
							... 
							
							
							
							
							Delete old temp local copy before we create a new temp local copy 
							
						 
						
							2016-12-09 20:13:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ethan Koenig 
								
							 
						 
						
							
							
								
							
							
	04b9a7e7a2  
						 
						
							
							
								
								
								Bug fixes for repo permissions in API  
							
							... 
							
							
							
							
							Also move duplicated code into repo.APIFormat(..) 
							
						 
						
							2016-12-07 12:55:24 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Kim "BKC" Carlbäcker 
								
							 
						 
						
							
							
								
							
							
	d07c955e2a  
						 
						
							
							
								
								
								Fix regression in PR-API  #248  ( #349 )  
							
							... 
							
							
							
							
							* Fix  #344  (regression in PR-API #248 ) 
							
						 
						
							2016-12-05 12:17:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Bwko 
								
							 
						 
						
							
							
								
							
							
	0118b275b6  
						 
						
							
							
								
								
								Fix for  #320  
							
							... 
							
							
							
							
							Suppress the error when we're removing a file that may not exist 
							
						 
						
							2016-12-03 22:31:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Kim "BKC" Carlbäcker 
								
							 
						 
						
							
							
								
							
							
	0f05470cb8  
						 
						
							
							
								
								
								[API] Pull Requests ( #248 )  
							
							
							
							
						 
						
							2016-12-02 12:10:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Bwko 
								
							 
						 
						
							
							
								
							
							
	4ff0db0246  
						 
						
							
							
								
								
								Catch os... errors  
							
							
							
							
						 
						
							2016-12-02 07:41:19 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	646e02b521  
						 
						
							
							
								
								
								typo  
							
							
							
							
						 
						
							2016-12-01 09:05:32 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Kim "BKC" Carlbäcker 
								
							 
						 
						
							
							
								
							
							
	42ec5ce740  
						 
						
							
							
								
								
								Fix breakage from vendor-update  
							
							
							
							
						 
						
							2016-11-29 11:50:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	1d0f811399  
						 
						
							
							
								
								
								golint fixed for models/pull.go ( #292 )  
							
							
							
							
						 
						
							2016-11-28 23:31:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lunny Xiao 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	dd9d0f3732  
						 
						
							
							
								
								
								Lint action.go  
							
							
							
							
						 
						
							2016-11-24 09:03:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibault Meyer 
								
							 
						 
						
							
							
								
							
							
	
	
	ddee4c8b58 
 
						 
						
							
							
								
								
								Normalize files with gofmt  
							
							
							
							
						 
						
							2016-11-11 13:11:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	a1c5f02444  
						 
						
							
							
								
								
								Fix import path of go-sdk ( #141 )  
							
							... 
							
							
							
							
							From code.gitea.io/go-sdk/gitea
  To code.gitea.io/sdk/gitea 
							
						 
						
							2016-11-11 17:39:44 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibault Meyer 
								
							 
						 
						
							
							
								
							
							
	
	
	b0ddced2b5 
 
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries  
							
							... 
							
							
							
							
							# Conflicts:
#	models/git_diff.go
#	models/issue.go
#	models/org.go
#	models/pull.go
#	models/repo.go 
							
						 
						
							2016-11-10 21:05:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibault Meyer 
								
							 
						 
						
							
							
								
							
							
	
	
	a4454f5d0f 
 
						 
						
							
							
								
								
								Rewrite XORM queries  
							
							
							
							
						 
						
							2016-11-10 20:59:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	80eea77953  
						 
						
							
							
								
								
								Use MixedCase constant names  
							
							... 
							
							
							
							
							See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps  
							
						 
						
							2016-11-07 17:05:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Boerger 
								
							 
						 
						
							
							
								
							
							
	5d430c9e68  
						 
						
							
							
								
								
								Merge pull request  #108  from go-gitea/go-sdk  
							
							... 
							
							
							
							
							Replaced gogits go-gogs-client with go-sdk 
							
						 
						
							2016-11-07 16:31:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Boerger 
								
							 
						 
						
							
							
								
							
							
	
	
	4c6c16f358 
 
						 
						
							
							
								
								
								Replaced go-gogs-client with go-sdk imports  
							
							
							
							
						 
						
							2016-11-07 16:10:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	30be1f4826  
						 
						
							
							
								
								
								Fix typo in unused constant name  
							
							
							
							
						 
						
							2016-11-07 16:06:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthias Loibl 
								
							 
						 
						
							
							
								
							
							
	1f44b01e2a  
						 
						
							
							
								
								
								Fix imports found by goimports.  
							
							
							
							
						 
						
							2016-11-05 17:56:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Rémy Boulanouar 
								
							 
						 
						
							
							
								
							
							
	2d68bd1ef9  
						 
						
							
							
								
								
								Change import reference to match gitea instead of gogs ( #37 )  
							
							
							
							
						 
						
							2016-11-03 10:29:56 -02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	c1ecb6c60a  
						 
						
							
							
								
								
								modules/sync: add UniqueQueue  
							
							
							
							
						 
						
							2016-08-30 15:50:30 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	643142acab  
						 
						
							
							
								
								
								Web editor: support upload files  
							
							
							
							
						 
						
							2016-08-30 05:23:59 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	a00c932bbc  
						 
						
							
							
								
								
								General code quality improvement  
							
							
							
							
						 
						
							2016-08-16 23:06:38 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	2625193a48  
						 
						
							
							
								
								
								models/repo_editor: improve code quality  
							
							
							
							
						 
						
							2016-08-15 22:20:55 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	4042d1f0c3  
						 
						
							
							
								
								
								models/issue: improve quality and performance of NewIssue function  
							
							
							
							
						 
						
							2016-08-15 18:40:32 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	cd89f6c502  
						 
						
							
							
								
								
								Web editor: improve edit file and diff preview  
							
							
							
							
						 
						
							2016-08-14 23:52:24 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richard Mahn 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	dccb0c15b9  
						 
						
							
							
								
								
								Replace convert.To with APIFormat calls  
							
							
							
							
						 
						
							2016-08-14 04:17:26 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	3f7f4852ef  
						 
						
							
							
								
								
								#2246  fully support of webhooks for pull request  
							
							
							
							
						 
						
							2016-08-14 03:32:24 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lstahlman 
								
							 
						 
						
							
							
								
							
							
	ea192147ea  
						 
						
							
							
								
								
								Add test pull request task on merging a PR.  Fixes   #3396  ( #3425 )  
							
							
							
							
						 
						
							2016-08-10 11:38:44 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	ec92565f23  
						 
						
							
							
								
								
								#3393  fix missing sub-url prefix in relative avatar link  
							
							
							
							
						 
						
							2016-08-07 10:13:05 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	1f2e173a74  
						 
						
							
							
								
								
								Refactor User.Id to User.ID  
							
							
							
							
						 
						
							2016-07-24 01:08:22 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	250be011c7  
						 
						
							
							
								
								
								Remove redundant Unix timestamp method call  
							
							... 
							
							
							
							
							Unix() already uses UTC as timezone 
							
						 
						
							2016-07-23 20:24:44 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	f1b8d52eb3  
						 
						
							
							
								
								
								#2854  fix no mail notification when issue is closed/reopened  
							
							
							
							
						 
						
							2016-07-16 00:36:39 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	7ca5f8f119  
						 
						
							
							
								
								
								models/repo: remove redundant info for some repo methods  
							
							... 
							
							
							
							
							RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink 
							
						 
						
							2016-07-15 21:53:43 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	ad513a20e9  
						 
						
							
							
								
								
								#2302  Replace time.Time with Unix Timestamp (int64)  
							
							
							
							
						 
						
							2016-03-09 19:53:30 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	2a931937a8  
						 
						
							
							
								
								
								Update locales  
							
							
							
							
						 
						
							2016-03-04 18:51:18 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	e2d370f0da  
						 
						
							
							
								
								
								#1597  fix pull request remote head can't update with force push  
							
							
							
							
						 
						
							2016-03-04 16:53:03 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	2d2d85bba4  
						 
						
							
							
								
								
								#1597  support pull requests in same repository  
							
							
							
							
						 
						
							2016-03-04 15:43:01 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	129638117f  
						 
						
							
							
								
								
								#2697  fix panic when close issue via commit message  
							
							
							
							
						 
						
							2016-02-25 14:17:55 -05:00