upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 17:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,776 Commits 51 Branches 310 Tags 355 MiB
8dc78d9cde
Commit Graph

6776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
De Chen
8dc78d9cde
Merge pull request #8963 from cd1989/replication-tasks-timezone 
Not use time pointer in model fields
 2019-09-06 17:35:24 +08:00
cd1989
4b5ad300f3 Handle zero time in UI 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-09-06 14:13:54 +08:00
cd1989
0b4608c0a7 Not use time pointer in model fields 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-09-05 21:24:33 +08:00
Daniel Jiang
f853b7ac22
Merge pull request #8822 from stuclem/release-1.8.0 
Minor doc fixes for the 1.8 docs
 2019-09-05 19:00:01 +08:00
Stuart Clements
62186f8849 Merge branch 'release-1.8.0' of https://github.com/goharbor/harbor into release-1.8.0 
Signed-off-by: Stuart Clements <sclements@vmware.com>
 2019-09-05 09:20:20 +02:00
stonezdj(Daojun Zhang)
98bf819ca7
Merge pull request #8949 from reasonerjt/oidc-err-1.8 
Handle error on OIDC callback -- cherry-pick to 1.8 branch
 2019-09-05 15:18:36 +08:00
Wenkai Yin(尹文开)
5556871be8
Merge pull request #8950 from reasonerjt/fix-create-admin-1.8 
Disallow creating an admin user when registration -- cherry pick to 1.8
 2019-09-05 10:03:39 +08:00
Daniel Jiang
1559c8ccd1 Disallow creating an admin user when registration 
This commit enhance the `POST /api/users` API to block request from non-admin to create
admin user.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-09-04 18:55:21 +08:00
Iradier, AlvaroJose
c6ff3cfca0 Handle error on OIDC callback 
If wrong OIDC scopes are defined, or there are some configuration errors, the OIDC callback query string might contain "error=..." with an error message. Intercept this case and show an error to the user instead of trying to exchange the token with a missing "code" parameter.

Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>

Change error variable name

Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>
 2019-09-04 18:13:27 +08:00
Wenkai Yin(尹文开)
c742294cdd
Merge pull request #8922 from heww/cherry-pick-issue-8635 
[Cherry pick]fix(rbac): NewProjectNamespace in rbac only accept projectID
 2019-09-03 12:04:20 +08:00
He Weiwei
f36bc8d742 fix(rbac): NewProjectNamespace in rbac only accept projectID 
Closes #8635

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-09-03 00:01:23 +08:00
Daniel Jiang
24939172a2
Merge pull request #7923 from wy65701436/release-1.8.0-robot-id 
[Cherry pick]Return account id when to issue a robot
 2019-09-01 17:22:56 +08:00
Wenkai Yin(尹文开)
8b9f10d13b
Merge pull request #8796 from ywk253100/190822_content_length 
[Cherry-pick]Set content length when pushing blobs
 2019-08-27 16:59:34 +08:00
Stuart Clements
19670cb561 Minor doc fixes for the 1.8 docs 2019-08-23 16:28:50 +02:00
Wang Yan
b9826bfa87
Merge pull request #8795 from steven-zou/fix/issue-#8537-1.8.X 
[CHERRY-PICK] reduce the expire time of job stats in redis DB
 2019-08-23 00:06:27 +08:00
Steven Zou
2f5bf6a2fa
Merge pull request #8782 from ywk253100/190822_stuck 
[Cherry-pick]Fix replication tasks stuck in "InProgress" issue
 2019-08-22 19:06:24 +08:00
Wenkai Yin
d63fada318 Set content length when pushing blobs 
Set content length when pushing blobs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-22 19:02:03 +08:00
Steven Zou
3d80347c14 reduce the expire time of job stats in redis DB 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-08-22 18:32:33 +08:00
Wenkai Yin
2ab2122e36 Fix replication tasks stuck in "InProgress" issue 
Fix replication tasks stuck in "InProgress" issue

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-22 13:20:23 +08:00
Wenkai Yin(尹文开)
12ead658b7
Merge pull request #8780 from steven-zou/fix/issue-#8525-1.8.x 
[CHERRY-PICK] fix #8525: periodic job retry issue: job stats is not found
 2019-08-22 13:15:03 +08:00
Steven Zou
76586b04a3 fix #8525: periodic job retry issue: job stats is not found 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-08-22 11:52:30 +08:00
Wenkai Yin(尹文开)
a95a84e427
Merge pull request #8761 from steven-zou/fix/#8745-1.8.x 
[Cherry-pick] fix #8745: job retry issue
 2019-08-21 12:53:29 +08:00
