diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml index 48d8d8ecb2d..137db656787 100644 --- a/.gitlab/ci/qa-common/main.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml @@ -6,7 +6,7 @@ workflow: include: - project: gitlab-org/quality/pipeline-common - ref: 5.1.1 + ref: 5.2.1 file: - /ci/base.gitlab-ci.yml - /ci/allure-report.yml diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index c8b9aa54afb..f55950d56b4 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -33,6 +33,7 @@ variables: FF_NETWORK_PER_BUILD: 1 GDK_URL: http://gdk.test:3000 before_script: + - echo "SUITE_RAN=true" > suite_status.env - echo -e "\e[0Ksection_start:`date +%s`:pull_image\r\e[0KPull GDK QA image" - docker pull ${GDK_IMAGE} - echo -e "\e[0Ksection_end:`date +%s`:pull_image\r\e[0K" @@ -55,7 +56,6 @@ variables: - cd qa && bundle install - retry_exponential test_url ${GDK_URL}/users/sign_in - echo -e "\e[0Ksection_end:`date +%s`:launch_gdk\r\e[0K" - - echo "SUITE_RAN=true" > suite_status.env script: - echo -e "\e[0Ksection_start:`date +%s`:run_tests\r\e[0KRun E2E tests" - QA_COMMAND="bundle exec bin/qa Test::Instance::All ${GDK_URL} -- ${RSPEC_TAGS} ${RSPEC_REPORT_OPTS}" diff --git a/app/assets/javascripts/design_management/mixins/all_designs.js b/app/assets/javascripts/design_management/mixins/all_designs.js index b182e68260a..5e520f791ad 100644 --- a/app/assets/javascripts/design_management/mixins/all_designs.js +++ b/app/assets/javascripts/design_management/mixins/all_designs.js @@ -43,7 +43,7 @@ export default { }); this.$router.replace({ name: DESIGNS_ROUTE_NAME, query: { version: undefined } }); } - if (this.designCollection.copyState === 'ERROR') { + if (this.designCollection?.copyState === 'ERROR') { createAlert({ message: s__( 'DesignManagement|There was an error moving your designs. Please upload your designs below.', diff --git a/app/assets/javascripts/design_management/pages/index.vue b/app/assets/javascripts/design_management/pages/index.vue index dcc65c957fe..50ddf961040 100644 --- a/app/assets/javascripts/design_management/pages/index.vue +++ b/app/assets/javascripts/design_management/pages/index.vue @@ -38,6 +38,11 @@ import { } from '../utils/error_messages'; import { trackDesignCreate, trackDesignUpdate } from '../utils/tracking'; +export const i18n = { + dropzoneDescriptionText: __('Drag your designs here or %{linkStart}click to upload%{linkEnd}.'), + designLoadingError: __('An error occurred while loading designs. Please try again.'), +}; + export default { components: { GlLoadingIcon, @@ -346,9 +351,7 @@ export default { animation: 200, ghostClass: 'gl-visibility-hidden', }, - i18n: { - dropzoneDescriptionText: __('Drag your designs here or %{linkStart}click to upload%{linkEnd}.'), - }, + i18n, }; @@ -427,7 +430,7 @@ export default {
- {{ __('An error occurred while loading designs. Please try again.') }} + {{ $options.i18n.designLoadingError }}
Cookies.get(name); export const removeCookie = (name) => Cookies.remove(name); -/** - * Returns the status of a feature flag. - * Currently, there is no way to access feature - * flags in Vuex other than directly tapping into - * window.gon. - * - * This should only be used on Vuex. If feature flags - * need to be accessed in Vue components consider - * using the Vue feature flag mixin. - * - * @param {String} flag Feature flag - * @returns {Boolean} on/off - */ -export const isFeatureFlagEnabled = (flag) => window.gon.features?.[flag]; - /** * This method takes in array with snake_case strings * and returns a new array with camelCase strings diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue index 30cd9fa752f..e1c54a8827c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue @@ -1,27 +1,14 @@