Unknwon
f6bdefe3f3
public: minor fix for PR #5276
6 years ago
ususdei
cd71077c6a
pull request: able to add custom commit description ( #5276 )
...
* pull request merges now allow for custom commit messages
* allow i18n on commit_message label
* place label above textarea for commit message
* rename commit message for pull requests into commit description and pass to git separately
6 years ago
Unknwon
53c8e4263b
models: skip JSON for fields skipped by XORM
...
Reduce output JSON size by backup command
7 years ago
Unknwon
aff4208244
*: rename "gogits" to "gogs"
7 years ago
Unknwon
8b66c433c5
models/pull: fix error on merge pull requests to non-default branch ( #5138 )
7 years ago
Unknwon
75555585e8
models/pull: fix rebase merging no effect ( #5051 )
7 years ago
Unknwon
dd245fe8bd
pull_request: fix changes not pushed to upstream if between two repositories ( #4890 )
7 years ago
Unknwon
43d6ad5fda
pull: fix after commit ID is not latest commit in the base branch ( #4442 )
7 years ago
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
Unknwon
0e6a6bf880
Refactoring: remove sessionRelease()
...
XORM supports automatic roll back in session Close() already.
8 years ago
Unknwon
ce6e8ed8fe
models: remove redundant tags for primary keys
8 years ago
Unknwon
90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}
8 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
8f52ab8201
models/repo_editor: add pull request test task after commit ( #4338 )
8 years ago
Unknwon
beee6e03b1
error: move ErrRepoNotExist -> errors.RepoNotExist
8 years ago
Unknwon
cac7af2c78
explore: able list and search for private but accessible repositories ( #3088 )
8 years ago
Unknwon
9e8ffa14cb
webhook: add file status to push event ( #3897 )
8 years ago
Unknwon
0ccd7c97ab
models: rename ErrUserNotExist -> errors.UserNotExist
8 years ago
Unknwon
c3cde864f8
models/pull: treat all errors as conflict ( #4265 )
...
If there is a misdetection, log shows everything.
8 years ago
Unknwon
f860ddbbb7
models/pull: better error message detection ( #4265 )
...
Stop using English phrases in case of Git localization.
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
f5dc436441
Minor improve on error handling
8 years ago
Unknwon
eb66060cd7
log: start using gopkg.in/clog.v1
8 years ago
Unknwon
418dab9b96
models/pull: load attributes when fetch list of pull requests ( #4089 )
...
Code only fetched issues corresponding to the pull requests, and left
out necessary base/head repository objects, which is required later
to generate API format.
8 years ago
Unknwon
d04b19545d
Code fix for PR #3547
8 years ago
Kurt Madel
3b0e2c1c3f
PR Webhook - Add base/head info ( #3547 )
...
* messing with getting local go-gogs-client
* coding style fix
* added comments for required fields
8 years ago
Alexander Lunegov
7358e46815
Fix string format verbs ( #3637 )
8 years ago
Unknwon
c1ecb6c60a
modules/sync: add UniqueQueue
8 years ago
Unknwon
643142acab
Web editor: support upload files
8 years ago
Unknwon
a00c932bbc
General code quality improvement
8 years ago
Unknwon
6f9a95f830
#2246 add HTMLURL to webhook type
...
- Fill Milestone and Assignee field when available in webhook payload
8 years ago
Unknwon
2625193a48
models/repo_editor: improve code quality
8 years ago
Unknwon
4042d1f0c3
models/issue: improve quality and performance of NewIssue function
8 years ago
Unknwon
cd89f6c502
Web editor: improve edit file and diff preview
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
dccb0c15b9
Replace convert.To with APIFormat calls
8 years ago
Unknwon
3f7f4852ef
#2246 fully support of webhooks for pull request
8 years ago
lstahlman
ea192147ea
Add test pull request task on merging a PR. Fixes #3396 ( #3425 )
8 years ago
Unknwon
ec92565f23
#3393 fix missing sub-url prefix in relative avatar link
8 years ago
Unknwon
1f2e173a74
Refactor User.Id to User.ID
8 years ago
Unknwon
250be011c7
Remove redundant Unix timestamp method call
...
Unix() already uses UTC as timezone
8 years ago
Unknwon
f1b8d52eb3
#2854 fix no mail notification when issue is closed/reopened
8 years ago
Unknwon
7ca5f8f119
models/repo: remove redundant info for some repo methods
...
RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink
8 years ago
Unknwon
ad513a20e9
#2302 Replace time.Time with Unix Timestamp (int64)
9 years ago
Unknwon
2a931937a8
Update locales
9 years ago
Unknwon
e2d370f0da
#1597 fix pull request remote head can't update with force push
9 years ago
Unknwon
2d2d85bba4
#1597 support pull requests in same repository
9 years ago