Daniel Jiang
67077297b1
Merge pull request #7998 from dorukhanguloz/master
...
Add Turkish Language
2019-08-21 00:02:21 +08:00
He Weiwei
c22bf2539e
refactor(quota,middleware): skip overflow error when subtract resources
...
1. Skip overflow error when subtract resources
2. Take up resources before handle request and put it back when handle
failed for add action in quota interceptor
3. Free resources only after handle success for subtract action in quota
interceptor
Closes #8681
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-20 14:41:55 +00:00
Dorukhan Gülöz
5307e1398d
Add Turkish Language
...
Signed-off-by: dorukhanguloz dorukhanguloz@hotmail.com
Signed-off-by: Dorukhan Gülöz <dguloz@havelsan.com.tr>
2019-08-20 13:58:25 +02:00
Wenkai Yin(尹文开)
f9aa154826
Merge pull request #8751 from steven-zou/fix/#8745
...
fix #8745 : job retry issue
2019-08-20 19:01:30 +08:00
Dorukhan Gülöz
7d63620d42
Merge branch 'master' into master
2019-08-20 12:16:10 +02:00
cd1989
db9b52d827
Config idle timeout for redis pool
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-20 17:23:32 +08:00
Steven Zou
217252a097
Merge pull request #8675 from ywk253100/190814_retention_task
...
Handle the retention task status updating in concurrency
2019-08-20 17:07:21 +08:00
Steven Zou
f6067d5474
Merge pull request #8708 from bitsf/tag_retention_rule_conflict
...
fix rule conflict, id error
2019-08-20 16:45:21 +08:00
Steven Zou
ace07b0c0a
fix #8745 : job retry issue
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-08-20 16:39:44 +08:00
He Weiwei
8eb17be13c
fix(quota-driver): owner name of project quota reference object
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-20 07:03:11 +00:00
Wang Yan
92fa01d6cd
Merge pull request #8733 from ywk253100/190819_label
...
Fix bug of listing tags filtered by label
2019-08-20 14:17:41 +08:00
Wenkai Yin(尹文开)
29ab93ad9c
Merge pull request #8714 from ywk253100/190816_scheduler
...
Fix bug found in scheduler
2019-08-20 14:11:04 +08:00
Wenkai Yin(尹文开)
0086d1b211
Merge pull request #8586 from ethan-daocloud/patch-2
...
project_test.go: many typos "respose" fixup
2019-08-20 13:54:37 +08:00
jwangyangls
596f299743
Merge pull request #8739 from AllForNothing/cve-add-id
...
add ids to key elements of CVE-whitelist UI for easy test
2019-08-20 13:51:24 +08:00
stonezdj(Daojun Zhang)
4384e11422
Merge pull request #8648 from stonezdj/regular_filter
...
Normalize LDAP filter for user filter and group filter
2019-08-20 13:47:32 +08:00
Wang Yan
f930786050
Merge pull request #8725 from heww/issue-8701
...
fix(quota): fix computeResources method of qutoa interceptor
2019-08-20 11:29:59 +08:00
Daniel Jiang
4921b0fb4c
Merge pull request #8494 from jwangyangls/fix-global-search
...
Fix redirect login page when enter harbor through global search
2019-08-20 11:22:21 +08:00
stonezdj
7c7b6d2710
Normalize LDAP filter for user filter and group filter
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-20 10:55:30 +08:00
Will Sun
c9f12bc273
Merge pull request #8727 from AllForNothing/tag-retention-bug
...
fix bugs for tag-retention
2019-08-20 10:46:53 +08:00
AllForNothing
88f1e198aa
1.add ids to key elements of CVE-whitelist UI for easy test
...
2.change decrible in UI
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-20 10:18:31 +08:00
Daniel Jiang
f674bb4e6c
Merge pull request #8590 from ninjadq/fix_registry_log_level
...
Fix: registry log level rendering issue
2019-08-20 09:11:56 +08:00
Daniel Jiang
f10fb67d6d
Merge pull request #8662 from stonezdj/email_sec2
...
Set default email to null if not provided
2019-08-20 09:01:50 +08:00
He Weiwei
75772aae11
refactor(quota): new error types for quota checking ( #8726 )
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-19 19:00:29 +08:00
Wang Yan
e0bf3229e0
Merge pull request #8734 from reasonerjt/bump-up-clair
...
Bump up Clair to v2.0.9
2019-08-19 18:28:33 +08:00
Yogi_Wang
2134492587
Fix error in Harbor
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-19 18:08:19 +08:00
Daniel Jiang
b34fda173c
Bump up Clair to v2.0.9
...
Fixes #8584
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-19 16:19:29 +08:00
Wenkai Yin
a5d292c9c6
Fix bug of listing tags filtered by label
...
Fixes #8249
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-19 16:10:16 +08:00
Will Sun
c0497c1a8d
Merge pull request #8730 from AllForNothing/webhook-bug
...
fix UI bugs for Webhooks
2019-08-19 15:59:10 +08:00
Will Sun
786fb429d6
Merge pull request #8716 from AllForNothing/cve-bug
...
fix cve-whitelist bugs
2019-08-19 15:55:24 +08:00
AllForNothing
6f3cc0da20
fix bugs for tag-retention
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 15:51:30 +08:00
stonezdj
5fa8eb7854
Set default email to null if not provided
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-19 15:20:44 +08:00
Daniel Jiang
b15c6bcdc7
Merge pull request #8259 from amritanshu-pandey/feature/fix-typos
...
fix typos in prepare script
2019-08-19 15:09:24 +08:00
AllForNothing
f11d4922d5
fix UI bugs for Webhooks
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 14:41:28 +08:00
AllForNothing
a8f773e678
fix cve-whitelist bugs
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 13:40:09 +08:00
danfengliu
841ac24ebc
Add API test case sign image back to travis, despite codacy block it when pulling a pr. ( #8617 )
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-19 13:35:45 +08:00
Ziming
0c79352c9c
fix tag retention schedule none error ( #8715 )
...
Change-Id: I04cad9d4c520db751bfa413bb139317563716501
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-19 12:25:54 +08:00
jwangyangls
94c930f150
Merge pull request #8720 from jwangyangls/fix-quota-bug
...
Fix bug for harbor 1.9.0
2019-08-19 11:20:25 +08:00
Yogi_Wang
48cb2da09b
Fix bug for harbor 1.9.0
...
1.modify the quota message.
2.fix replication ng bug when no filter.
3.fix summary ui style.
4.fix quota-edit page validation when input a large number
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-19 10:38:19 +08:00
Daniel Jiang
b3abd0316b
Merge pull request #8713 from reasonerjt/fix-8702
...
Avoid overwriting system CVE whitelist by mistake
2019-08-19 01:42:58 +08:00
He Weiwei
1bbfc023f1
fix(quota): fix computeResources method of qutoa interceptor
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-18 16:14:36 +00:00
Daniel Jiang
504202ecfd
Merge pull request #8378 from Typositoire/ldap/nested-groups
...
Search for LDAP_MATCHING_RULE_IN_CHAIN groups
2019-08-18 16:07:16 +08:00
Daniel Jiang
747bf849d2
Merge pull request #8670 from reasonerjt/proj-cve-wl-apitest
...
API test for project level CVE whitelist
2019-08-16 18:17:26 +08:00
Wang Yan
42bb5e1143
Merge pull request #8624 from wy65701436/quota-migration-dev
...
Add quota sync api to sync quota data with backend storage
2019-08-16 17:34:54 +08:00
danfengliu
2aa6f1aed7
Merge branch 'master' into add-sign-api-back-to-travis-despite-codacy-1
2019-08-16 16:28:49 +08:00
wang yan
ddb913f8d0
Add API test case sign image back to travis, despite codacy block it when pulling a pr.
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 01:26:36 -07:00
wang yan
b9d6108624
add ping for adapter to wait for service ready
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 16:03:12 +08:00
Wang Yan
aab3925dab
Merge pull request #8646 from bitsf/add_harbor_test_ca
...
use fix root CA for test
2019-08-16 15:19:22 +08:00
wang yan
6e11ecc6fc
Update codes per review comments
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 14:58:52 +08:00
Wang Yan
7a41d89ac8
Add quota sync api toi to sync quota data with backend storage
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 14:55:46 +08:00
Daniel Jiang
022d4e6ae8
Merge pull request #7462 from cd1989/enable-tags-detail-param
...
List simple tags when detail set to false
2019-08-16 14:25:29 +08:00