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
52f3833811
Add Dingtalk webhook support ( #4773 )
...
* Add dingtalk webhook into html template
* Add Dingtalk's icon
* Insert dingtalk into repo's webhook page template
* Insert dingtalk into org's webhook page
* Add dingtalk into default webhook config
* Add locale string for add_dingtalk_hook_desc
* Update bindata
* Add dingtalk webhook form validator
* Add dingtalk hook task
* Add dingtalk hook create handler
* Add dingtalk hook edit handler
* Add dingtalk router
* Add dingtalk webhook task skeleton
* Add markdown link formatter
* Add Dingtalk ActionCard create wrapper
* Add support for dingtalk create event payload
* Add support for dingtalk delete event payload
* Add support for dingtalk fork event payload
* Add support for dingtalk push event payload
* Add support for dingtalk issue event payload
* Add support for dingtalk issue comment payload
* Add support for dingtalk pull event payload
* Add support for dingtalk release event payload
2017-09-21 14:32:48 -04:00
a1d411a018
ldap: minor fix for PR #4398
2017-05-29 23:18:34 -04:00
dbb7e5464b
ldap: add check for group membership ( #4398 )
...
* Add standard LDAP group membership checking.
* Fix formatting, typo, grammer, and syntax errors
* Debugging done.
Gave up on locale file edits.
2017-05-29 22:33:50 -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
Unknwon
mharinder
Athurg Feng
aboron