Lauris BH
be1330ec89
Remove hardcoded paths to fix randomly failing tests ( #3347 )
...
* Remove hardcoded paths to fix randomly failing tests
* Use correct function for merge path
2018-01-11 00:46:59 +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
Lunny Xiao
f2e20c81b6
Refactor struct's time to remove unnecessary memory usage ( #3142 )
...
* refactor struct's time to remove unnecessary memory usage
* use AsTimePtr simple code
* fix tests
* fix time compare
* fix template on gpg
* use AddDuration instead of Add
2017-12-11 06:37:04 +02:00
Kazuki Sawada
ffab139c91
table pull_request wasn't updated correctly ( #2649 )
...
* Fix: table `pull_request` won't be updated correctly
* Update also status column when manually merged
2017-10-06 00:25:40 +03:00
Ethan Koenig
aa962deec0
Replace deprecated Id method with ID ( #2655 )
2017-10-05 07:43:04 +03:00
Lunny Xiao
a8717e5e3a
Use AfterLoad instead of AfterSet on Structs ( #2628 )
...
* use AfterLoad instead of AfterSet on Structs
* fix the comments on AfterLoad
* fix the comments on action AfterLoad
2017-10-01 19:52:35 +03:00
Lunny Xiao
dd55534b82
Reduce usage of allcols on update ( #2596 )
...
* reduce usage of allcols on update
* fix bug and tests
2017-09-25 12:59:27 +08:00
Ethan Koenig
b0f7457d9e
Improve issue search ( #2387 )
...
* Improve issue indexer
* Fix new issue sqlite bug
* Different test indexer paths for each db
* Add integration indexer paths to make clean
2017-09-16 23:16:21 +03:00
Ethan Koenig
eae9154811
Fix SQL bug in models.PullRequests
2017-07-01 14:08:43 +03:00
Bwko
b36849dc1f
Fix exit status 1 not handled @ getMergeCommit
2017-06-30 12:35:26 +02:00
Ethan Koenig
902a749fd9
Fix fast-forward PR bug ( #1989 )
2017-06-22 09:06:57 +08:00
Lauris BH
6db387a21e
Refactor session close as xorm already does everything needed internally ( #2020 )
2017-06-21 08:57:05 +08:00
Lauris BH
165cf33771
Wrong PR merge commit ID saved ( #2007 )
2017-06-19 17:37:11 +08:00
Ethan Koenig
a977ab7889
Don't ignore error in getMergeCommit ( #1843 )
2017-05-31 19:51:24 -05:00
Ethan Koenig
474d636794
Update code.gitea.io/git ( #1824 )
...
* Update code.gitea.io/git
* Update function calls
* govendor fetch
2017-05-30 04:32:01 -05:00
Ethan Koenig
0c332f0480
Fix activity feed ( #1779 )
...
* Fix activity feed
Preserve actions after user/repo name change
* Add missing comment
* Fix migration, and remove fields completely
* Tests
2017-05-26 09:38:18 +08:00
Diep Pham
407fbfa6ce
fixes wrong after field in webhook payload
...
when merge pull request
2017-05-18 12:16:36 +07:00
Lunny Xiao
0f3923c4d7
fix potential lock when sqlite ( #1647 )
2017-05-05 08:47:03 +08:00
Jonas Östanbäck
e4a0a04829
Add create_at and updated_at in PR json ( #1616 )
...
* Move new fields to object creation (use reference)
* Vendor: Update SDK
2017-04-27 17:29:46 +08:00
Mura Li
6a39250579
Add length check for the return string ( #1420 )
...
* Add length check for the return string
* Differentiate error paths and logging messages
* Rectify error message
2017-03-31 16:42:23 +08:00
Ethan Koenig
22f7aa6e9c
LableIDs -> LabelIDs ( #1088 )
2017-03-01 09:08:45 +08:00
Lunny Xiao
d4e38cf129
fix setMerged for remove unnecessary db connection ( #1067 )
2017-02-27 08:42:55 +08:00
Bwko
bf647ce143
Check for manual merging of a pull request ( #719 )
...
When an open pull request got manually merged mark the pull request as
merged
2017-02-05 21:07:44 +08:00
Gabriel Jackson
bf6f61cc69
Cleanup log messaging
...
This change corrects a few logging issues:
* Standardized formatting errors with '%v'.
* Standardized failure warning word usage.
* Corrected an instance of using the standard log library when
the gitea log library should be used instead.
2017-02-02 15:24:18 +01:00
Lunny Xiao
081485ecfd
add milestone changed traker on issue view ( #804 )
2017-02-01 10:36:08 +08:00
Thomas Boerger
78535fb08e
Allow custom public files ( #782 )
...
* Allow custom public files
* Gofmt code, lots of places not related to this pr
2017-01-28 23:14:56 +01:00
Matthias Loibl
d1006150fb
Refactor process package and introduce ProcessManager{} with tests ( #75 )
...
* Add a process.Manager singleton with process.GetManager()
* Use process.GetManager everywhere
* Fix godoc comments for process module
* Increment process counter id after locking the mutex
2017-01-17 13:58:58 +08:00
Andrey Nering
03b45284e1
Merge pull request #555 from ethantkoenig/tests/pull
...
Unit tests for models/pull.go
2017-01-06 19:19:18 -02:00
Andrey Nering
84b7d29d34
Create missing database indexes ( #596 )
2017-01-06 23:14:33 +08:00
Ethan Koenig
72bfabfada
Unit tests for models/pull.go
2017-01-06 10:08:23 -05:00
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
Unknwon
912f7b51e9
#1821 add actions for close and reopen issues
2016-02-22 12:40:00 -05:00
Unknwon
b7f3d94cd0
Minor fix for #2524
2016-02-19 22:16:26 -05:00
Unknwon
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
Martin Hartkorn
a3bdede2ce
Removed unused method GetUnmergedPullRequestByRepoPathAndHeadBranch
2016-02-04 19:15:21 +01:00
Martin Hartkorn
d91004ee71
Removed dependency on post-receive hook and use TriggerTask instead
2016-02-04 19:00:42 +01:00
Unknwon
a47baa1b7a
Add missing patch conflit pattern
2016-02-03 12:28:03 -05:00
Martin Hartkorn
20403f75fb
Enable a way to checkout Pull Requests from remote refs
2016-01-30 23:56:38 +01:00
Unknwon
4deb876343
Minor fix for #2494
...
- Change tooltip size from mini to tiny in profile page
2016-01-28 06:07:16 -05:00
Martin Hartkorn
674c5c37be
Change user name in Pull Requests
2016-01-27 22:45:03 +01:00
Unknwon
19423957b1
rename import path
2015-12-15 17:25:45 -05:00
Unknwon
9a2e43bff2
move out git module and #1573 send push hook
2015-12-09 20:46:05 -05:00
Unknwon
e42fcb033d
wiki: finish edit
2015-11-27 01:50:38 -05:00
Unknwon
c50a3503e6
introduce git-shell
2015-11-26 17:33:45 -05:00
Unknwon
6a6a7512c2
notice
2015-11-20 11:37:17 -05:00
Unknwon
6b30b20765
add more debug info
2015-11-20 08:43:15 -05:00
Unknwon
74dfe439c2
more fix on #2002
2015-11-20 04:08:08 -05:00
Unknwon
1d4a5b1825
fix #2002
2015-11-20 02:53:54 -05:00
Unknwon
e06558e208
#1922 Pull request fail to merge with BIN
2015-11-16 21:18:04 -05:00
Unknwon
4f03b81ec7
#1931 Test patch does not checkout correct base branch
2015-11-15 14:41:36 -05:00
Unknwon
25ec20d525
#1838 update merge base before generate new patch
2015-11-03 17:25:39 -05:00
