53c8e4263b
models: skip JSON for fields skipped by XORM
...
Reduce output JSON size by backup command
2018-06-09 16:06:47 +08:00
aff4208244
*: rename "gogits" to "gogs"
2018-05-27 08:53:48 +08:00
8b66c433c5
models/pull: fix error on merge pull requests to non-default branch ( #5138 )
2018-04-09 07:26:38 -04:00
75555585e8
models/pull: fix rebase merging no effect ( #5051 )
2018-03-21 19:11:36 -04:00
dd245fe8bd
pull_request: fix changes not pushed to upstream if between two repositories ( #4890 )
2017-11-22 14:12:52 -05:00
43d6ad5fda
pull: fix after commit ID is not latest commit in the base branch ( #4442 )
2017-11-18 00:38:06 -05:00
3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict ( #4834 )
2017-11-16 22:22:38 -05:00
34c2e52bd5
repo/pull: allow rebase before merging ( #4805 )
2017-11-15 23:28:31 -05:00
5cd1fdeb9e
pull: add an option to use rebase for merging pull requests
...
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 ).
2017-11-15 23:28:23 -05:00
0e6a6bf880
Refactoring: remove sessionRelease()
...
XORM supports automatic roll back in session Close() already.
2017-06-11 03:06:36 -04:00
ce6e8ed8fe
models: remove redundant tags for primary keys
2017-05-21 04:36:41 -04:00
90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}
2017-04-06 17:27:57 -04:00
d05395fe90
Refactoring: rename modules -> pkg
...
Reasons to change:
1. Shorter than 'modules'
2. More generally used by other Go projects
3. Corresponds to the naming of '$GOPATH/pkg' directory
2017-04-04 19:29:59 -04:00
8f52ab8201
models/repo_editor: add pull request test task after commit ( #4338 )
2017-03-25 03:36:13 -04:00
beee6e03b1
error: move ErrRepoNotExist -> errors.RepoNotExist
2017-03-23 14:27:34 -04:00
cac7af2c78
explore: able list and search for private but accessible repositories ( #3088 )
2017-03-17 19:17:40 -04:00
9e8ffa14cb
webhook: add file status to push event ( #3897 )
2017-03-16 17:33:04 -04:00
0ccd7c97ab
models: rename ErrUserNotExist -> errors.UserNotExist
2017-03-16 17:18:43 -04:00
c3cde864f8
models/pull: treat all errors as conflict ( #4265 )
...
If there is a misdetection, log shows everything.
2017-03-09 13:36:40 -05:00
f860ddbbb7
models/pull: better error message detection ( #4265 )
...
Stop using English phrases in case of Git localization.
2017-03-09 13:04:41 -05:00
89cc6aa430
webhook: add issue comment event
2017-03-09 04:11:23 -05:00
c93731339f
webhook: support Issues event ( #2319 )
...
Also addresses #3485 .
2017-03-09 00:03:29 -05:00
f5dc436441
Minor improve on error handling
2017-02-10 00:11:51 -05:00
eb66060cd7
log: start using gopkg.in/clog.v1
2017-02-09 19:29:59 -05:00
418dab9b96
models/pull: load attributes when fetch list of pull requests ( #4089 )
...
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.
2017-02-09 15:45:35 -05:00
d04b19545d
Code fix for PR #3547
2016-12-22 01:28:06 -05:00
3b0e2c1c3f
PR Webhook - Add base/head info ( #3547 )
...
* messing with getting local go-gogs-client
* coding style fix
* added comments for required fields
2016-12-22 01:01:15 -05:00
7358e46815
Fix string format verbs ( #3637 )
2016-12-21 02:09:43 -05: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 0afcb843d77ecd73ff55c29b9ab53123af384c53cfb8a975917fc8a89991ce427fc8a89cb4fd3d86cc03d040fd3d86ca6bc03d0401c198e1206ccfc2895dc7426aa7e46b21889e9faad7ea88889e9faf1b47603edf22bb57912cf85e9ebb57912558d10d128c5134a3498202fa1b7521c7dcddfa1b752be2
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
Unknwon
mharinder
Kurt Madel
Alexander Lunegov
Richard Mahn
lstahlman