Steven Zou
cc8474ba09 fix #8745: job retry issue 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-08-21 12:13:25 +08:00
Daniel Jiang
1c3a3d532f
Merge pull request #8560 from stonezdj/merge_user_group_roles_v182 
Merge user roles and group roles -- 1.8 cherry pick
 2019-08-05 22:11:25 +08:00
stonezdj
7d8fcf04cc Merge user roles and group roles 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-08-05 16:58:23 +08:00
Wenkai Yin(尹文开)
41b8e60e6a
Merge pull request #8504 from steven-zou/fix/pool_run_out_cherry_1.8.0 
fix bug #8499: redis connection pool is run out
 2019-08-02 17:46:52 +08:00
Wang Yan
ce4c0c19a1
Merge pull request #8531 from wy65701436/release-1.8.0-fix 
Delete the none scan all schedule in migration
 2019-08-01 17:17:29 +08:00
wang yan
363a0f5ae1 Delete the nono scan all schedule in migration 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-01 15:26:24 +08:00
Steven Zou
80d21a30f7 fix bug #8499: redis connection pool is run out 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-07-31 16:11:27 +08:00
Daniel Jiang
8dc103c6de
Merge pull request #8447 from reasonerjt/group-perm-merge-1.8 
Update GetRolesByGroupID  -- cherrypick 1.8
 2019-07-29 19:11:37 +08:00
Daniel Jiang
74504b122e Update GetRolesByGroupID 
This commit fixes #8432
When querying the role of group ID, all matched roles should be returned
instead of the minimal role ID.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-07-29 11:25:52 +08:00
Wenkai Yin(尹文开)
ddc119a154
Merge pull request #8342 from wy65701436/release-1.8.0 
[cherry-pick]  Enable push dev images on release branch
 2019-07-19 16:40:50 +08:00
wang yan
8558722969 Remove duplicate docker push 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-19 14:52:59 +08:00
wang yan
a64a2cc56b Enable push dev images on release branch 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-19 14:52:41 +08:00
jwangyangls
b24a0e339b
Merge pull request #8329 from jwangyangls/add-group-1.8.0 
Add user group when http auth mode
 2019-07-19 14:23:39 +08:00
Yogi_Wang
8e5b4dcaf4 Add user group when http auth mode 
add the pages  in project and system

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-19 13:49:56 +08:00
Wenkai Yin(尹文开)
66e85f8318
Merge pull request #8315 from stonezdj/refactor_ldap_group_180 
Add HTTP group feature(cherry-pick from master)
 2019-07-19 13:10:45 +08:00
stonezdj
3c2f92294d Fix OnBoardGroup issue 
Signed-off-by: stonezdj <stonezdj@gmail.com>

Fix issue when adding a HTTP user group to a project member, returns HTTP 500 error.
 2019-07-19 10:45:26 +08:00
stonezdj
3021130943 Add HTTP group feature 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-07-19 10:45:26 +08:00
stonezdj
0a0dc784b8 Refactor LDAP group 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-07-19 10:45:26 +08:00
stonezdj(Daojun Zhang)
56af6f888d
Merge pull request #8327 from ninjadq/release-1.8.0 
Release 1.8.0
 2019-07-19 10:44:00 +08:00
DQ
54c9f9e158 Travis ci build prepare container in local 
build prepare container before running ut case

Signed-off-by: DQ <dengq@vmware.com>
 2019-07-18 15:20:21 +08:00
DQ
06324b43b4 Fix: Internal server error with messy code when chartmuseum not work 
log err when doesn't get data from chart museum

Signed-off-by: DQ <dengq@vmware.com>
 2019-07-18 13:58:17 +08:00
Qian Deng
1be678b2ea Fix docker-compose file permmission 
non-root user can see the content

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-07-17 16:54:48 +08:00
Qian Deng
5cb52330b9 Upgrade chartmuseum from v0.8.1 to v0.9.0 
Signed-off-by: Qian Deng <dengqian0826@gmail.com>
 2019-07-17 16:54:05 +08:00
Wang Yan
870d031820
Merge pull request #8292 from wy65701436/release-1.8.0 
promote base version to v1.8.2
 2019-07-16 13:37:39 +08:00
wang yan
96b4fd9bfa promote base version to v1.8.2 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-16 12:39:43 +08:00
Wang Yan
99be1c93a5
Merge pull request #8291 from reasonerjt/refresh-oidc-client-1.8 
Reload OIDC provider older than 3 seconds -- cherrypick
 2019-07-15 17:27:06 +08:00
Daniel Jiang
dd68861235 Reload OIDC provider older than 3 seconds 
This commit make sure the OIDC is more actively recreated, to mitigate
the problem in #8177

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-07-15 16:23:11 +08:00
Daniel Jiang
7996775b80
Merge pull request #8141 from ninjadq/cherry-pick-fix_migration_script_1_8 
Fix migration script to support exeternal db
 2019-07-09 18:03:46 +08:00