diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 21:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 21:09:34 +0300 |
| commit | 53d77359a0e6bf78bfc8ef8c72995eebe1f9e63b (patch) | |
| tree | 444eb2851a18271c20ea6fd23fab0b02b7e4d9b2 /config | |
| parent | dd7da8bd31926a1210011856f7d66ee43fa65156 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/restrict_merge_status_recheck.yml | 8 | ||||
| -rw-r--r-- | config/feature_flags/ops/s3_multithreaded_uploads.yml (renamed from config/feature_flags/development/s3_multithreaded_uploads.yml) | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/config/feature_flags/development/restrict_merge_status_recheck.yml b/config/feature_flags/development/restrict_merge_status_recheck.yml new file mode 100644 index 00000000000..6be7ed73214 --- /dev/null +++ b/config/feature_flags/development/restrict_merge_status_recheck.yml @@ -0,0 +1,8 @@ +--- +name: restrict_merge_status_recheck +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115948 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404567 +milestone: '15.11' +type: development +group: group::code review +default_enabled: false diff --git a/config/feature_flags/development/s3_multithreaded_uploads.yml b/config/feature_flags/ops/s3_multithreaded_uploads.yml index f2019f53275..7f5b5cef658 100644 --- a/config/feature_flags/development/s3_multithreaded_uploads.yml +++ b/config/feature_flags/ops/s3_multithreaded_uploads.yml @@ -3,6 +3,6 @@ name: s3_multithreaded_uploads introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50922 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296772 milestone: '13.8' -type: development +type: ops group: group::pipeline security default_enabled: true diff --git a/config/webpack.config.js b/config/webpack.config.js index 1b2d87e453d..3da9913c820 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -322,9 +322,11 @@ if (EXPLICIT_VUE_VERSION) { if (USE_VUE3) { Object.assign(alias, { - vue: '@vue/compat', + // ensure we always use the same type of module for Vue + vue: '@vue/compat/dist/vue.runtime.esm-bundler.js', vuex: path.join(ROOT_PATH, 'app/assets/javascripts/lib/utils/vue3compat/vuex.js'), 'vue-apollo': path.join(ROOT_PATH, 'app/assets/javascripts/lib/utils/vue3compat/vue_apollo.js'), + 'vue-router': path.join(ROOT_PATH, 'app/assets/javascripts/lib/utils/vue3compat/vue_router.js'), }); vueLoaderOptions.compiler = require.resolve('./vue3migration/compiler'); |