From 75d101a1c2684059ea22cea9f00ca74d2db78b38 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Jan 2023 21:10:01 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../empty_state_without_any_issues.vue | 12 +- .../list/components/issues_list_app.vue | 12 +- .../list/has_new_issue_dropdown_mixin.js | 18 + .../javascripts/lib/utils/http_status.js | 13 +- .../search_user_projects.query.graphql | 11 + .../new_issue_dropdown.vue | 30 +- app/controllers/concerns/zuora_csp.rb | 26 - .../projects/pipelines_controller.rb | 1 - .../projects/settings/ci_cd_controller.rb | 1 - app/models/merge_request.rb | 1 + ...aint_to_o_auth_access_tokens_expires_in.rb | 17 + db/schema_migrations/20230112051854 | 1 + db/structure.sql | 5 +- doc/api/releases/index.md | 12 +- doc/api/releases/links.md | 38 +- .../feature_categorization/index.md | 9 - doc/integration/arkose.md | 32 + doc/user/admin_area/settings/scim_setup.md | 32 + .../compliance/compliance_report/index.md | 23 + .../content_security_policy/config_loader.rb | 11 +- .../content_security_policy/directives.rb | 4 + locale/gitlab.pot | 3 + .../page/group/settings/usage_quotas.rb | 11 +- spec/controllers/dashboard_controller_spec.rb | 2 +- .../user_sees_merge_widget_spec.rb | 1 + spec/features/users/zuora_csp_spec.rb | 20 - .../statistics_panel/components/app_spec.js | 3 +- .../modules/batch_comments/actions_spec.js | 15 +- spec/frontend/blob/openapi/index_spec.js | 3 +- .../frontend/clusters/clusters_bundle_spec.js | 3 +- .../emoji/awards_app/store/actions_spec.js | 3 +- .../environments/graphql/resolvers_spec.js | 21 +- .../store/actions_spec.js | 3 +- .../filtered_search_dropdown_manager_spec.js | 3 +- .../filtered_search_visual_tokens_spec.js | 3 +- spec/frontend/ide/services/index_spec.js | 3 +- spec/frontend/ide/stores/actions_spec.js | 3 +- .../components/import_table_spec.js | 4 +- .../import_projects/store/actions_spec.js | 3 +- .../empty_state_without_any_issues_spec.js | 2 +- .../list/components/issues_list_app_spec.js | 2 +- .../components/new_issue_dropdown_spec.js | 133 --- spec/frontend/issues/list/mock_data.js | 46 -- spec/frontend/issues/show/issue_spec.js | 3 +- spec/frontend/lib/utils/axios_utils_spec.js | 5 +- .../components/delete_milestone_modal_spec.js | 7 +- .../frontend/monitoring/store/actions_spec.js | 4 +- .../nav/components/new_nav_toggle_spec.js | 3 +- .../pipeline_stage_spec.js | 5 +- .../pipelines/graph/action_component_spec.js | 3 +- .../pipelines/pipelines_actions_spec.js | 7 +- .../components/shared_runners_toggle_spec.js | 3 +- .../components/mr_widget_memory_usage_spec.js | 3 +- .../mr_widget_options_spec.js | 3 +- .../new_issue_dropdown/mock_data.js | 57 ++ .../new_issue_dropdown_spec.js | 149 ++++ spec/frontend/zen_mode_spec.js | 3 +- .../config_loader_spec.rb | 20 +- spec/models/merge_request_spec.rb | 9 + workhorse/go.mod | 64 +- workhorse/go.sum | 756 ++++++++++++++---- workhorse/internal/config/config.go | 6 +- 63 files changed, 1174 insertions(+), 537 deletions(-) create mode 100644 app/assets/javascripts/issues/list/has_new_issue_dropdown_mixin.js create mode 100644 app/assets/javascripts/vue_shared/components/new_issue_dropdown/graphql/search_user_projects.query.graphql rename app/assets/javascripts/{issues/list/components => vue_shared/components/new_issue_dropdown}/new_issue_dropdown.vue (83%) delete mode 100644 app/controllers/concerns/zuora_csp.rb create mode 100644 db/post_migrate/20230112051854_add_not_null_constraint_to_o_auth_access_tokens_expires_in.rb create mode 100644 db/schema_migrations/20230112051854 create mode 100644 doc/user/admin_area/settings/scim_setup.md delete mode 100644 spec/features/users/zuora_csp_spec.rb delete mode 100644 spec/frontend/issues/list/components/new_issue_dropdown_spec.js create mode 100644 spec/frontend/vue_shared/components/new_issue_dropdown/mock_data.js create mode 100644 spec/frontend/vue_shared/components/new_issue_dropdown/new_issue_dropdown_spec.js diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 94e382dccca..436d5acf1ef 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -684af7592d733edf7a16a817cd7900f03755cfb7 +d47724f6e9e18fd7c7c73ec68d89ed874c841502 diff --git a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue index 5a37751410a..251a6680ed3 100644 --- a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue +++ b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue @@ -2,8 +2,9 @@ import { GlButton, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; import { helpPagePath } from '~/helpers/help_page_helper'; import CsvImportExportButtons from '~/issuable/components/csv_import_export_buttons.vue'; +import NewIssueDropdown from '~/vue_shared/components/new_issue_dropdown/new_issue_dropdown.vue'; import { i18n } from '../constants'; -import NewIssueDropdown from './new_issue_dropdown.vue'; +import { hasNewIssueDropdown } from '../has_new_issue_dropdown_mixin'; export default { i18n, @@ -16,6 +17,7 @@ export default { GlSprintf, NewIssueDropdown, }, + mixins: [hasNewIssueDropdown()], inject: [ 'canCreateProjects', 'emptyStateSvgPath', @@ -75,7 +77,13 @@ export default { :export-csv-path="exportCsvPathWithQuery" :issuable-count="currentTabCount" /> - +
diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue index e4000184f41..0caf97a9f0c 100644 --- a/app/assets/javascripts/issues/list/components/issues_list_app.vue +++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue @@ -48,6 +48,7 @@ import { import IssuableList from '~/vue_shared/issuable/list/components/issuable_list_root.vue'; import { IssuableListTabs, IssuableStates } from '~/vue_shared/issuable/list/constants'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import NewIssueDropdown from '~/vue_shared/components/new_issue_dropdown/new_issue_dropdown.vue'; import { CREATED_DESC, defaultTypeTokenOptions, @@ -82,9 +83,9 @@ import { getSortOptions, isSortKey, } from '../utils'; +import { hasNewIssueDropdown } from '../has_new_issue_dropdown_mixin'; import EmptyStateWithAnyIssues from './empty_state_with_any_issues.vue'; import EmptyStateWithoutAnyIssues from './empty_state_without_any_issues.vue'; -import NewIssueDropdown from './new_issue_dropdown.vue'; const UserToken = () => import('~/vue_shared/components/filtered_search_bar/tokens/user_token.vue'); const EmojiToken = () => @@ -117,7 +118,7 @@ export default { directives: { GlTooltip: GlTooltipDirective, }, - mixins: [glFeatureFlagMixin()], + mixins: [glFeatureFlagMixin(), hasNewIssueDropdown()], inject: [ 'autocompleteAwardEmojisPath', 'calendarPath', @@ -831,7 +832,12 @@ export default { {{ $options.i18n.newIssueLabel }} - +