Lauris BH
8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge ( #3188 )
...
* Pull request options migration and UI in settings
* Add ignore whitespace functionality
* Fix settings if pull requests are disabled
* Fix migration transaction
* Merge with Rebase functionality
* UI changes and related functionality for pull request merging button
* Implement squash functionality
* Fix rebase merging
* Fix pull request merge tests
* Add squash and rebase tests
* Fix API method to reuse default message functions
* Some refactoring and small fixes
* Remove more hardcoded values from tests
* Remove unneeded check from API method
* Fix variable name and comment typo
* Fix reset commit count after PR merge
2018-01-05 20:56:50 +02:00
Sandro Santilli
a192f3052e
Serve pull request .diff files ( #3293 )
...
* Serve pull request .diff files
Closes #3259
* Add test for pull request redirection and .diff access
* Typo
* There's no need to test for pr.BaseRepo being nil after calling GetBaseRepo
2018-01-05 12:56:52 +02:00
Ethan Koenig
515cdaa85d
Fix ignored errors when checking if organization, team member ( #3177 )
2017-12-21 09:43:26 +02:00
harry
03ec35ed79
Mention completion for issue editor. ( #3136 )
...
* new issue mention
* Mention completion on new issue and view issue page.
* Code format.
* Require tribute in pull request page.
2017-12-11 14:03:04 +08:00
Lauris BH
0d4c63fd70
Fix go-get, src and raw urls to new scheme ( #2978 )
2017-11-27 02:58:54 +02:00
Ethan Koenig
40c545ddbc
Fix files/commits of merged PRs ( #2937 )
2017-11-25 21:47:19 +08:00
Lunny Xiao
cdc4600725
Fix fork repository cycle to self ( #2860 )
...
* fix fork repository cycle to self
* rename testForkRepo to traverseParentRepo
2017-11-06 12:12:55 +08:00
Lauris BH
1ec4dc6c1d
Fix so that user can still fork his own repository to owned organizations ( #2699 )
...
* Fix so that user can still fork his own repository to his organizations
* Fix to only use owned organizations
* Add integration test for forking own repository to owned organization
2017-10-15 18:06:07 +03:00
Kazuki Sawada
e1266a19c8
Change pull description text ( #2075 ) ( #2646 )
...
* Change pull description text
* move duplicated code into helper function
2017-10-04 20:35:01 +03:00
Lunny Xiao
1739e84ac0
improve protected branch to add whitelist support ( #2451 )
...
* improve protected branch to add whitelist support
* fix lint
* fix style check
* fix tests
* fix description on UI and import
* fix test
* bug fixed
* fix tests and languages
* move isSliceInt64Eq to util pkg; improve function names & typo
2017-09-14 16:16:22 +08:00
Ethan Koenig
b689bb6180
Webhooks for repo creation/deletion ( #1663 )
...
* Webhooks for repo creation/deletion
* add createHookTask
* Add handles for GetSlackPayload and GetDiscordPayload
2017-09-03 11:20:24 +03:00
Bwko
8f171210b9
Revert "Add ability to fork your own repos ( #761 )" ( #2193 )
2017-07-26 15:17:38 +08:00
Kim "BKC" Carlbäcker
cc6b3f60c6
Fix displaying commits and files of PR created from now deleted fork ( #2023 )
...
Fix displaying commits and files of PR created from now deleted fork
2017-06-22 19:40:47 +02:00
Lauris BH
0a5dc640a1
Make branch deletion URL more like GitHub's, fixes #1397 ( #1994 )
...
* Make branch deletion URL more like GitHub's, fixes #1397
* Add PR branch deletion integration test
* Do not allow deleting protected branch
* Change http error code to 403 if user has no write rights to repository
* Add check to not panic if forked repository has alrady been deleted
2017-06-21 09:00:03 +08:00
Lauris Bukšis-Haberkorns
63504bf132
Fix displaying commits and files of PR created from now deleted forked repository
2017-06-21 01:25:38 +03:00
Lauris BH
79494047b0
Show commit status icon in commits table ( #1688 )
...
* Show commit status icon in commits table
* Add comments
* Fix icons
* Few more places where commit table is displayed
* Change integration test to use goquery for parsing html
* Add integration tests for commit table and status icons
* Fix status to return lates status correctly on all databases
* Rewrote lates commit status selects
2017-05-07 22:40:31 +08:00
Lunny Xiao
d2165a5890
fix compare button failed when there is no fork repos ( #1104 )
2017-03-03 16:53:59 +08:00
Andrey Nering
27d30f1a61
Notifying on open PR, and Close/Reopen/Merge issue or PR
2017-01-28 13:59:58 -02:00
Bwko
e08421017c
Add ability to fork your own repos ( #761 )
2017-01-26 22:44:37 +08:00
Manuel Kuhlmann
dc3ff9f2ab
Rename .gogs to .gitea and comply with github template guidelines ( #568 ) ( #582 )
...
Signed-off-by: Manuel Kuhlmann <manuel@mkuhlmann.org>
2017-01-05 08:48:23 +08:00
Lunny Xiao
70900bd167
bug fixed for fork repos ( #560 )
2017-01-03 12:41:10 +08:00
Lunny Xiao
2343feadd4
resolved #310 : hide fork to self ( #323 )
2016-12-01 18:51:50 +08:00
Lunny Xiao
ec87a75c00
golint fixed for modules/auth
2016-11-27 21:39:06 +08:00
Lunny Xiao
94da472717
Golint fixed for modules/setting ( #262 )
...
* golint fixed for modules/setting
* typo fixed and renamed UNIXSOCKET to UnixSocket
2016-11-27 18:14:25 +08:00
Lunny Xiao
3917ed45de
golint fixed for routers ( #208 )
2016-11-24 15:04:31 +08:00
Andrey Nering
739f07c98e
Remember diff view style ( #163 )
2016-11-13 10:54:04 +08:00
Thibault Meyer
ddee4c8b58
Normalize files with gofmt
2016-11-11 13:11:45 +01:00
Sandro Santilli
4247304f5a
Update import paths from github.com/go-gitea to code.gitea.io ( #135 )
...
- Update import paths from github.com/go-gitea to code.gitea.io
- Fix import path for travis
See https://docs.travis-ci.com/user/languages/go#Go-Import-Path
2016-11-10 17:24:48 +01:00
Sandro Santilli
80eea77953
Use MixedCase constant names
...
See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps
2016-11-07 17:05:08 +01:00
Sandro Santilli
b7263f31a5
Replace GOGS with GITEA in variable names
...
Still use GOGS_WORK_DIR and GOGS_CUSTOM env variables
as a fallback if the equivalent GITEA_* are not set,
warning user about the need for change.
Does not change "gogs" to "gitea" in webhook type name
Because "gogs" hook type is part of the API (routes) and used
in templates...
Closes #87
2016-11-07 16:05:18 +01:00
Sandro Santilli
6e4252dad4
Replace gogits/git-module dependency with go-gitea/git ( #94 )
...
* Replace gogits/git-module dependency with go-gitea/git
Fixes #92
* Remove git alias for git module import (not needed)
2016-11-06 11:18:34 -02:00
Sandro Santilli
f36544f98d
Merge branch 'master' into feature/goimports
2016-11-05 22:54:20 +01:00
Andrey Nering
bd898a10f8
Refactor editorconfig middleware
2016-11-05 15:44:14 -02:00
Matthias Loibl
1f44b01e2a
Fix imports found by goimports.
2016-11-05 17:56:35 +01:00
Andrey Nering
984fa8d83b
Fix 500 when repo has invalid .editorconfig
...
Creating a notice instead
2016-11-05 13:33:41 -02:00
Andrey Nering
87b593f93e
Show issue/PR number on title
2016-11-03 20:28:05 -02:00
Rémy Boulanouar
2d68bd1ef9
Change import reference to match gitea instead of gogs ( #37 )
2016-11-03 10:29:56 -02:00
Unknwon
6f9a95f830
#2246 add HTMLURL to webhook type
...
- Fill Milestone and Assignee field when available in webhook payload
2016-08-16 10:19:09 -07:00
Unknwon
61e27dedf7
#3466 fix response of pull request form validation error
2016-08-15 14:04:44 -07:00
Richard Mahn
d0a0239bac
Squashed commit of the following:
...
commit 0afcb843d7ffd596991c4885cab768273a6eb42c
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 7ecd73ff5535612d79d471409173ee7f1fcfa157
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 08:42:41 2016 -0600
Fix for CodeMirror mode
commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 08:03:33 2016 -0600
Made tabbing in editor use spaces
commit 23af384c53206a8a40e11e45bf49d7a149c4adcd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date: Sun Jul 31 07:56:46 2016 -0600
Fix for data-url
commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9
Merge: 7fc8a89 991ce42ad7ea88cf85e9e1c7dcdd
2016-08-14 23:52:24 -07:00
Unknwon
3f7f4852ef
#2246 fully support of webhooks for pull request
2016-08-14 03:32:24 -07:00
Andrey Nering
dbed39ba05
On showing diff/file, use the tab_width specified on .editorconfig, if any ( #3241 )
...
Closes #3182
2016-08-11 17:07:09 -07:00
Unknwon
1f2e173a74
Refactor User.Id to User.ID
2016-07-24 01:08:22 +08:00
Unknwon
256cd6374a
#2790 fix not detect diff style in pull request file changes
2016-07-23 23:46:49 +08:00
Unknwon
4b5e09e4d6
#3181 detect situation when base branch is deleted in pull request
2016-07-23 18:35:16 +08:00
Unknwon
f1b8d52eb3
#2854 fix no mail notification when issue is closed/reopened
2016-07-16 00:36:39 +08:00
Unknwon
7ca5f8f119
models/repo: remove redundant info for some repo methods
...
RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink
2016-07-15 21:53:43 +08:00
Andrey Nering
743d22669a
Re-work MAX_DIFF_LINES: supress diff per file, not the whole diff ( #3174 )
2016-06-29 23:11:00 +08:00
Unknwon
9bd9ad4205
#1692 add CRUD issue APIs
...
- Fix go-gogs-client#10
- Related to #809
2016-03-13 23:20:22 -04:00
Unknwon
514382e2eb
Rename module: middleware -> context
2016-03-11 11:56:52 -05:00
Unknwon
0e9bc2d410
Fix pull request availability check
2016-03-06 23:57:46 -05:00
Unknwon
a5b0400be7
#1146 finish new access rights for collaborators
2016-03-05 20:45:23 -05:00
Unknwon
4cb8bf1b75
#1597 fix premission logic check of pull request
2016-03-04 16:14:02 -05:00
Unknwon
2d2d85bba4
#1597 support pull requests in same repository
2016-03-04 15:43:01 -05:00
Martin Hartkorn
51f15880d1
Call PushToBaseRepo() also on Pull Request creation and not only on git push
2016-02-24 13:56:54 +01:00
Andrey Nering
658bfc2704
Implement issue and pull request templates.
...
Similar to GitHub:
https://github.com/blog/2111-issue-and-pull-request-templates
Priority:
- root
- .gogs
- .github
2016-02-18 21:21:30 -02:00
Andrey Nering
2bfb8bb5fd
Enable sintax highlighting on diff view. Close #733
2016-02-04 18:21:47 -02:00
Andrey Nering
5deb726f3f
Refactoring of inline diff computing to prevent empty diff box. Fix #2489
2016-01-27 18:54:08 -02:00
Andrey Nering
ee5d6fb025
Compute inline diff for pull request view, too. Fix #2462
2016-01-25 20:56:27 -02:00
Unknwon
c62a6b7a12
#2014 allow switch branches between two orgs in compose PR
2015-12-20 01:06:54 -05:00
Unknwon
9cd16c5b12
#1692 add organization APIs
2015-12-17 02:28:47 -05:00
Unknwon
19423957b1
rename import path
2015-12-15 17:25:45 -05:00
Unknwon
3362b3a44f
fix possible disclosure
2015-12-14 17:06:54 -05:00
Unknwon
c6083c335e
#1612 Ability to send mail when a new pull request is submitted
2015-12-10 11:18:56 -05:00
Unknwon
9a2e43bff2
move out git module and #1573 send push hook
2015-12-09 20:46:05 -05:00
Unknwon
c50a3503e6
introduce git-shell
2015-11-26 17:33:45 -05:00
Unknwon
b2fb7e3fd2
more HTTP clone word fix
2015-11-22 13:01:42 -05:00
Unknwon
81d7359fdd
fix #1981
2015-11-18 15:11:37 -05:00
Unknwon
c3ba5590c9
Reopen PR need retest patch
2015-10-25 03:10:22 -04:00
Unknwon
0fbb8c8826
New push to head repo of head branch: regenerate patch and retest apply
2015-10-24 03:36:47 -04:00
Unknwon
fc7959d3bc
New/reopen PR checks if there is any unmerged and open PR
2015-10-18 19:30:39 -04:00
Unknwon
4dc6285715
add new status: checking
2015-10-18 17:18:54 -04:00
Unknwon
215920772a
save PR info as patch and minor fix on PR
2015-10-04 20:54:06 -04:00
Unknwon
119dec51f2
Mirror repository should not allow fork
2015-09-05 14:31:52 -04:00
Unknwon
2a2a8cd619
ui and pulls index fix
2015-09-03 03:49:50 -04:00
Unknwon
83dc2468f5
finish initial version of pull request
2015-09-02 16:18:09 -04:00
Unknwon
5da306c0e5
tmp: fix issue open count
2015-09-02 11:13:37 -04:00
Unknwon
953bb06857
basic PR feature
2015-09-02 09:26:56 -04:00
Unknwon
1abfe4e05f
PR: nothing to commit and has pull request check
2015-09-02 05:09:12 -04:00
Unknwon
37e0cee877
finish PR UI
2015-09-02 04:08:05 -04:00
Unknwon
ebf1bd4f51
add view pull desc
2015-09-01 19:26:39 -04:00
Unknwon
8c046073a8
work on PR conversation
2015-09-01 19:07:02 -04:00
Unknwon
670ade9a61
#1206 does not allow fork bare repo
2015-09-01 11:57:02 -04:00
Unknwon
1ca257ad9f
rename fields
2015-08-31 16:24:28 +09:00
Unknwon
dea3a8c6a4
WIP: create PR - choose branch
2015-08-08 22:43:14 +08:00
Unknwon
e3bdfd51ff
better fork permission check
2015-08-08 17:24:10 +08:00
Unknwon
9db4acc62e
improve fork process
2015-08-08 17:10:34 +08:00
Unknwon
8dd07c0ddd
New UI merge in progress
2014-07-26 00:24:27 -04:00
Unknown
314193029a
Use constants to name template file
2014-06-22 23:11:12 -04:00
Unknown
d0e6a4c25a
Change new martini impot path
2014-03-30 12:11:28 -04:00
Unknown
2fa8d0c8dd
Added create issue
2014-03-25 12:12:27 -04:00
Unknown
59bbddb318
Mirror fix
2014-03-24 07:36:38 -04:00
FuXiaoHei
137538e54b
refactor repo.go
2014-03-24 18:25:15 +08:00
