Commit Graph

56 Commits (925c2a2ca2a00141ad62d06e27a656ab4a204fe2)

Author SHA1 Message Date
Unknwon 3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict (#4834) 2017-11-16 22:22:38 -05:00
Unknwon 6f04ee879c
auth/ldap: allow placeholder %s for BindDN (#2526) 2017-11-16 19:32:33 -05:00
Unknwon e1e76d3f88
admin/config: add UI for [http] section (#3987) 2017-11-16 19:03:46 -05:00
Unknwon 86931f546f
repo: fix go-get meta tags (#4832)
The first part in go-import should be the root import path. It
included subpath when 'go get' with a subpath and was not correct.
2017-11-16 18:43:03 -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 9b4054f1fc
locale: sync from Crowdin 2017-11-05 23:59:12 -05:00
Unknwon c1507eda45
locale: sync from Crowdin 2017-10-14 04:19:24 -04:00
Unknwon 1b24e6ed76
locale: sync from Crowdin 2017-09-25 20:29:10 -04:00
Athurg Feng 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
Unknwon b1100b5e34
locale: sync from Crowdin 2017-08-15 18:20:28 -04:00
Unknwon f2c3f4a944
locale: sync from Crowdin 2017-07-30 02:45:13 -04:00
Unknwon 6bc11c4450
hook: fix email not sent after push (#4430)
Turns out mail service was not initialized at all, also mail must
be sent in sync in hook mode before program exits.
2017-07-27 16:53:02 -04:00
Unknwon b18a2bdcd3
locale: sync from Crowdin 2017-07-14 16:48:41 -04:00
Unknwon d09eaef542
locale: sync from Crowdin 2017-07-09 21:38:11 -04:00
Unknwon ea03bee1b9
locale: sync from Crowdin 2017-06-27 14:45:10 -04:00
Unknwon f59500a90b
locale: sync from Crowdin 2017-06-20 00:10:10 -04:00
Unknwon 23b83cb736
pkg/process: fix potential race condition
Following conditions were not protected:
1. Use and increase next pid
2. Append and remove process from the list
2017-06-11 02:28:08 -04:00
Unknwon e16196124e
setting: disable SSH minimum key size check when not eligible (#4507) 2017-06-11 02:06:26 -04:00
Unknwon 6197a7639a
locale: sync from Crowdin 2017-06-10 01:43:18 -04:00
Unknwon 88791089ed
locale: sync from Crowdin 2017-06-08 14:11:25 -04:00
无闻 51d7f1264b api: GitHub compliance (#4549)
* Add undocumented endpoint for /repositories/:id

* GitHub API Compliance
2017-06-05 15:34:11 -04:00
Unknwon 36d6450977
repo/pull: detect case when no merge base found (#4434) 2017-06-05 00:10:53 -04:00
Unknwon 02a576a6a0
locale: update translations 2017-06-04 14:55:55 -04:00
Unknwon 2478b87432
Refactoring: rename ctx -> c 2017-06-03 07:26:09 -04:00
Unknwon e33c714073
repo: always response go-get meta when requested (#1878) 2017-06-03 06:54:06 -04:00
Unknwon 5c10eff67f
bindata: regenerate 2017-06-03 06:51:16 -04:00
Unknwon 239dd978ff
repo: support go get subpkg (#1878) 2017-06-03 06:50:09 -04:00
Peter Mescalchin 21c1b8d834 conf: rename attachment toggle from ENABLE to ENABLED (#4474) 2017-06-03 03:02:55 -04:00
Unknwon c407921644
orgmode: recover panic from third-party package 2017-06-02 17:19:06 -04:00
Unknwon 4cb01fe332
locale: add Hungarian 2017-06-01 23:41:58 -04:00
Unknwon a1d411a018
ldap: minor fix for PR #4398 2017-05-29 23:18:34 -04:00
aboron 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
Unknwon a5bd095c30
locale: add en-GB 2017-05-25 12:53:28 -04:00
Unknwon ce6e8ed8fe
models: remove redundant tags for primary keys 2017-05-21 04:36:41 -04:00
spacetourist 0a6ceabb9b Allow configurable HTTPS SSL/TLS version(#4451) 2017-05-20 08:31:25 -04:00
Unknwon d71a8fece8
feature/org-mode: fix compile error 2017-05-17 18:50:14 -04:00
Unknwon 1b5a418fd3
modules/markup: initial support for org-mode (#4373) 2017-05-17 18:46:23 -04:00
Unknwon a11044f789
locale: sync from Crowdin 2017-05-17 18:37:25 -04:00
Unknwon 6500aafcb8
install: validate port in SMTP host address (#2243) 2017-04-07 23:23:39 -04:00
Unknwon 6ebdf91b32
templates/repo: fix README.ipynb not rendered (#4367) 2017-04-07 22:33:19 -04:00
Unknwon 91cd350b63
repo/editor: fix wrong context for subdirectory (#4368) 2017-04-07 21:44:55 -04:00
Unknwon 809db853fa
locale: fix zh-CN 2017-04-07 15:41:54 -04:00
Unknwon d0612be402
user/setting: improve UI 2017-04-07 15:08:53 -04:00
Unknwon fda4b1106e
user/setting: simplify code 2017-04-07 00:49:30 -04:00
Unknwon ac43eab51f
Refactoring: rename Signed -> Logged 2017-04-06 23:48:49 -04:00
Unknwon 90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL} 2017-04-06 17:27:57 -04:00
Unknwon 2c404daca6
pkg/context: rename {CsrfToken, CsrfTokenHtml} -> {CSRFToken, CSRFTokenHTML} 2017-04-06 17:20:38 -04:00
Unknwon 0e271799f2
Refactoring: rename and simplify pkg/tool functions 2017-04-06 17:13:53 -04:00
Unknwon bd1f2ccaf8
user/settings/security: add token description about 2FA 2017-04-06 16:27:31 -04:00