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
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
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
aa962deec0
Replace deprecated Id method with ID ( #2655 )
2017-10-05 07:43:04 +03:00
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
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
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
eae9154811
Fix SQL bug in models.PullRequests
2017-07-01 14:08:43 +03:00
b36849dc1f
Fix exit status 1 not handled @ getMergeCommit
2017-06-30 12:35:26 +02:00
902a749fd9
Fix fast-forward PR bug ( #1989 )
2017-06-22 09:06:57 +08:00
6db387a21e
Refactor session close as xorm already does everything needed internally ( #2020 )
2017-06-21 08:57:05 +08:00
165cf33771
Wrong PR merge commit ID saved ( #2007 )
2017-06-19 17:37:11 +08:00
a977ab7889
Don't ignore error in getMergeCommit ( #1843 )
2017-05-31 19:51:24 -05:00
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
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
407fbfa6ce
fixes wrong after field in webhook payload
...
when merge pull request
2017-05-18 12:16:36 +07:00
0f3923c4d7
fix potential lock when sqlite ( #1647 )
2017-05-05 08:47:03 +08:00
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
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
22f7aa6e9c
LableIDs -> LabelIDs ( #1088 )
2017-03-01 09:08:45 +08:00
d4e38cf129
fix setMerged for remove unnecessary db connection ( #1067 )
2017-02-27 08:42:55 +08:00
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
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
081485ecfd
add milestone changed traker on issue view ( #804 )
2017-02-01 10:36:08 +08:00
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
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
03b45284e1
Merge pull request #555 from ethantkoenig/tests/pull
...
Unit tests for models/pull.go
2017-01-06 19:19:18 -02:00
84b7d29d34
Create missing database indexes ( #596 )
2017-01-06 23:14:33 +08:00
72bfabfada
Unit tests for models/pull.go
2017-01-06 10:08:23 -05:00
1207bda94b
Fix typos in models/ ( #576 )
2017-01-05 08:50:34 +08:00
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
Lauris BH
Lunny Xiao
Kazuki Sawada
Ethan Koenig
Bwko
Ethan Koenig
Diep Pham
Jonas Östanbäck
Mura Li
Gabriel Jackson
Thomas Boerger
Matthias Loibl
Andrey Nering
Alexander Lunegov
Richie B2B
Kim "BKC" Carlbäcker
Sandro Santilli
Thibault Meyer