aboutsummaryrefslogtreecommitdiff
path: root/models/pull.go
Commit message (Collapse)AuthorAge
* models: rename Id to IDUnknwon2018-08-16
|
* public: minor fix for PR #5276Unknwon2018-06-26
|
* pull request: able to add custom commit description (#5276)ususdei2018-06-26
| | | | | | | | | | * pull request merges now allow for custom commit messages * allow i18n on commit_message label * place label above textarea for commit message * rename commit message for pull requests into commit description and pass to git separately
* models: skip JSON for fields skipped by XORMUnknwon2018-06-09
| | | | Reduce output JSON size by backup command
* *: rename "gogits" to "gogs"Unknwon2018-05-27
|
* models/pull: fix error on merge pull requests to non-default branch (#5138)Unknwon2018-04-09
|
* models/pull: fix rebase merging no effect (#5051)Unknwon2018-03-21
|
* pull_request: fix changes not pushed to upstream if between two repositories ↵Unknwon2017-11-22
| | | | (#4890)
* pull: fix after commit ID is not latest commit in the base branch (#4442)Unknwon2017-11-18
|
* pull_request: able to ignore whitespace when check conflict (#4834)Unknwon2017-11-16
|
* repo/pull: allow rebase before merging (#4805)Unknwon2017-11-15
|
* pull: add an option to use rebase for merging pull requestsmharinder2017-11-15
| | | | | | | | | | | | | | | | For DVCS, either merge or rebase works for getting new code in a pull request in the main branch. The rebase workflow produces a linear history which is cleaner, and more bisect-able. This commit adds a repo-level option to enable the rebase workflow. Once enabled, "Merge Pull Request" will be replaced by "Rebase and Merge Pull Request" which does exactly what the user wants. It's unlikely a project wants a mixed-use of both rebase and merge workflows, therefore the feature is not implemented as a drop-down button like what GitHub does (https://github.com/blog/2243-rebase-and-merge-pull-requests).
* Refactoring: remove sessionRelease()Unknwon2017-06-11
| | | | XORM supports automatic roll back in session Close() already.
* models: remove redundant tags for primary keysUnknwon2017-05-21
|
* pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}Unknwon2017-04-06
|
* Refactoring: rename modules -> pkgUnknwon2017-04-04
| | | | | | | | Reasons to change: 1. Shorter than 'modules' 2. More generally used by other Go projects 3. Corresponds to the naming of '$GOPATH/pkg' directory
* models/repo_editor: add pull request test task after commit (#4338)Unknwon2017-03-25
|
* error: move ErrRepoNotExist -> errors.RepoNotExistUnknwon2017-03-23
|
* explore: able list and search for private but accessible repositories (#3088)Unknwon2017-03-17
|
* webhook: add file status to push event (#3897)Unknwon2017-03-16
|
* models: rename ErrUserNotExist -> errors.UserNotExistUnknwon2017-03-16
|
* models/pull: treat all errors as conflict (#4265)Unknwon2017-03-09
| | | | If there is a misdetection, log shows everything.
* models/pull: better error message detection (#4265)Unknwon2017-03-09
| | | | Stop using English phrases in case of Git localization.
* webhook: add issue comment eventUnknwon2017-03-09
|
* webhook: support Issues event (#2319)Unknwon2017-03-09
| | | | Also addresses #3485.
* Minor improve on error handlingUnknwon2017-02-10
|
* log: start using gopkg.in/clog.v1Unknwon2017-02-09
|
* models/pull: load attributes when fetch list of pull requests (#4089)Unknwon2017-02-09
| | | | | | Code only fetched issues corresponding to the pull requests, and left out necessary base/head repository objects, which is required later to generate API format.
* Code fix for PR #3547Unknwon2016-12-22
|
* PR Webhook - Add base/head info (#3547)Kurt Madel2016-12-22
| | | | | | | | * messing with getting local go-gogs-client * coding style fix * added comments for required fields
* Fix string format verbs (#3637)Alexander Lunegov2016-12-21
|
* modules/sync: add UniqueQueueUnknwon2016-08-30
|
* Web editor: support upload filesUnknwon2016-08-30
|
* General code quality improvementUnknwon2016-08-16
|
* #2246 add HTMLURL to webhook typeUnknwon2016-08-16
| | | | - Fill Milestone and Assignee field when available in webhook payload
* models/repo_editor: improve code qualityUnknwon2016-08-15
|
* models/issue: improve quality and performance of NewIssue functionUnknwon2016-08-15
|
* Web editor: improve edit file and diff previewUnknwon2016-08-14
|
* Squashed commit of the following:Richard Mahn2016-08-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 991ce42 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:42:53 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit 7fc8a89cb495478225b02d613e647f99a1489634 Merge: fd3d86c c03d040 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:40:00 2016 -0600 Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:39:44 2016 -0600 Code cleanup commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 29 15:38:23 2016 -0600 Code cleanup commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:36:01 2016 -0600 Code cleanup and fixes commit c2895dc742f25f8412879c9fa15e18f27f42f194 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:24:04 2016 -0600 Fixes per Unknwon's requests commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef Merge: 889e9fa ad7ea88 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 17:13:43 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go modules/setting/setting.go commit 889e9faf1bd8559a4979c8f46005d488c1a234d4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:09:18 2016 -0600 Fix in gogs.js commit 47603edf223f147b114be65f3bd27bc1e88827a5 Merge: bb57912 cf85e9e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:07:36 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit bb5791255867a71c11a77b639db050ad09c597a4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:02:18 2016 -0600 Update for using CodeMirror mode addon commit d10d128c51039be19e2af9c66c63db66a9f2ec6d Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 16:12:57 2016 -0600 Update for Edit commit 34a34982025144e3225e389f7849eb6273c1d576 Merge: fa1b752 1c7dcdd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 11:52:02 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go commit fa1b752be29cd455c5184ddac2ffe80b3489763e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 15 18:35:42 2016 -0600 Feature for editing, creating, uploading and deleting files
* Replace convert.To with APIFormat callsUnknwon2016-08-14
|
* #2246 fully support of webhooks for pull requestUnknwon2016-08-14
|
* Add test pull request task on merging a PR. Fixes #3396 (#3425)lstahlman2016-08-10
|
* #3393 fix missing sub-url prefix in relative avatar linkUnknwon2016-08-07
|
* Refactor User.Id to User.IDUnknwon2016-07-24
|
* Remove redundant Unix timestamp method callUnknwon2016-07-23
| | | | Unix() already uses UTC as timezone
* #2854 fix no mail notification when issue is closed/reopenedUnknwon2016-07-16
|
* models/repo: remove redundant info for some repo methodsUnknwon2016-07-15
| | | | RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink
* #2302 Replace time.Time with Unix Timestamp (int64)Unknwon2016-03-09
|
* Update localesUnknwon2016-03-04
|
* #1597 fix pull request remote head can't update with force pushUnknwon2016-03-04
|
Powered by cgit, Themed by Ted Yin.