From c898498c37f2d737d30cf1825f09aaffcf89e20c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 27 Aug 2024 03:09:56 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/api.js | 8 +-- .../legacy_pipelines_table_wrapper.vue | 41 ++++++------ .../environment_details/index.vue | 6 +- .../javascripts/labels/labels_select.js | 2 +- .../javascripts/lib/utils/search_utils.js | 54 +++++++++++++++ app/assets/javascripts/merge_request_tabs.js | 1 + .../components/ci_icon/ci_icon.stories.js | 4 +- .../listbox_input/listbox_input.vue | 7 +- app/assets/stylesheets/framework/common.scss | 5 -- .../stylesheets/framework/variables.scss | 2 +- .../page_bundles/profiles/preferences.scss | 16 ++--- .../projects/merge_requests_controller.rb | 1 - .../repositories/git_http_controller.rb | 10 +-- .../beta/allow_git_http_fetch_writes.yml | 9 --- .../async_merge_request_pipeline_creation.yml | 9 --- doc/development/database/partitioning/list.md | 4 +- .../reducing_the_repo_size_using_git.md | 4 +- doc/user/rich_text_editor.md | 4 +- .../repositories/git_http_controller_spec.rb | 44 ++---------- spec/frontend/api_spec.js | 21 ------ .../pipeline_details/pipelines_store_spec.js | 12 +--- .../legacy_pipelines_table_wrapper_spec.js | 41 +++++------- .../environment_details/index_spec.js | 15 +---- spec/frontend/labels/labels_select_spec.js | 2 +- spec/frontend/lib/utils/search_utils_spec.js | 67 +++++++++++++++++++ 25 files changed, 198 insertions(+), 191 deletions(-) create mode 100644 app/assets/javascripts/lib/utils/search_utils.js delete mode 100644 config/feature_flags/beta/allow_git_http_fetch_writes.yml delete mode 100644 config/feature_flags/wip/async_merge_request_pipeline_creation.yml create mode 100644 spec/frontend/lib/utils/search_utils_spec.js diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 833a529be4d..1ecc22957e8 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -727,11 +727,9 @@ const Api = { .replace(':id', encodeURIComponent(id)) .replace(':merge_request_iid', mergeRequestId); - const params = {}; - - if (gon.features.asyncMergeRequestPipelineCreation) { - params.async = true; - } + const params = { + async: true, + }; return axios.post(url, params); }, diff --git a/app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue b/app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue index aa2ca316ede..d5c8dcf72f4 100644 --- a/app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue +++ b/app/assets/javascripts/commit/pipelines/legacy_pipelines_table_wrapper.vue @@ -9,7 +9,6 @@ import PipelinesMixin from '~/ci/pipeline_details/mixins/pipelines_mixin'; import PipelinesService from '~/ci/pipelines_page/services/pipelines_service'; import PipelineStore from '~/ci/pipeline_details/stores/pipelines_store'; import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { s__, __ } from '~/locale'; export default { @@ -23,8 +22,13 @@ export default { PipelinesTable, TablePagination, }, - mixins: [PipelinesMixin, glFeatureFlagMixin()], + mixins: [PipelinesMixin], props: { + canCreatePipelineInTargetProject: { + type: Boolean, + required: false, + default: false, + }, endpoint: { type: String, required: true, @@ -37,16 +41,21 @@ export default { type: String, required: true, }, - viewType: { - type: String, - required: false, - default: 'root', - }, - canCreatePipelineInTargetProject: { + isMergeRequestTable: { type: Boolean, required: false, default: false, }, + mergeRequestId: { + type: Number, + required: false, + default: 0, + }, + projectId: { + type: String, + required: false, + default: '', + }, sourceProjectFullPath: { type: String, required: false, @@ -57,15 +66,10 @@ export default { required: false, default: '', }, - projectId: { + viewType: { type: String, required: false, - default: '', - }, - mergeRequestId: { - type: Number, - required: false, - default: 0, + default: 'root', }, }, @@ -82,9 +86,6 @@ export default { }, computed: { - isUsingAsyncPipelineCreation() { - return this.glFeatures?.asyncMergeRequestPipelineCreation; - }, shouldRenderTable() { return !this.isLoading && this.state.pipelines.length > 0 && !this.hasError; }, @@ -145,7 +146,7 @@ export default { const pipelines = resp.data.pipelines || resp.data; this.store.storePagination(resp.headers); - this.setCommonData(pipelines, this.isUsingAsyncPipelineCreation); + this.setCommonData(pipelines, this.isMergeRequestTable); if (resp.headers?.['x-total']) { const updatePipelinesEvent = new CustomEvent('update-pipelines-count', { @@ -172,7 +173,7 @@ export default { eventHub.$emit('runMergeRequestPipeline', { projectId: this.projectId, mergeRequestId: this.mergeRequestId, - isAsync: this.isUsingAsyncPipelineCreation, + isAsync: this.isMergeRequestTable, }); }, tryRunPipeline() { diff --git a/app/assets/javascripts/environments/environment_details/index.vue b/app/assets/javascripts/environments/environment_details/index.vue index ec97a6334fb..affbea29933 100644 --- a/app/assets/javascripts/environments/environment_details/index.vue +++ b/app/assets/javascripts/environments/environment_details/index.vue @@ -83,9 +83,6 @@ export default { kubernetes: 'kubernetes-overview', }, methods: { - linkClass(index) { - return index === this.currentTabIndex ? 'gl-shadow-inner-b-2-theme-accent' : ''; - }, updateCurrentTab() { const hasKubernetesIntegration = this.environment?.clusterAgent; const selectedTabFromUrl = getParameterValues('tab'); @@ -109,7 +106,6 @@ export default { - +