From fab43fda656e091104f79668db65f7c5e2a2e68c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 12 Sep 2023 09:13:29 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../components/ci_variable_drawer.vue | 104 +++++++++++- .../ci/ci_variable_list/constants.js | 1 + .../components/invite_members_modal.vue | 16 +- .../invite_members/utils/member_utils.js | 4 +- .../groups_and_projects/index.js | 17 ++ .../shared/components/groups_view.vue | 47 +++++- .../shared/components/projects_view.vue | 46 +++++- .../show/components/groups_and_projects.vue | 2 +- .../javascripts/organizations/show/index.js | 17 +- .../super_sidebar/components/user_bar.vue | 37 +++-- .../clusters/agents/dashboard_controller.rb | 34 ++++ .../organizations/organization_helper.rb | 17 +- .../groups_and_projects.html.haml | 2 +- .../development/k8s_dashboard.yml | 8 + ...7_action_monthly_active_users_ide_edit.yml | 1 - ...1_ide_edit_total_unique_counts_monthly.yml | 1 - .../20220428154012_live_preview.yml | 2 +- ...39_ide_edit_total_unique_counts_weekly.yml | 1 - config/routes.rb | 6 + .../diagrams/cells-and-fulfillment.drawio.png | Bin 43255 -> 0 bytes .../blueprints/cells/diagrams/index.md | 2 +- .../cells/impacted_features/ci-cd-catalog.md | 2 +- .../impacted_features/personal-namespaces.md | 2 +- .../index.md | 4 +- doc/development/ai_features/index.md | 2 +- doc/development/code_suggestions/index.md | 2 +- .../fe_guide/img/boards_diagram.png | Bin 9518 -> 0 bytes doc/operations/img/tracing_details_v16_3.png | Bin 29316 -> 0 bytes .../img/dora_performers_score_panel_v16_3.png | Bin 13108 -> 0 bytes ...ofile-preferences-syntax-themes_v15_11.png | Bin 56643 -> 0 bytes doc/user/profile/preferences.md | 14 +- doc/user/project/issues/design_management.md | 1 - locale/gitlab.pot | 23 ++- .../user_sees_merge_request_pipelines_spec.rb | 2 +- .../components/ci_variable_drawer_spec.js | 148 +++++++++++++++++- .../components/invite_members_modal_spec.js | 145 ++--------------- .../invite_members/mock_data/api_responses.js | 6 + .../invite_members/utils/member_utils_spec.js | 14 +- .../shared/components/groups_view_spec.js | 80 ++++++++-- .../shared/components/projects_view_spec.js | 80 ++++++++-- .../components/groups_and_projects_spec.js | 4 +- .../organizations/organization_helper_spec.rb | 34 +++- .../agents/dashboard_controller_spec.rb | 76 +++++++++ 44 files changed, 766 insertions(+), 240 deletions(-) create mode 100644 app/controllers/clusters/agents/dashboard_controller.rb create mode 100644 config/feature_flags/development/k8s_dashboard.yml delete mode 100644 doc/architecture/blueprints/cells/diagrams/cells-and-fulfillment.drawio.png delete mode 100644 doc/development/fe_guide/img/boards_diagram.png delete mode 100644 doc/operations/img/tracing_details_v16_3.png delete mode 100644 doc/user/analytics/img/dora_performers_score_panel_v16_3.png delete mode 100644 doc/user/profile/img/profile-preferences-syntax-themes_v15_11.png create mode 100644 spec/requests/clusters/agents/dashboard_controller_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index cc4a57245e6..95a78acbf8d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -2da899b99c7bc3536b1658f54ed1e8fdb6e02f23 +5460b4217be7746352cb9e8350fc7e12db27d4ba diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_drawer.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_drawer.vue index 3e084c45c31..c609e05bbb7 100644 --- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_drawer.vue +++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_drawer.vue @@ -1,5 +1,6 @@ diff --git a/app/assets/javascripts/organizations/shared/components/projects_view.vue b/app/assets/javascripts/organizations/shared/components/projects_view.vue index d6958ee996e..9bf4e597884 100644 --- a/app/assets/javascripts/organizations/shared/components/projects_view.vue +++ b/app/assets/javascripts/organizations/shared/components/projects_view.vue @@ -1,6 +1,6 @@ diff --git a/app/assets/javascripts/organizations/show/components/groups_and_projects.vue b/app/assets/javascripts/organizations/show/components/groups_and_projects.vue index 495b2bd34c3..e8972f3b380 100644 --- a/app/assets/javascripts/organizations/show/components/groups_and_projects.vue +++ b/app/assets/javascripts/organizations/show/components/groups_and_projects.vue @@ -105,6 +105,6 @@ export default { $options.i18n.viewAll }} - + diff --git a/app/assets/javascripts/organizations/show/index.js b/app/assets/javascripts/organizations/show/index.js index 92ae6a12346..c1ba1a82c0d 100644 --- a/app/assets/javascripts/organizations/show/index.js +++ b/app/assets/javascripts/organizations/show/index.js @@ -27,9 +27,14 @@ export const initOrganizationsShow = () => { const { dataset: { appData }, } = el; - const { organization, groupsAndProjectsOrganizationPath } = convertObjectPropsToCamelCase( - JSON.parse(appData), - ); + const { + organization, + groupsAndProjectsOrganizationPath, + projectsEmptyStateSvgPath, + groupsEmptyStateSvgPath, + newGroupPath, + newProjectPath, + } = convertObjectPropsToCamelCase(JSON.parse(appData)); Vue.use(VueRouter); const router = createRouter(); @@ -42,6 +47,12 @@ export const initOrganizationsShow = () => { name: 'OrganizationShowRoot', apolloProvider, router, + provide: { + projectsEmptyStateSvgPath, + groupsEmptyStateSvgPath, + newGroupPath, + newProjectPath, + }, render(createElement) { return createElement(App, { props: { organization, groupsAndProjectsOrganizationPath }, diff --git a/app/assets/javascripts/super_sidebar/components/user_bar.vue b/app/assets/javascripts/super_sidebar/components/user_bar.vue index 89fad519b89..810b1d02046 100644 --- a/app/assets/javascripts/super_sidebar/components/user_bar.vue +++ b/app/assets/javascripts/super_sidebar/components/user_bar.vue @@ -102,8 +102,14 @@ export default {