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
47a7529d96
update code.gitea.io/git ( #450 )
2016-12-22 10:30:52 +01:00
d5d21b67d2
Fix string format verbs ( #3637 )
2016-12-22 08:18:41 +01:00
44428fdc38
Remove fixed FIXME ( #408 )
2016-12-16 17:00:30 +01:00
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
04b9a7e7a2
Bug fixes for repo permissions in API
...
Also move duplicated code into repo.APIFormat(..)
2016-12-07 12:55:24 +01:00
d07c955e2a
Fix regression in PR-API #248 ( #349 )
...
* Fix #344 (regression in PR-API #248 )
2016-12-05 12:17:39 +01:00
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
0f05470cb8
[API] Pull Requests ( #248 )
2016-12-02 12:10:39 +01:00
4ff0db0246
Catch os... errors
2016-12-02 07:41:19 +01:00
646e02b521
typo
2016-12-01 09:05:32 +08:00
42ec5ce740
Fix breakage from vendor-update
2016-11-29 11:50:22 +01:00
1d0f811399
golint fixed for models/pull.go ( #292 )
2016-11-28 23:31: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
dd9d0f3732
Lint action.go
2016-11-24 09:03:29 +01:00
ddee4c8b58
Normalize files with gofmt
2016-11-11 13:11:45 +01:00
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
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
a4454f5d0f
Rewrite XORM queries
2016-11-10 20:59:51 +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
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
4c6c16f358
Replaced go-gogs-client with go-sdk imports
2016-11-07 16:10:32 +01:00
30be1f4826
Fix typo in unused constant name
2016-11-07 16:06:21 +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
1f44b01e2a
Fix imports found by goimports.
2016-11-05 17:56:35 +01:00
2d68bd1ef9
Change import reference to match gitea instead of gogs ( #37 )
2016-11-03 10:29:56 -02:00
c1ecb6c60a
modules/sync: add UniqueQueue
2016-08-30 15:50:30 -07:00
643142acab
Web editor: support upload files
2016-08-30 05:23:59 -07:00
a00c932bbc
General code quality improvement
2016-08-16 23:06:38 -07: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
2625193a48
models/repo_editor: improve code quality
2016-08-15 22:20:55 -07:00
4042d1f0c3
models/issue: improve quality and performance of NewIssue function
2016-08-15 18:40:32 -07:00
cd89f6c502
Web editor: improve edit file and diff preview
2016-08-14 23:52:24 -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
dccb0c15b9
Replace convert.To with APIFormat calls
2016-08-14 04:17:26 -07:00
3f7f4852ef
#2246 fully support of webhooks for pull request
2016-08-14 03:32:24 -07:00
ea192147ea
Add test pull request task on merging a PR. Fixes #3396 ( #3425 )
2016-08-10 11:38:44 -07:00
ec92565f23
#3393 fix missing sub-url prefix in relative avatar link
2016-08-07 10:13:05 -07:00
1f2e173a74
Refactor User.Id to User.ID
2016-07-24 01:08:22 +08:00
250be011c7
Remove redundant Unix timestamp method call
...
Unix() already uses UTC as timezone
2016-07-23 20:24:44 +08:00
f1b8d52eb3
#2854 fix no mail notification when issue is closed/reopened
2016-07-16 00:36:39 +08:00
7ca5f8f119
models/repo: remove redundant info for some repo methods
...
RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink
2016-07-15 21:53:43 +08:00
ad513a20e9
#2302 Replace time.Time with Unix Timestamp (int64)
2016-03-09 19:53:30 -05:00
2a931937a8
Update locales
2016-03-04 18:51:18 -05:00
e2d370f0da
#1597 fix pull request remote head can't update with force push
2016-03-04 16:53:03 -05:00
2d2d85bba4
#1597 support pull requests in same repository
2016-03-04 15:43:01 -05:00
129638117f
#2697 fix panic when close issue via commit message
2016-02-25 14:17:55 -05:00
912f7b51e9
#1821 add actions for close and reopen issues
2016-02-22 12:40:00 -05:00
b7f3d94cd0
Minor fix for #2524
2016-02-19 22:16:26 -05:00
f6c98465c7
Merge pull request #2524 from mhartkorn/pullrefs
...
Enable a way to checkout Pull Requests from remote refs
2016-02-19 22:00:25 -05:00
a3bdede2ce
Removed unused method GetUnmergedPullRequestByRepoPathAndHeadBranch
2016-02-04 19:15:21 +01:00
d91004ee71
Removed dependency on post-receive hook and use TriggerTask instead
2016-02-04 19:00:42 +01:00
a47baa1b7a
Add missing patch conflit pattern
2016-02-03 12:28:03 -05:00
20403f75fb
Enable a way to checkout Pull Requests from remote refs
2016-01-30 23:56:38 +01:00
4deb876343
Minor fix for #2494
...
- Change tooltip size from mini to tiny in profile page
2016-01-28 06:07:16 -05:00
674c5c37be
Change user name in Pull Requests
2016-01-27 22:45:03 +01:00
19423957b1
rename import path
2015-12-15 17:25:45 -05:00
9a2e43bff2
move out git module and #1573 send push hook
2015-12-09 20:46:05 -05:00
e42fcb033d
wiki: finish edit
2015-11-27 01:50:38 -05:00
c50a3503e6
introduce git-shell
2015-11-26 17:33:45 -05:00
6a6a7512c2
notice
2015-11-20 11:37:17 -05:00
6b30b20765
add more debug info
2015-11-20 08:43:15 -05:00
74dfe439c2
more fix on #2002
2015-11-20 04:08:08 -05:00
1d4a5b1825
fix #2002
2015-11-20 02:53:54 -05:00
e06558e208
#1922 Pull request fail to merge with BIN
2015-11-16 21:18:04 -05:00
4f03b81ec7
#1931 Test patch does not checkout correct base branch
2015-11-15 14:41:36 -05:00
25ec20d525
#1838 update merge base before generate new patch
2015-11-03 17:25:39 -05:00
706b0f72e2
fix issue comment mention and autofix count when start
2015-10-29 20:40:57 -04:00
b9f5def5dc
fix insecure tls when trigger task
2015-10-26 09:16:24 -04:00
87c3c8172a
#1711 try to indicate sqlite session issue when merge
2015-10-25 18:35:27 -04:00
c3ba5590c9
Reopen PR need retest patch
2015-10-25 03:10:22 -04:00
2be5837cb0
New push to base repo of base branch: retest all corresponding patches
2015-10-24 14:48:11 -04:00
0fbb8c8826
New push to head repo of head branch: regenerate patch and retest apply
2015-10-24 03:36:47 -04:00
04af4b24fd
work on #1818
2015-10-22 14:47:32 -04:00
fc7959d3bc
New/reopen PR checks if there is any unmerged and open PR
2015-10-18 19:30:39 -04:00
typeless
Lunny Xiao
Alexander Lunegov
Richie B2B
Bwko
Ethan Koenig
Kim "BKC" Carlbäcker
Sandro Santilli
Thibault Meyer
Thomas Boerger
Thomas Boerger
Matthias Loibl
Rémy Boulanouar
Unknwon
Richard Mahn
lstahlman
Martin Hartkorn