Unknwon
3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict ( #4834 )
7 years ago
Unknwon
34c2e52bd5
repo/pull: allow rebase before merging ( #4805 )
7 years ago
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 ).
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
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
8 years ago
Unknwon
8196430f47
repo: allow private repository to have public wiki or issues
...
Relates to #649 and #2157
8 years ago
Unknwon
1df54ea0cd
release: able to add attchments to release ( #1614 )
...
Added new config section '[release.attachment]’.
8 years ago
Unknwon
b615d670b3
webhook: add Release event ( #2387 )
8 years ago
Unknwon
89cc6aa430
webhook: add issue comment event
8 years ago
Unknwon
c93731339f
webhook: support Issues event ( #2319 )
...
Also addresses #3485 .
8 years ago
Unknwon
b06f299748
webhook: add fork event
8 years ago
Unknwon
f0086e66ae
webhook: able to detect delete branch or tag ( #2315 )
8 years ago
Unknwon
429345b9df
editor: fix cannot create branch with slashes ( #3568 )
8 years ago
Unknwon
4f9c5981a9
refactoring: modules/auth/*_form.go -> modules/form
8 years ago
Unknwon
6072e9a52c
repo: add protect branch whitelist ( #4177 )
...
Add options to add users and teams to whitelist of a protected
branch. This is only available for organizational repositories.
8 years ago
Unknwon
8216360da8
webhook: support color for Discord
8 years ago
Unknwon
5895d43574
editor: redirect to new pull request page after create new branch
8 years ago
Unknwon
a07b1f630a
webhook: add native Discord support
8 years ago
Unknwon
7e09d210ba
Initial version of protected branches ( #776 )
...
- Able to restrict force push and deletion
- Able to restrict direct push
8 years ago
Rémy Boulanouar
be3a13a0d6
Allow use to set an external tracker url and to redirect user when clicking in Issues same behavior as Wiki. ( #3646 )
8 years ago
leonklingele
ad6de46ce4
Fix typo: 'passowrd' -> 'password' ( #3951 )
8 years ago
Unknwon
643142acab
Web editor: support upload files
8 years ago
Unknwon
28cf0e6aaa
#3459 code quality improvement
8 years ago
Thibault Meyer
92fb30c526
Load a set of predefined labels ( #3459 )
...
* Can use a predefined set of labels
* Change UI
* Fix HTML file indentation
* Avoid reading file from other directory (security issue)
* Apply a better fix
* Remove not used variable
* Merge upstream/develop
* Do modifications
* Raname
* remove binding + rename variable
8 years ago
Unknwon
0114fdcba4
Web editor: improve delete file process
8 years ago
Unknwon
f8a48ffaad
Web editor: improve code quality
8 years ago
Unknwon
4042d1f0c3
models/issue: improve quality and performance of NewIssue function
8 years ago
Richard Mahn
d0a0239bac
Squashed commit of the following:
...
commit 0afcb843d7
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 17:13:29 2016 -0600
Removed Upload stats as the upload table is just a temporary table
commit 7ecd73ff55
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 08:42:41 2016 -0600
Fix for CodeMirror mode
commit c29b9ab531
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 08:03:33 2016 -0600
Made tabbing in editor use spaces
commit 23af384c53
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 07:56:46 2016 -0600
Fix for data-url
commit cfb8a97591
Merge: 7fc8a89
991ce42
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 07:42:53 2016 -0600
Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file
Conflicts:
modules/bindata/bindata.go
public/js/gogs.js
commit 7fc8a89cb4
Merge: fd3d86c
c03d040
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 07:40:00 2016 -0600
Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file
commit fd3d86ca6b
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 07:39:44 2016 -0600
Code cleanup
commit c03d0401c1
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Fri Jul 29 15:38:23 2016 -0600
Code cleanup
commit 98e1206ccf
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Thu Jul 28 18:36:01 2016 -0600
Code cleanup and fixes
commit c2895dc742
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Thu Jul 28 18:24:04 2016 -0600
Fixes per Unknwon's requests
commit 6aa7e46b21
Merge: 889e9fa
ad7ea88
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Thu Jul 28 17:13:43 2016 -0600
Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file
Conflicts:
modules/bindata/bindata.go
modules/setting/setting.go
commit 889e9faf1b
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Fri Jul 22 14:09:18 2016 -0600
Fix in gogs.js
commit 47603edf22
Merge: bb57912
cf85e9e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Fri Jul 22 14:07:36 2016 -0600
Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file
Conflicts:
modules/bindata/bindata.go
public/js/gogs.js
commit bb57912558
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Fri Jul 22 14:02:18 2016 -0600
Update for using CodeMirror mode addon
commit d10d128c51
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Tue Jul 19 16:12:57 2016 -0600
Update for Edit
commit 34a3498202
Merge: fa1b752
1c7dcdd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Tue Jul 19 11:52:02 2016 -0600
Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file
Conflicts:
modules/bindata/bindata.go
commit fa1b752be2
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Fri Jul 15 18:35:42 2016 -0600
Feature for editing, creating, uploading and deleting files
8 years ago
Unknwon
3f7f4852ef
#2246 fully support of webhooks for pull request
8 years ago
Unknwon
e3d3d424b2
Minor fix for go vet
8 years ago
Pablo Saavedra
98b152030d
The pruning for the synchronized mirrors is a option now. Default value: enable_prune = true ( #3246 )
...
Executed go fmt
getEngine() not handles DB parameters (#2972 ) (#2974 )
Uses .AllCols() for Update in updateMirror()
Spanish traslation removed
Fixed a wrong way to ommit the --prune option in process.ExecDir() for MirrorUpdate function
8 years ago
Cosmin Stroe
ba314a7a36
Support alphanumeric issue style (ABC-1234) for external issue tracker ( #2992 )
9 years ago
Unknwon
926e75d721
#2334 strip whitespace for migrate URL
...
Also fix a possible race condition while install
9 years ago
Martin Hartkorn
15d37b7a95
Refactored according to suggestions
9 years ago
Martin Hartkorn
3650bd8528
Convert mirrors to regular repositories.
9 years ago
Florian Kaiser
abc5abce30
Allow modification of a release if Content is empty ( fix #2516 )
9 years ago
Unknwon
40f3142264
#2114 External URL for wiki
9 years ago
Unknwon
b8d48bdb62
#2037 Add "New Mirror" button on Dashboard
9 years ago
Unknwon
120cd4e471
#1984 Better mirror repo management
9 years ago
Unknwon
e538ff2770
fix #1829 and fix #890
9 years ago
Unknwon
e42fcb033d
wiki: finish edit
9 years ago
Unknwon
392f3ee210
wiki: finish new
9 years ago
Unknwon
c50a3503e6
introduce git-shell
9 years ago
Unknwon
18de67380c
fix #1958
9 years ago
Unknwon
6f0a41b8b2
#1511 Allow local import only for admin users
9 years ago
Nathan Zadoks
f1aa4c0524
Fix the JSON field names for MigrateRepoForm
...
For some reason, the field names for Private and Mirror got swapped.
9 years ago
Unknwon
932dbccb67
fix import path, fix #1782
9 years ago
Unknwon
38eb000d13
work on #1570
9 years ago
Unknwon
7ec991326d
fix migrate api
9 years ago
Unknwon
e5b105e513
fix migrate API
9 years ago