From d4e22f4ade1ce4dfd54f4d1740f074b2be441705 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 19 Dec 2022 18:09:34 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab-ci.yml | 5 -- .gitlab/ci/rules.gitlab-ci.yml | 3 +- .rubocop_todo/security/io_methods.yml | 18 ------ .yamllint | 19 +++++++ GITALY_SERVER_VERSION | 2 +- .../components/secure_files_list.vue | 4 +- .../terminal/actions/session_controls.js | 4 +- .../ide/stores/modules/terminal/messages.js | 4 +- .../import_projects/store/actions.js | 4 +- .../javascripts/lib/utils/http_status.js | 56 +++++++++---------- app/assets/javascripts/lib/utils/poll.js | 4 +- .../javascripts/monitoring/requests/index.js | 9 ++- .../notes/components/comment_form.vue | 6 +- .../notes/components/noteable_note.vue | 4 +- .../javascripts/self_monitor/store/actions.js | 8 +-- .../components/deployment/memory_usage.vue | 6 +- .../extensions/code_quality/index.js | 4 +- .../work_item_links/work_item_link_child.vue | 12 +++- .../work_item_link_child_metadata.vue | 39 ++++++++++--- ...ork_item_metadata_widgets.fragment.graphql | 4 ++ app/assets/stylesheets/utilities.scss | 6 -- app/helpers/todos_helper.rb | 4 +- app/models/todo.rb | 4 ++ .../json_schemas/web_hooks_url_variables.json | 2 +- app/views/dashboard/todos/_todo.html.haml | 11 ++-- app/views/shared/file_hooks/_index.html.haml | 21 +++---- ...multiple_environment_approval_rules_fe.yml | 8 +++ doc/api/todos.md | 14 ++--- doc/development/code_review.md | 2 + doc/development/gemfile.md | 3 +- .../service_ping/metrics_dictionary.md | 19 +++++-- doc/user/project/import/github.md | 2 + lefthook.yml | 2 +- lib/api/entities/todo.rb | 1 + .../import_export/json/legacy_reader.rb | 2 +- lib/gitlab/import_export/lfs_restorer.rb | 2 +- lib/tasks/gitlab/assets.rake | 2 +- locale/gitlab.pot | 31 +++++++++- qa/qa/page/project/import/github.rb | 5 +- .../import/import_github_repo_spec.rb | 2 +- .../import_github_repo_spec.rb | 22 +------- .../import/github_import_shared_context.rb | 12 +--- results.txt | 0 scripts/review_apps/base-config.yaml | 4 +- spec/factories/todos.rb | 4 ++ spec/features/dashboard/todos/todos_spec.rb | 24 ++++++++ .../import_export/export_file_spec.rb | 4 +- .../mock_window_location_helper.js | 6 ++ .../alerts_settings_wrapper_spec.js | 4 +- spec/frontend/api_spec.js | 20 ++++--- .../captcha_modal_axios_interceptor_spec.js | 11 ++-- .../feature_highlight_helper_spec.js | 6 +- .../modules/terminal/actions/checks_spec.js | 4 +- .../terminal/actions/session_controls_spec.js | 4 +- .../stores/modules/terminal/messages_spec.js | 4 +- .../components/invite_members_modal_spec.js | 14 ++--- .../lib/utils/poll_until_complete_spec.js | 4 +- .../monitoring/requests/index_spec.js | 19 ++++--- .../frontend/monitoring/store/actions_spec.js | 11 ++-- .../self_monitor/store/actions_spec.js | 6 +- .../extensions/test_report/index_spec.js | 4 +- .../extentions/code_quality/index_spec.js | 4 +- .../work_item_link_child_metadata_spec.js | 15 ++++- .../work_item_link_child_spec.js | 1 + spec/frontend/work_items/mock_data.js | 5 ++ spec/helpers/todos_helper_spec.rb | 23 ++++++-- spec/lib/backup/gitaly_backup_spec.rb | 2 +- .../group/legacy_tree_restorer_spec.rb | 2 +- .../group/legacy_tree_saver_spec.rb | 2 +- .../import_export/group/tree_restorer_spec.rb | 2 +- .../import_test_coverage_spec.rb | 2 +- .../import_export/json/legacy_writer_spec.rb | 2 +- .../gitlab/import_export/lfs_saver_spec.rb | 2 +- .../project/relation_saver_spec.rb | 2 +- spec/models/group_spec.rb | 2 +- spec/models/hooks/web_hook_spec.rb | 4 +- spec/models/todo_spec.rb | 20 +++++++ spec/requests/api/todos_spec.rb | 18 +++++- spec/support/helpers/gitaly_setup.rb | 2 +- spec/support/import_export/common_util.rb | 4 +- 80 files changed, 414 insertions(+), 245 deletions(-) create mode 100644 config/feature_flags/development/multiple_environment_approval_rules_fe.yml rename qa/qa/specs/features/browser_ui/1_manage/{project => import}/import_github_repo_spec.rb (76%) delete mode 100644 results.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3834af822ea..2062953c9ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,11 +37,6 @@ workflow: - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^release-tools\/\d+\.\d+\.\d+-rc\d+$/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee)?$/ && $CI_PROJECT_PATH == "gitlab-org/gitlab"' when: never # For merge requests running exclusively in Ruby 3.0 - - if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3/' - variables: - RUBY_VERSION: "3.0" - PIPELINE_NAME: 'Ruby 3 $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline' - # For merge requests running exclusively in Ruby 3.0 - if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby3/' variables: RUBY_VERSION: "3.0" diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index b2fbd92af5f..8b7aee8de9d 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -197,8 +197,7 @@ - "spec/support/gitlab-git-test.git/**/*" .yaml-lint-patterns: &yaml-lint-patterns - - "*.yml" - - "**/*.yml" + - "**/*.{yml,yaml}{,.*}" .lint-pipeline-yaml-patterns: &lint-pipeline-yaml-patterns - ".gitlab-ci.yml" diff --git a/.rubocop_todo/security/io_methods.yml b/.rubocop_todo/security/io_methods.yml index 6138ca7ef3f..936bb21d5dc 100644 --- a/.rubocop_todo/security/io_methods.yml +++ b/.rubocop_todo/security/io_methods.yml @@ -4,21 +4,3 @@ Security/IoMethods: Details: grace period Exclude: - 'db/migrate/20210301200959_init_schema.rb' - - 'ee/lib/tasks/gitlab/spdx.rake' - - 'ee/spec/factories/spdx_catalogue.rb' - - 'ee/spec/lib/ee/gitlab/import_export/group/legacy_tree_saver_spec.rb' - - 'ee/spec/lib/gitlab/spdx/catalogue_spec.rb' - - 'lib/gitlab/import_export/json/legacy_reader.rb' - - 'lib/gitlab/import_export/lfs_restorer.rb' - - 'lib/tasks/gitlab/assets.rake' - - 'spec/features/projects/import_export/export_file_spec.rb' - - 'spec/lib/backup/gitaly_backup_spec.rb' - - 'spec/lib/gitlab/import_export/group/legacy_tree_restorer_spec.rb' - - 'spec/lib/gitlab/import_export/group/legacy_tree_saver_spec.rb' - - 'spec/lib/gitlab/import_export/group/tree_restorer_spec.rb' - - 'spec/lib/gitlab/import_export/import_test_coverage_spec.rb' - - 'spec/lib/gitlab/import_export/json/legacy_writer_spec.rb' - - 'spec/lib/gitlab/import_export/lfs_saver_spec.rb' - - 'spec/lib/gitlab/import_export/project/relation_saver_spec.rb' - - 'spec/support/helpers/gitaly_setup.rb' - - 'spec/support/import_export/common_util.rb' diff --git a/.yamllint b/.yamllint index 4a9dd9c56bd..5b49a617a57 100644 --- a/.yamllint +++ b/.yamllint @@ -2,6 +2,15 @@ extends: default +yaml-files: + # defaults + - '*.yaml' + - '*.yml' + - '.yamllint' + # match more extensions + - '*.yaml.*' + - '*.yml.*' + # Ideally, we should have nothing in this ignore section. # # Please consider removing entries below by fixing them. @@ -19,6 +28,16 @@ ignore: | # Broken on purpose (for testing) spec/fixtures/lib/gitlab/metrics/dashboard/broken_yml_syntax.yml + # Dynamic YAML files have syntax errors sometimes. + *.erb + + # Vim temporary files. + *.sw[pon] + + # Zipped files (by e.g. asset pipeline) + *.gz + *.bz2 + #### Folders #### node_modules/ tmp/ diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 8cadd4a1fa8..6d1350d6745 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -38812995ea07e43b12b4151c24bf6b960a70f74d +6d9ffab522aae0f2fac5d3ff152064f56b01081d diff --git a/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue b/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue index 9d8cb40b60a..661389f4059 100644 --- a/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue +++ b/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue @@ -13,7 +13,7 @@ import { } from '@gitlab/ui'; import * as Sentry from '@sentry/browser'; import Api, { DEFAULT_PER_PAGE } from '~/api'; -import httpStatusCodes from '~/lib/utils/http_status'; +import { HTTP_STATUS_PAYLOAD_TOO_LARGE } from '~/lib/utils/http_status'; import { __, s__, sprintf } from '~/locale'; import Tracking from '~/tracking'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; @@ -145,7 +145,7 @@ export default { let message = ''; if (error?.response?.data?.message?.name) { message = this.$options.i18n.uploadErrorMessages.duplicate; - } else if (error.response.status === httpStatusCodes.PAYLOAD_TOO_LARGE) { + } else if (error.response.status === HTTP_STATUS_PAYLOAD_TOO_LARGE) { message = sprintf(this.$options.i18n.uploadErrorMessages.tooLarge, { limit: this.fileSizeLimit, }); diff --git a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js index 91868132a5a..a510ec0847b 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js +++ b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js @@ -1,6 +1,6 @@ import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import httpStatus from '~/lib/utils/http_status'; +import httpStatus, { HTTP_STATUS_UNPROCESSABLE_ENTITY } from '~/lib/utils/http_status'; import * as terminalService from '../../../../services/terminals'; import { STARTING, STOPPING, STOPPED } from '../constants'; import * as messages from '../messages'; @@ -108,7 +108,7 @@ export const restartSession = ({ state, dispatch, rootState }) => { // We may have removed the build, in this case we'll just create a new session if ( responseStatus === httpStatus.NOT_FOUND || - responseStatus === httpStatus.UNPROCESSABLE_ENTITY + responseStatus === HTTP_STATUS_UNPROCESSABLE_ENTITY ) { dispatch('startSession'); } else { diff --git a/app/assets/javascripts/ide/stores/modules/terminal/messages.js b/app/assets/javascripts/ide/stores/modules/terminal/messages.js index ec05ca84754..fa1c7f23677 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal/messages.js +++ b/app/assets/javascripts/ide/stores/modules/terminal/messages.js @@ -1,5 +1,5 @@ import { escape } from 'lodash'; -import httpStatus from '~/lib/utils/http_status'; +import httpStatus, { HTTP_STATUS_UNPROCESSABLE_ENTITY } from '~/lib/utils/http_status'; import { __, sprintf } from '~/locale'; export const UNEXPECTED_ERROR_CONFIG = __( @@ -28,7 +28,7 @@ export const ERROR_PERMISSION = __( ); export const configCheckError = (status, helpUrl) => { - if (status === httpStatus.UNPROCESSABLE_ENTITY) { + if (status === HTTP_STATUS_UNPROCESSABLE_ENTITY) { return sprintf( ERROR_CONFIG, { diff --git a/app/assets/javascripts/import_entities/import_projects/store/actions.js b/app/assets/javascripts/import_entities/import_projects/store/actions.js index 51ac8c273c7..e0db585eb3e 100644 --- a/app/assets/javascripts/import_entities/import_projects/store/actions.js +++ b/app/assets/javascripts/import_entities/import_projects/store/actions.js @@ -3,7 +3,7 @@ import _ from 'lodash'; import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import httpStatusCodes from '~/lib/utils/http_status'; +import { HTTP_STATUS_TOO_MANY_REQUESTS } from '~/lib/utils/http_status'; import Poll from '~/lib/utils/poll'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { visitUrl, objectToQuery } from '~/lib/utils/url_utility'; @@ -16,7 +16,7 @@ let eTagPoll; const hasRedirectInError = (e) => e?.response?.data?.error?.redirect; const redirectToUrlInError = (e) => visitUrl(e.response.data.error.redirect); -const tooManyRequests = (e) => e.response.status === httpStatusCodes.TOO_MANY_REQUESTS; +const tooManyRequests = (e) => e.response.status === HTTP_STATUS_TOO_MANY_REQUESTS; const pathWithParams = ({ path, ...params }) => { const filteredParams = Object.fromEntries( Object.entries(params).filter(([, value]) => value !== ''), diff --git a/app/assets/javascripts/lib/utils/http_status.js b/app/assets/javascripts/lib/utils/http_status.js index c5190592bb6..ec0d8d433a5 100644 --- a/app/assets/javascripts/lib/utils/http_status.js +++ b/app/assets/javascripts/lib/utils/http_status.js @@ -1,45 +1,43 @@ -/** - * exports HTTP status codes - */ +export const HTTP_STATUS_ABORTED = 0; +export const HTTP_STATUS_CREATED = 201; +export const HTTP_STATUS_ACCEPTED = 202; +export const HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION = 203; +export const HTTP_STATUS_NO_CONTENT = 204; +export const HTTP_STATUS_RESET_CONTENT = 205; +export const HTTP_STATUS_PARTIAL_CONTENT = 206; +export const HTTP_STATUS_MULTI_STATUS = 207; +export const HTTP_STATUS_ALREADY_REPORTED = 208; +export const HTTP_STATUS_IM_USED = 226; +export const HTTP_STATUS_METHOD_NOT_ALLOWED = 405; +export const HTTP_STATUS_CONFLICT = 409; +export const HTTP_STATUS_GONE = 410; +export const HTTP_STATUS_PAYLOAD_TOO_LARGE = 413; +export const HTTP_STATUS_UNPROCESSABLE_ENTITY = 422; +export const HTTP_STATUS_TOO_MANY_REQUESTS = 429; +// TODO move the rest of the status codes to primitive constants +// https://docs.gitlab.com/ee/development/fe_guide/style/javascript.html#export-constants-as-primitives const httpStatusCodes = { - ABORTED: 0, OK: 200, - CREATED: 201, - ACCEPTED: 202, - NON_AUTHORITATIVE_INFORMATION: 203, - NO_CONTENT: 204, - RESET_CONTENT: 205, - PARTIAL_CONTENT: 206, - MULTI_STATUS: 207, - ALREADY_REPORTED: 208, - IM_USED: 226, - MULTIPLE_CHOICES: 300, BAD_REQUEST: 400, UNAUTHORIZED: 401, FORBIDDEN: 403, NOT_FOUND: 404, - METHOD_NOT_ALLOWED: 405, - CONFLICT: 409, - GONE: 410, - PAYLOAD_TOO_LARGE: 413, - UNPROCESSABLE_ENTITY: 422, - TOO_MANY_REQUESTS: 429, INTERNAL_SERVER_ERROR: 500, SERVICE_UNAVAILABLE: 503, }; export const successCodes = [ httpStatusCodes.OK, - httpStatusCodes.CREATED, - httpStatusCodes.ACCEPTED, - httpStatusCodes.NON_AUTHORITATIVE_INFORMATION, - httpStatusCodes.NO_CONTENT, - httpStatusCodes.RESET_CONTENT, - httpStatusCodes.PARTIAL_CONTENT, - httpStatusCodes.MULTI_STATUS, - httpStatusCodes.ALREADY_REPORTED, - httpStatusCodes.IM_USED, + HTTP_STATUS_CREATED, + HTTP_STATUS_ACCEPTED, + HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION, + HTTP_STATUS_NO_CONTENT, + HTTP_STATUS_RESET_CONTENT, + HTTP_STATUS_PARTIAL_CONTENT, + HTTP_STATUS_MULTI_STATUS, + HTTP_STATUS_ALREADY_REPORTED, + HTTP_STATUS_IM_USED, ]; export default httpStatusCodes; diff --git a/app/assets/javascripts/lib/utils/poll.js b/app/assets/javascripts/lib/utils/poll.js index 71782c9a4ce..73add1e37ee 100644 --- a/app/assets/javascripts/lib/utils/poll.js +++ b/app/assets/javascripts/lib/utils/poll.js @@ -1,5 +1,5 @@ import { normalizeHeaders } from './common_utils'; -import httpStatusCodes, { successCodes } from './http_status'; +import { HTTP_STATUS_ABORTED, successCodes } from './http_status'; /** * Polling utility for handling realtime updates. @@ -108,7 +108,7 @@ export default class Poll { }) .catch((error) => { notificationCallback(false); - if (error.status === httpStatusCodes.ABORTED) { + if (error.status === HTTP_STATUS_ABORTED) { return; } errorCallback(error); diff --git a/app/assets/javascripts/monitoring/requests/index.js b/app/assets/javascripts/monitoring/requests/index.js index 26fedb9c81c..8b65eec051f 100644 --- a/app/assets/javascripts/monitoring/requests/index.js +++ b/app/assets/javascripts/monitoring/requests/index.js @@ -1,13 +1,16 @@ import axios from '~/lib/utils/axios_utils'; import { backOff } from '~/lib/utils/common_utils'; -import statusCodes from '~/lib/utils/http_status'; +import statusCodes, { + HTTP_STATUS_NO_CONTENT, + HTTP_STATUS_UNPROCESSABLE_ENTITY, +} from '~/lib/utils/http_status'; import { PROMETHEUS_TIMEOUT } from '../constants'; const cancellableBackOffRequest = (makeRequestCallback) => backOff((next, stop) => { makeRequestCallback() .then((resp) => { - if (resp.status === statusCodes.NO_CONTENT) { + if (resp.status === HTTP_STATUS_NO_CONTENT) { next(); } else { stop(resp); @@ -34,7 +37,7 @@ export const getPrometheusQueryData = (prometheusEndpoint, params, opts) => const { response = {} } = error; if ( response.status === statusCodes.BAD_REQUEST || - response.status === statusCodes.UNPROCESSABLE_ENTITY || + response.status === HTTP_STATUS_UNPROCESSABLE_ENTITY || response.status === statusCodes.SERVICE_UNAVAILABLE ) { const { data } = response; diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 0d7ff022f8f..2ccb9a0b514 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -7,7 +7,7 @@ import Autosave from '~/autosave'; import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; import { createAlert } from '~/flash'; import { badgeState } from '~/issuable/components/status_box.vue'; -import httpStatusCodes from '~/lib/utils/http_status'; +import { HTTP_STATUS_UNPROCESSABLE_ENTITY } from '~/lib/utils/http_status'; import { capitalizeFirstCharacter, convertToCamelCase, @@ -28,8 +28,6 @@ import CommentTypeDropdown from './comment_type_dropdown.vue'; import DiscussionLockedWidget from './discussion_locked_widget.vue'; import NoteSignedOutWidget from './note_signed_out_widget.vue'; -const { UNPROCESSABLE_ENTITY } = httpStatusCodes; - export default { name: 'CommentForm', i18n: COMMENT_FORM, @@ -198,7 +196,7 @@ export default { 'toggleIssueLocalState', ]), handleSaveError({ data, status }) { - if (status === UNPROCESSABLE_ENTITY && data.errors?.commands_only?.length) { + if (status === HTTP_STATUS_UNPROCESSABLE_ENTITY && data.errors?.commands_only?.length) { this.errors = data.errors.commands_only; } else { this.errors = [this.$options.i18n.GENERIC_UNSUBMITTABLE_NETWORK]; diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 7a73278bf7b..826e7e5a3d0 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -7,7 +7,7 @@ import SafeHtml from '~/vue_shared/directives/safe_html'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; import { INLINE_DIFF_LINES_KEY } from '~/diffs/constants'; import { createAlert } from '~/flash'; -import httpStatusCodes from '~/lib/utils/http_status'; +import { HTTP_STATUS_GONE } from '~/lib/utils/http_status'; import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending'; import { truncateSha } from '~/lib/utils/text_utility'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; @@ -338,7 +338,7 @@ export default { callback(); }) .catch((response) => { - if (response.status === httpStatusCodes.GONE) { + if (response.status === HTTP_STATUS_GONE) { this.removeNote(this.note); this.updateSuccess(); callback(); diff --git a/app/assets/javascripts/self_monitor/store/actions.js b/app/assets/javascripts/self_monitor/store/actions.js index 5b9e994290c..7198dbe8b04 100644 --- a/app/assets/javascripts/self_monitor/store/actions.js +++ b/app/assets/javascripts/self_monitor/store/actions.js @@ -1,6 +1,6 @@ import axios from '~/lib/utils/axios_utils'; import { backOff } from '~/lib/utils/common_utils'; -import statusCodes from '~/lib/utils/http_status'; +import statusCodes, { HTTP_STATUS_ACCEPTED } from '~/lib/utils/http_status'; import { __, s__ } from '~/locale'; import * as types from './mutation_types'; @@ -10,7 +10,7 @@ function backOffRequest(makeRequestCallback) { return backOff((next, stop) => { makeRequestCallback() .then((resp) => { - if (resp.status === statusCodes.ACCEPTED) { + if (resp.status === HTTP_STATUS_ACCEPTED) { next(); } else { stop(resp); @@ -31,7 +31,7 @@ export const requestCreateProject = ({ dispatch, state, commit }) => { axios .post(state.createProjectEndpoint) .then((resp) => { - if (resp.status === statusCodes.ACCEPTED) { + if (resp.status === HTTP_STATUS_ACCEPTED) { dispatch('requestCreateProjectStatus', resp.data.job_id); } }) @@ -83,7 +83,7 @@ export const requestDeleteProject = ({ dispatch, state, commit }) => { axios .delete(state.deleteProjectEndpoint) .then((resp) => { - if (resp.status === statusCodes.ACCEPTED) { + if (resp.status === HTTP_STATUS_ACCEPTED) { dispatch('requestDeleteProjectStatus', resp.data.job_id); } }) diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue index 1256b3a8e52..c7d34d45f06 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue @@ -1,7 +1,7 @@