mharinder
a3bd40fa51
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 ).
7 years ago
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
7 years ago
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.
8 years ago
Unknwon
643c85e9c8
routes/home: minor code improve
8 years ago
Unknwon
dc10594d7b
repo: fix cannot fork repository ( #4572 )
...
Should not load attributes if repository not found in HasForkedRepo.
8 years ago
Unknwon
e02fac4968
repo: fix panic on pull request submit ( #4572 )
8 years ago
Unknwon
f67d6bbca3
repo/diff: fix line number in split view template ( #4584 )
8 years ago
Unknwon
c970c4ee41
css: not include line numbers in diff selection ( #4584 )
...
Changed template file in order to make CSS work properly.
8 years ago
Unknwon
8ed2330d6e
issue_comment: fix pg syntax ambiguous ( #4586 )
...
Also handle error related to time parsing.
8 years ago
Unknwon
d1a96c2543
cmd/restore: skip non existent directories in backup archive ( #4413 )
8 years ago
Unknwon
11b1498a6e
api/repo: load attributes when listing user repositories ( #4565 )
8 years ago
Unknwon
e16196124e
setting: disable SSH minimum key size check when not eligible ( #4507 )
8 years ago
Unknwon
ab2197bc75
random: some code simplify
8 years ago
Unknwon
a887e475e3
repo: change action visibility when repository visibility changed ( #4414 )
8 years ago
Unknwon
4400d2fdd9
Refactoring: rename package routers -> routes
8 years ago
Unknwon
91f65cedc8
repo/view: trim Windows line ending when display content ( #4546 )
8 years ago
Unknwon
09f2cbfb18
api/repo: response full API format for search results ( #4522 )
8 years ago
Unknwon
b40dc550ed
vendor: update github.com/go-xorm/* ( #4419 )
8 years ago
Unknwon
c210984b40
repo: improve relative path detection ( #4366 )
8 years ago
Unknwon
455dc072ba
repo: use BranchLink instead of TreeLink ( #4366 )
8 years ago
Unknwon
a851b77ac9
markup: able to display image from IPython notebook ( #4366 )
8 years ago
Unknwon
c0be055541
api/repo: fix admin migrate repo for non-org users ( #4479 )
8 years ago
Unknwon
36d6450977
repo/pull: detect case when no merge base found ( #4434 )
8 years ago
Unknwon
f4d61ac6d2
templates: fix version
8 years ago
Unknwon
239dd978ff
repo: support go get subpkg ( #1878 )
8 years ago
Unknwon
16913ba814
css: start using fixing width container
...
Get rid of responsive issue.
Also fixes #4527 .
8 years ago
Unknwon
6bb9c442b2
issue: fix updated_unix is not updated for new comments ( #4462 )
8 years ago
Simon Dann
bf060387af
ui: fix emoji not rendered in commits table ( #4440 )
8 years ago
Unknwon
a1d411a018
ldap: minor fix for PR #4398
8 years ago
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.
8 years ago
Unknwon
4e87e62d5c
models/repo_collaboration: cannot change permissions of collaborators ( #4512 )
8 years ago
Unknwon
b17995a332
restore: reset table sequences for PostgreSQL ( #4357 )
8 years ago
Unknwon
d71a8fece8
feature/org-mode: fix compile error
8 years ago
Unknwon
6500aafcb8
install: validate port in SMTP host address ( #2243 )
8 years ago
Unknwon
6ebdf91b32
templates/repo: fix README.ipynb not rendered ( #4367 )
8 years ago
Unknwon
91cd350b63
repo/editor: fix wrong context for subdirectory ( #4368 )
8 years ago
Unknwon
62a20b8a2d
repo/wiki: improve UI
8 years ago
Unknwon
d0612be402
user/setting: improve UI
8 years ago
Unknwon
5f8ec0dc8b
templates/repo: improve symlink file icon in list view ( #4237 )
8 years ago
Unknwon
fda4b1106e
user/setting: simplify code
8 years ago
Unknwon
ac43eab51f
Refactoring: rename Signed -> Logged
8 years ago
Unknwon
8d0417497b
modes/mirror: make Updated unchanged if no new commits fetched ( #4341 )
...
After sync mirror, get latest commit date and compare to current
repository updated time, only update it if the commit date is newer.
8 years ago
Unknwon
90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}
8 years ago
Unknwon
2c404daca6
pkg/context: rename {CsrfToken, CsrfTokenHtml} -> {CSRFToken, CSRFTokenHTML}
8 years ago
Unknwon
0e271799f2
Refactoring: rename and simplify pkg/tool functions
8 years ago
Unknwon
bd1f2ccaf8
user/settings/security: add token description about 2FA
8 years ago
Unknwon
a617d52374
2fa: initial support ( #945 )
8 years ago
Unknwon
624474386a
templates/repo/branches: fix links for mirror repository
...
Also added new pull request button for stale branches.
8 years ago
Unknwon
e0a787b5ee
Update locales
8 years ago
Unknwon
6fbb984ebf
Refactoring: rename pkg/base -> pkg/tool
8 years ago