From f6115a0f2ce347bab74ff5951cf828196d715b66 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 9 Dec 2021 18:14:48 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/related_merge_requests.vue | 0 .../related_merge_requests/index.js | 0 .../related_merge_requests/store/actions.js | 0 .../related_merge_requests/store/index.js | 0 .../store/mutation_types.js | 0 .../related_merge_requests/store/mutations.js | 0 .../related_merge_requests/store/state.js | 0 .../components/sentry_error_stack_trace.vue | 0 .../sentry_error_stack_trace/index.js | 0 app/assets/javascripts/issues/show.js | 4 +- .../components/header/pipeline_status.vue | 21 +----- doc/api/graphql/index.md | 73 ++++++++----------- doc/development/api_graphql_styleguide.md | 2 +- doc/development/documentation/workflow.md | 4 +- doc/install/pivotal/index.md | 19 ++--- locale/gitlab.pot | 3 - .../gitaly/praefect_repo_sync_spec.rb | 2 +- .../components/related_merge_requests_spec.js | 4 +- .../store/actions_spec.js | 4 +- .../store/mutations_spec.js | 4 +- .../sentry_error_stack_trace_spec.js | 2 +- .../components/header/pipeline_status_spec.js | 22 +----- 22 files changed, 53 insertions(+), 111 deletions(-) rename app/assets/javascripts/{ => issues}/related_merge_requests/components/related_merge_requests.vue (100%) rename app/assets/javascripts/{ => issues}/related_merge_requests/index.js (100%) rename app/assets/javascripts/{ => issues}/related_merge_requests/store/actions.js (100%) rename app/assets/javascripts/{ => issues}/related_merge_requests/store/index.js (100%) rename app/assets/javascripts/{ => issues}/related_merge_requests/store/mutation_types.js (100%) rename app/assets/javascripts/{ => issues}/related_merge_requests/store/mutations.js (100%) rename app/assets/javascripts/{ => issues}/related_merge_requests/store/state.js (100%) rename app/assets/javascripts/{ => issues}/sentry_error_stack_trace/components/sentry_error_stack_trace.vue (100%) rename app/assets/javascripts/{ => issues}/sentry_error_stack_trace/index.js (100%) rename spec/frontend/{ => issues}/related_merge_requests/components/related_merge_requests_spec.js (94%) rename spec/frontend/{ => issues}/related_merge_requests/store/actions_spec.js (94%) rename spec/frontend/{ => issues}/related_merge_requests/store/mutations_spec.js (89%) rename spec/frontend/{ => issues}/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js (94%) diff --git a/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue b/app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue similarity index 100% rename from app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue rename to app/assets/javascripts/issues/related_merge_requests/components/related_merge_requests.vue diff --git a/app/assets/javascripts/related_merge_requests/index.js b/app/assets/javascripts/issues/related_merge_requests/index.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/index.js rename to app/assets/javascripts/issues/related_merge_requests/index.js diff --git a/app/assets/javascripts/related_merge_requests/store/actions.js b/app/assets/javascripts/issues/related_merge_requests/store/actions.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/actions.js rename to app/assets/javascripts/issues/related_merge_requests/store/actions.js diff --git a/app/assets/javascripts/related_merge_requests/store/index.js b/app/assets/javascripts/issues/related_merge_requests/store/index.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/index.js rename to app/assets/javascripts/issues/related_merge_requests/store/index.js diff --git a/app/assets/javascripts/related_merge_requests/store/mutation_types.js b/app/assets/javascripts/issues/related_merge_requests/store/mutation_types.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/mutation_types.js rename to app/assets/javascripts/issues/related_merge_requests/store/mutation_types.js diff --git a/app/assets/javascripts/related_merge_requests/store/mutations.js b/app/assets/javascripts/issues/related_merge_requests/store/mutations.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/mutations.js rename to app/assets/javascripts/issues/related_merge_requests/store/mutations.js diff --git a/app/assets/javascripts/related_merge_requests/store/state.js b/app/assets/javascripts/issues/related_merge_requests/store/state.js similarity index 100% rename from app/assets/javascripts/related_merge_requests/store/state.js rename to app/assets/javascripts/issues/related_merge_requests/store/state.js diff --git a/app/assets/javascripts/sentry_error_stack_trace/components/sentry_error_stack_trace.vue b/app/assets/javascripts/issues/sentry_error_stack_trace/components/sentry_error_stack_trace.vue similarity index 100% rename from app/assets/javascripts/sentry_error_stack_trace/components/sentry_error_stack_trace.vue rename to app/assets/javascripts/issues/sentry_error_stack_trace/components/sentry_error_stack_trace.vue diff --git a/app/assets/javascripts/sentry_error_stack_trace/index.js b/app/assets/javascripts/issues/sentry_error_stack_trace/index.js similarity index 100% rename from app/assets/javascripts/sentry_error_stack_trace/index.js rename to app/assets/javascripts/issues/sentry_error_stack_trace/index.js diff --git a/app/assets/javascripts/issues/show.js b/app/assets/javascripts/issues/show.js index 33b1c47b4fe..0c02d137f29 100644 --- a/app/assets/javascripts/issues/show.js +++ b/app/assets/javascripts/issues/show.js @@ -8,8 +8,8 @@ import { initIssuableApp, initIssueHeaderActions } from '~/issues/show/issue'; import { parseIssuableData } from '~/issues/show/utils/parse_data'; import initNotesApp from '~/notes'; import { store } from '~/notes/stores'; -import initRelatedMergeRequestsApp from '~/related_merge_requests'; -import initSentryErrorStackTraceApp from '~/sentry_error_stack_trace'; +import initRelatedMergeRequestsApp from '~/issues/related_merge_requests'; +import initSentryErrorStackTraceApp from '~/issues/sentry_error_stack_trace'; import initIssuableHeaderWarning from '~/issuable/init_issuable_header_warning'; import ZenMode from '~/zen_mode'; diff --git a/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue b/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue index 6fe1459c80c..78d9b6fb70c 100644 --- a/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue +++ b/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue @@ -21,9 +21,6 @@ export const i18n = { ), viewBtn: s__('Pipeline|View pipeline'), viewCommit: s__('Pipeline|View commit'), - pipelineNotTriggeredMsg: s__( - 'Pipeline|No pipeline was triggered for the latest changes due to the current CI/CD configuration.', - ), }; export default { @@ -79,22 +76,16 @@ export default { result(res) { if (res.data?.project?.pipeline) { this.hasError = false; - } else { - this.hasError = true; - this.pipelineNotTriggered = true; } }, error() { this.hasError = true; - this.networkError = true; }, pollInterval: POLL_INTERVAL, }, }, data() { return { - networkError: false, - pipelineNotTriggered: false, hasError: false, }; }, @@ -148,16 +139,8 @@ export default {