kolaente
6733682a7a
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# models/issue_comment.go
2018-05-18 23:16:41 +02:00
Lunny Xiao
24941a1046
Add more webhooks support and refactor webhook templates directory ( #3929 )
...
* add more webhook support
* move hooks templates to standalone dir and add more webhooks ui
* fix tests
* update vendor checksum
* add more webhook support
* move hooks templates to standalone dir and add more webhooks ui
* fix tests
* update vendor checksum
* update vendor
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
* load attributes when created release
* update comparsion doc
2018-05-16 22:01:55 +08:00
kolaente
a25e1dd0cf
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# models/migrations/migrations.go
# models/migrations/v59.go
# modules/auth/repo_form.go
2018-04-03 11:16:37 +02:00
Bwko
321cc2a3d0
Set default branchname on first push ( #3715 )
2018-03-25 21:00:07 +08:00
kolaente
5852b7c9f3
Merge branch 'master' into master
2018-02-27 20:06:12 +01:00
Bo-Yi Wu
04b3e8cbdc
refactor: reduce sql query in retrieveFeeds ( #3547 )
2018-02-21 18:55:34 +08:00
kolaente
992e168687
Fixed lint + gofmt
2018-01-14 21:14:42 +01:00
kolaente
30ae70a4d0
Moved check for open dependencies to "changeStatus"
2018-01-14 19:12:25 +01:00
kolaente
172b1f054a
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# models/migrations/v51.go
2017-12-19 19:07:30 +01:00
Lunny Xiao
f2e20c81b6
Refactor struct's time to remove unnecessary memory usage ( #3142 )
...
* refactor struct's time to remove unnecessary memory usage
* use AsTimePtr simple code
* fix tests
* fix time compare
* fix template on gpg
* use AddDuration instead of Add
2017-12-11 06:37:04 +02:00
Konrad
9af3aae2f3
Merge branch 'master' of https://github.com/go-gitea/gitea
2017-12-03 17:45:55 +01:00
Ethan Koenig
3163abedd6
Fix ref parsing in commit messages ( #3067 )
2017-12-03 10:20:12 +08:00
Konrad
dd24b9ff5a
Implemented missing create table for Issue Dependencies table \
...
IssueNoDependenciesLeft now returns an error when something goes wrong
;
2017-11-01 16:16:49 +01:00
Konrad
a2b652e14c
Merge branch 'master' of https://github.com/go-gitea/gitea
2017-11-01 11:31:54 +01:00
cstyles
b0b24a2dbb
Use RelAvatarLink() in GetActAvatar() ( #2800 )
2017-10-31 16:08:23 +08:00
Konrad Langenberg
d7a2ffcc69
Merge branch 'master' of https://github.com/go-gitea/gitea
...
Signed-off-by: Konrad <konrad@kola-entertainments.de>
# Conflicts:
# models/migrations/migrations.go
# models/migrations/v44.go
2017-10-04 23:15:30 +02:00
Lunny Xiao
a8717e5e3a
Use AfterLoad instead of AfterSet on Structs ( #2628 )
...
* use AfterLoad instead of AfterSet on Structs
* fix the comments on AfterLoad
* fix the comments on action AfterLoad
2017-10-01 19:52:35 +03:00
Konrad Langenberg
8b4a48c4bc
Merge branch 'master' of https://github.com/go-gitea/gitea
...
Signed-off-by: Konrad <konrad@kola-entertainments.de>
# Conflicts:
# models/migrations/migrations.go
# models/migrations/v42.go
2017-09-24 13:20:34 +02:00
Konrad Langenberg
9b467a309e
Simplified checking of open dependencies left
...
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-23 15:20:58 +02:00
David Schneiderbauer
1eedd983ea
Complete push webhooks ( #2530 )
...
* implemented missing 'delete' push webhooks
moreover created ActionDeleteBranch and ActionDeleteTag
* add CommitRepoAction tests for tag/branch creation/deletion
* fixed error where push webhook not called if is new branch or tag
removed unnecessary code
* moved prepare unit test environment into separate method to be used across unit tests
* add missing if clause in pushUpdate
Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>
2017-09-21 10:43:26 +03:00
Ethan Koenig
acecedc410
Use named ActionType constants in template helper ( #2545 )
2017-09-20 09:22:42 +08:00
Konrad Langenberg
c1ee648998
fixed template issue, resolved conflicts
...
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:53:28 +02:00
Jonas Franz
fe6c1a9ae2
Fixing build process by syncing govendor dependencies and gofmt.
...
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-09-17 21:26:37 +02:00
Konrad Langenberg
74a0df7a3b
Merged with upstream/master, resolved conflicts
...
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 20:38:30 +02:00
Lunny Xiao
005900baea
Use created & updated instead BeforeInsert & BeforeUpdate ( #2482 )
...
* use created & updated instead BeforeInsert & BeforeUpdate
* fix vendor checksum
* only show generated SQL when development mode
* remove extra update column updated_unix
* remove trace config
2017-09-13 08:18:22 +03:00
kolaente
67f66d6bb5
Resolved Conflicts
...
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-12 14:19:20 +02:00
Konrad Langenberg
0c9203d12b
Implemented repo settings check on autoclose
...
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-09 14:09:44 +02:00
Konrad Langenberg
875cd3ca58
Implemented not closing an issue via commit message if it has blocking dependencies
...
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-29 20:40:00 +02:00
Lunny Xiao
e41da3845d
fix duplicated feed ( #2370 )
2017-08-28 10:26:04 +08:00
Lunny Xiao
64b7068846
Add more test for login links and fix a bug on action retrieve ( #2361 )
...
* add more test for login links and fix a bug on action retrieve
2017-08-23 12:53:35 +03:00
Ethan Koenig
fd6e91077a
Fix SQL condition bug in GetFeeds(..) ( #2360 )
2017-08-23 08:51:58 +03:00
Bwko
1a5fe4326f
Add collaborative repositories to the dashboard ( #2205 )
...
* Add collaborative repositories to the dashboard
Remove some unused code from the Dashboard func
* fix some bug and some refactor
* fix tests
2017-08-23 09:30:54 +08:00
Lauris BH
b639fa1648
Ignore invalid issue numbers in commit messages. Fixes #2022 ( #2150 )
2017-07-12 22:35:47 -05:00
Jonas Franz
441986a473
Fix "Dashboard shows deleted comments" ( #1995 )
2017-06-25 20:20:29 +02:00
Ethan Koenig
96152c38b1
Fix bug in Action.loadRepo() ( #1959 )
2017-06-14 08:37:50 +08:00
Andrey Nering
635273cea6
Merge pull request #1829 from ethantkoenig/no_branches
...
Commitless repos should be bare
2017-06-12 11:05:01 -03:00
Ethan Koenig
4e5ee2b67a
Fix user profile activity feed ( #1848 )
...
* Fix user profile activity feed
* gofmt, and avoid overlapping database connections
2017-06-02 08:42:25 +08:00
Ethan Koenig
c85ff532e9
Commitless repos should be bare
2017-05-28 22:31:40 -04:00
Ethan Koenig
bafd778c25
Fix invalid reference in feeds template ( #1820 )
...
* Fix invalid reference in feeds template
* Comment for GetActAvatar
* Add integration test
2017-05-27 11:34:11 +08:00
Ethan Koenig
0c332f0480
Fix activity feed ( #1779 )
...
* Fix activity feed
Preserve actions after user/repo name change
* Add missing comment
* Fix migration, and remove fields completely
* Tests
2017-05-26 09:38:18 +08:00
agrn
88112a5324
Fix "Error: No issue number specified" when pushing ( #1393 )
...
* Fix "Error: No issue number specified" when pushing
* update pr
2017-03-31 18:05:39 -07:00
Lunny Xiao
3cf0e513e6
fix wrong log when push to a new branch ( #1220 )
2017-03-17 10:15:00 +08:00
Ethan Koenig
da1b6164fe
Fix FIXME and remove superfluous queries in models/org ( #749 )
2017-01-25 23:41:38 +08:00
Andrey Nering
84b7d29d34
Create missing database indexes ( #596 )
2017-01-06 23:14:33 +08:00
Ethan Koenig
1207bda94b
Fix typos in models/ ( #576 )
2017-01-05 08:50:34 +08:00
Lunny Xiao
c21e2c4151
fix tag webhook 404 error ( #420 )
2016-12-22 22:57:48 +08:00
Lunny Xiao
47a7529d96
update code.gitea.io/git ( #450 )
2016-12-22 10:30:52 +01:00
Lunny Xiao
73710c00a8
bug fixed branch name for pushupdate ( #380 )
2016-12-13 15:19:42 +08:00
Ethan Koenig
04b9a7e7a2
Bug fixes for repo permissions in API
...
Also move duplicated code into repo.APIFormat(..)
2016-12-07 12:55:24 +01:00
Kim "BKC" Carlbäcker
dad806d3ea
CreateBranch-hook has shasum. Use the full ref for fetching shasum
2016-11-29 11:50:22 +01:00