Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: list data source leaders and departments #1188 #1189

Merged
merged 4 commits into from
Aug 25, 2023
Merged

feat: list data source leaders and departments #1188 #1189

merged 4 commits into from
Aug 25, 2023

Commits on Aug 23, 2023

  1. feat: list data source leaders and departments TencentBlueKing#1188

    @Canway-shiisa
    Canway-shiisa committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    28872b0 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Merge branch 'ft_tenant' of https://github.com/Canway-shiisa/bk-user … 

    …into ft_tenant_list_ds_departments_and_leaders

# Conflicts:
#	src/bk-user/bkuser/apis/web/data_source/serializers.py
#	src/bk-user/bkuser/apis/web/data_source/urls.py
#	src/bk-user/bkuser/apis/web/data_source/views.py
    @Canway-shiisa
    Canway-shiisa committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    3b26c89 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ft_tenant' of https://github.com/Canway-shiisa/bk-user … 

    …into ft_tenant_list_ds_departments_and_leaders

# Conflicts:
#	src/bk-user/bkuser/apis/web/data_source/serializers.py
#	src/bk-user/bkuser/apis/web/data_source/views.py
    @Canway-shiisa
    Canway-shiisa committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    7938a39 View commit details
    Browse the repository at this point in the history

  3. feat: list data source leaders and departments TencentBlueKing#1188

    @Canway-shiisa
    Canway-shiisa committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    e4f80f6 View commit details
    Browse the repository at this point in the history