From e6f61449a7a49e09d3e930ff58ed1b1fece7ca77 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 1 May 2024 18:11:10 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../members/components/members_tabs.vue | 7 +- .../components/table/members_pagination.vue | 55 ++ .../components/table/members_table.vue | 38 +- app/models/ci/pipeline.rb | 1 + doc/ci/runners/new_creation_workflow.md | 10 +- doc/development/secure_coding_guidelines.md | 2 +- doc/editor_extensions/visual_studio/index.md | 5 + doc/security/token_overview.md | 45 +- doc/user/ai_features.md | 127 +---- doc/user/ai_features_enable.md | 140 +++++ .../vulnerabilities/index.md | 4 +- doc/user/gitlab_duo_chat.md | 6 +- doc/user/img/disable_duo_features_v17_0.png | Bin 43278 -> 35224 bytes lib/backup/manager.rb | 15 + lib/tasks/gitlab/backup.rake | 12 + qa/knapsack/master_report.json | 508 +++++++++--------- ...40_2024_04_26_17.0.0-pre_gitlab_backup.tar | Bin 0 -> 14336 bytes .../table/members_pagination_spec.js | 121 +++++ .../components/table/members_table_spec.js | 91 +--- spec/lib/backup/manager_spec.rb | 72 ++- spec/models/ci/pipeline_spec.rb | 9 + spec/tasks/gitlab/backup_rake_spec.rb | 11 + 23 files changed, 751 insertions(+), 530 deletions(-) create mode 100644 app/assets/javascripts/members/components/table/members_pagination.vue create mode 100644 doc/user/ai_features_enable.md create mode 100644 spec/fixtures/backups/1714155640_2024_04_26_17.0.0-pre_gitlab_backup.tar create mode 100644 spec/frontend/members/components/table/members_pagination_spec.js diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index fe47c2046a8..b913a588b7d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -606e33fd67ccb40becec0638fff387caf6dfc035 +7acf563cecc93e6c26c0c77151993e6ff0c17318 diff --git a/app/assets/javascripts/members/components/members_tabs.vue b/app/assets/javascripts/members/components/members_tabs.vue index 431f027936c..166b3f970f6 100644 --- a/app/assets/javascripts/members/components/members_tabs.vue +++ b/app/assets/javascripts/members/components/members_tabs.vue @@ -95,7 +95,12 @@ export default { {{ tab.title }} {{ getTabCount(tab) }} - + +import { GlPagination } from '@gitlab/ui'; +import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { ACTIVE_TAB_QUERY_PARAM_NAME } from '~/members/constants'; + +export default { + name: 'MembersPagination', + components: { GlPagination }, + props: { + pagination: { + type: Object, + required: true, + }, + tabQueryParamValue: { + type: String, + required: true, + }, + }, + computed: { + isPaginationShown() { + const { paramName, currentPage, perPage, totalItems } = this.pagination; + return paramName && currentPage && perPage && totalItems; + }, + }, + methods: { + paginationLinkGenerator(page) { + const { params = {}, paramName } = this.pagination; + + return mergeUrlParams( + { + ...params, + [ACTIVE_TAB_QUERY_PARAM_NAME]: + this.tabQueryParamValue !== '' ? this.tabQueryParamValue : null, + [paramName]: page, + }, + window.location.href, + ); + }, + }, +}; + + diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue index 1bf7181af6f..8496a4d9e2c 100644 --- a/app/assets/javascripts/members/components/table/members_table.vue +++ b/app/assets/javascripts/members/components/table/members_table.vue @@ -1,5 +1,5 @@