Commit Graph

7384 Commits

Author SHA1 Message Date
Wang Yan
b2887ec172
Merge pull request #8631 from mmpei/official-wehook-events-20190811
Add chart and scanning event for webhook
2019-08-23 12:32:54 +08:00
mmpei
d5f87063e4
Merge branch 'master' into official-wehook-events-20190811 2019-08-22 22:07:12 -05:00
Wang Yan
35e786e54c
Merge pull request #8794 from ywk253100/190822_retry_status
Add status revision to retention task to handle retrying
2019-08-23 10:54:35 +08:00
jwangyangls
503f5352f0
Merge pull request #8760 from jwangyangls/revert-8494-fix-global-search
Revert "Fix redirect login page when enter harbor through global search"
2019-08-23 10:33:03 +08:00
jwangyangls
8dd7530280
Merge pull request #8800 from jwangyangls/pull-time-sort
Add the sortBy width push time and pull time  of tags
2019-08-23 10:10:35 +08:00
peimingming
599d12a04d Fix bugs by comments for webhook
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-08-23 09:44:51 +08:00
cd1989
4b59346423 Exist core when signal received
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-23 09:34:41 +08:00
Will Sun
713f0168f9
Merge pull request #8712 from tan-chao/master
fix chinese translation mistake #8426
2019-08-23 09:16:44 +08:00
Wang Yan
299032d602
Merge pull request #8771 from wy65701436/fix-manifest-dup
fix quota count size for same manifest in different repo
2019-08-23 08:37:03 +08:00
Yogi_Wang
26483836b3 Add the sortBy width push time and pull time of tags
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-23 07:34:46 +08:00
wang yan
2d569192ab fix quota count size for same manifest in different repo
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-23 00:56:45 +08:00
Wang Yan
5488da1299
Merge pull request #8781 from BeHappyF/fix-8684
fix UI bug for Webhooks
2019-08-22 23:56:12 +08:00
Wang Yan
a4e2891e4d
Merge pull request #8792 from steven-zou/fix/issue-#8537
reduce the expire time of job stats in redis DB
2019-08-22 23:55:45 +08:00
Wang Yan
c9dc262540
Merge pull request #8773 from ninjadq/Feat--migration_scritp_180_2_190
Feat: Add migration script for 1.9
2019-08-22 23:51:14 +08:00
He Weiwei
d6a6101fc2
fix(robot): make resource with projectId for robot in portal (#8798)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-22 22:55:21 +08:00
Wang Yan
3ebe81de8f
Merge pull request #8797 from wy65701436/fix-quota-err
fix #8688
2019-08-22 22:22:07 +08:00
Wenkai Yin
661470e7bc Add status revision to retention task to handle retrying
Add status revision to retention task to handle retrying

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-22 20:04:25 +08:00
Wenkai Yin(尹文开)
a9d77f5c2c
Merge pull request #8589 from ninjadq/upgrade_docker-compose_checker
Update docker-compose checker
2019-08-22 20:00:42 +08:00
wang yan
83a3274a96 fix #8688
use the docker defined error to avoid retry pushing on quota overflow

Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-22 19:19:43 +08:00
Steven Zou
718e336302 reduce the expire time of job stats in redis DB
Signed-off-by: Steven Zou <szou@vmware.com>
2019-08-22 18:26:09 +08:00
Wenkai Yin(尹文开)
21f8290110
Merge pull request #8777 from heww/issue-8635
fix(rbac): NewProjectNamespace in rbac only accept projectID
2019-08-22 17:52:27 +08:00
DQ
fd7b867fe3 Add config template
Add upgrade script
Update latest version

Signed-off-by: DQ <dengq@vmware.com>
2019-08-22 17:23:33 +08:00
Wang Yan
371a306dcf
Merge pull request #8784 from wy65701436/fix-migrator
fix deleted project error when to migrate quota
2019-08-22 16:34:49 +08:00
He Weiwei
311028be37
test: fix TestIsNegative (#8783)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-22 15:27:49 +08:00
Daniel Jiang
b47b30db23
Merge pull request #8766 from reasonerjt/fix-swagger-401
Remove 401 error for HEAD /projects
2019-08-22 15:01:21 +08:00
wang yan
dfa4301b21 fix deleted project error when to migrate quota
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-22 14:51:26 +08:00
Wenkai Yin(尹文开)
6198ed2634
Merge pull request #8758 from heww/issue-8681
refactor(quota,middleware): skip overflow error when subtract resources
2019-08-22 13:54:01 +08:00
Qian Deng
33138fe5e8
Merge pull request #8774 from heww/issue-8314
fix(build): install tzdata pkg for core and jobservice images
2019-08-22 13:04:56 +08:00
Will Sun
5b9fcf28b0
Merge pull request #8779 from AllForNothing/tag-re
modify metadate of tag-retention
2019-08-22 12:57:00 +08:00
方彬
088f805753 fix UI bug for Webhooks
Signed-off-by: 方彬 <fang_bingo@163.com>
2019-08-22 12:00:43 +08:00
Steven Zou
dfdcb3c9cb
Merge pull request #8763 from bitsf/tag_retention_rule_order
remove rule none and change rule order
2019-08-22 11:58:15 +08:00
Wenkai Yin(尹文开)
e3d8fa845d
Merge pull request #8767 from steven-zou/fix/issue-#8525
fix #8525: periodic job retry issue: job stats are not found
2019-08-22 11:06:13 +08:00
AllForNothing
ec459e20ce modify metadate of tag-retention
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-22 10:09:50 +08:00
He Weiwei
8effdc6f18 fix(rbac): NewProjectNamespace in rbac only accept projectID
Closes #8635

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-21 19:37:28 +00:00
He Weiwei
a2c8536d37 fix(build): install tzdata pkg for core and jobservice images
Closes #8314

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-21 14:40:29 +00:00
Ziming Zhang
06e9467b06 1. remove rule none
2. change rule orders
3. remove laber selector

Change-Id: Idc18a27cb0267f5f5c80a04b381e4a5dc6998508
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-21 20:24:33 +08:00
Will Sun
427a369d3a
Merge pull request #8764 from goharbor/ui-modify
ui adjustment for tag-retention and webhook
2019-08-21 18:39:25 +08:00
Wang Yan
af845bdab5
Merge pull request #8750 from wy65701436/gc-fix-quota
fix quota size usage in gc job
2019-08-21 18:32:26 +08:00
wang yan
e91ded65cb fix quota size usage in gc job, issue #https://github.com/goharbor/harbor/issues/8699
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-21 16:51:31 +08:00
Steven Zou
926ac44a67 fix #8525: periodic job retry issue: job stats is not found
Signed-off-by: Steven Zou <szou@vmware.com>
2019-08-21 16:30:47 +08:00
Daniel Jiang
7f7e2a8106 Remove 401 error for HEAD /projects
Fixes #7544

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-21 15:59:25 +08:00
AllForNothing
e0b73f2729 ui adjustment for tag-retention and webhook
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-21 15:35:44 +08:00
stonezdj(Daojun Zhang)
962d480d79
Merge pull request #8516 from thebouv/patch-1
Fixes small typo in manage_role_by_ldap_group docs
2019-08-21 15:18:55 +08:00
Wang Yan
c1ad0518c9
Merge pull request #8582 from ethan-daocloud/patch-1
core/main.go: logging message correction
2019-08-21 13:49:00 +08:00
Wang Yan
4bccb17236
Merge pull request #8749 from heww/issue-8493
fix(quota-driver): owner name of project quota reference object
2019-08-21 13:47:17 +08:00
Wang Yan
6d663a88e3
Merge pull request #8634 from sandhose/fix-swagger-spec
Fix the swagger API definition
2019-08-21 13:28:05 +08:00
jwangyangls
cd6d3ec800 Revert "Fix redirect login page when enter harbor through global search"
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-21 11:37:27 +08:00
jwangyangls
8701007714
Merge pull request #8738 from jwangyangls/fix-error
Fix error in Harbor
2019-08-21 11:02:00 +08:00
928234269
7a4fde5ec9
fixt typo "an user" to "a user"
Signed-off-by: 928234269 <longfei.shang@daocloud.io>
2019-08-21 10:20:35 +08:00
Daniel Jiang
67077297b1
Merge pull request #7998 from dorukhanguloz/master
Add Turkish Language
2019-08-21 00:02:21 +08:00