8 Commits

Author SHA1 Message Date
Unknwon
775919c129
mirror: show sync feeds on dashboard (#2017) 2018-05-30 21:26:03 +08:00
Unknwon
aff4208244
*: rename "gogits" to "gogs" 2018-05-27 08:53:48 +08:00
Unknwon
1f7983059a
models: move ErrBranchNotExist to errors package 2018-03-08 07:15:55 -05:00
Unknwon
3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict (#4834) 2017-11-16 22:22:38 -05:00
Unknwon
34c2e52bd5
repo/pull: allow rebase before merging (#4805) 2017-11-15 23:28:31 -05:00
mharinder
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
Unknwon
ab2197bc75
random: some code simplify 2017-06-11 00:56:31 -04:00
Unknwon
4400d2fdd9
Refactoring: rename package routers -> routes 2017-06-11 00:34:14 -04:00