GitCaddy/GitCaddy Server
Limited
2
0
Fork 0
Code Issues Releases 5
5,880 Commits 20 Branches 5 Tags
6cf33b4e8d4263da84431b5842e5a5bee4eb1821
Commit Graph

105 Commits

Author SHA1 Message Date
Kazuki Sawada
a248195375 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
8207f53524 Replace deprecated Id method with ID (#2655) 2017-10-05 07:43:04 +03:00
Lunny Xiao
c933ad6774 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
2769426b8c 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
5ea3b20317 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
7a7e7eae46 Fix SQL bug in models.PullRequests 2017-07-01 14:08:43 +03:00
Bwko
cc9c92913d Fix exit status 1 not handled @ getMergeCommit 2017-06-30 12:35:26 +02:00
Ethan Koenig
ff54773f94 Fix fast-forward PR bug (#1989) 2017-06-22 09:06:57 +08:00
Lauris BH
ea224aa996 Refactor session close as xorm already does everything needed internally (#2020) 2017-06-21 08:57:05 +08:00
Lauris BH
80bd7081ef Wrong PR merge commit ID saved (#2007) 2017-06-19 17:37:11 +08:00
Ethan Koenig
558259bcdc Don't ignore error in getMergeCommit (#1843) 2017-05-31 19:51:24 -05:00
Ethan Koenig
91b8ad44ac 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
4939f10d9f 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
2bdd9a4df2 fixes wrong after field in webhook payload 
when merge pull request
 2017-05-18 12:16:36 +07:00
Lunny Xiao
ce3e4c1f25 fix potential lock when sqlite (#1647) 2017-05-05 08:47:03 +08:00
Jonas Östanbäck
47c244f164 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
765f990c9b 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
d8857d0b22 LableIDs -> LabelIDs (#1088) 2017-03-01 09:08:45 +08:00
Lunny Xiao
aaa300f0d7 fix setMerged for remove unnecessary db connection (#1067) 2017-02-27 08:42:55 +08:00
Bwko
d32bb47b09 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
e8c47d9765 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
daf375540f add milestone changed traker on issue view (#804) 2017-02-01 10:36:08 +08:00
Thomas Boerger
5662fe4edf 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
2a2abca584 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
fd8165bbc4 Merge pull request #555 from ethantkoenig/tests/pull 
Unit tests for models/pull.go
 2017-01-06 19:19:18 -02:00
Andrey Nering
df3a195814 Create missing database indexes (#596) 2017-01-06 23:14:33 +08:00
Ethan Koenig
85b408be4b Unit tests for models/pull.go 2017-01-06 10:08:23 -05:00
Ethan Koenig
439ab34752 Fix typos in models/ (#576) 2017-01-05 08:50:34 +08:00
typeless
4d0b4eae26 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
918088c375 update code.gitea.io/git (#450) 2016-12-22 10:30:52 +01:00
Alexander Lunegov
6fb99b97ab Fix string format verbs (#3637) 2016-12-22 08:18:41 +01:00
Richie B2B
5139a6e539 Remove fixed FIXME (#408) 2016-12-16 17:00:30 +01:00
Bwko
d52818749f 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
a0c1e6540b 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
3145460e00 Fix regression in PR-API #248 (#349) 
* Fix #344 (regression in PR-API #248)
 2016-12-05 12:17:39 +01:00
Bwko
791cf430a4 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
2947e7b332 [API] Pull Requests (#248) 2016-12-02 12:10:39 +01:00
Bwko
e5314f667c Catch os... errors 2016-12-02 07:41:19 +01:00
Lunny Xiao
555edec9f1 typo 2016-12-01 09:05:32 +08:00
Kim "BKC" Carlbäcker
ea3af7405b Fix breakage from vendor-update 2016-11-29 11:50:22 +01:00
Lunny Xiao
3804c4525d golint fixed for models/pull.go (#292) 2016-11-28 23:31:06 +08:00
Lunny Xiao
c9d61f0e2a 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
bcbd7c0b86 Lint action.go 2016-11-24 09:03:29 +01:00
Thibault Meyer
43e3c1d1cc Normalize files with gofmt 2016-11-11 13:11:45 +01:00
Sandro Santilli
d246d7acb7 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
0971249a03 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
50df9768f3 Rewrite XORM queries 2016-11-10 20:59:51 +01:00
Sandro Santilli
acb138c244 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
f368ff5d88 Use MixedCase constant names 
See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps
 2016-11-07 17:05:08 +01:00
Thomas Boerger
0407d5f9cb 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