diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-14 00:10:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-14 00:10:09 +0000 |
| commit | 8aea332821a78e83ce93f5b3bac7de5f95a3c7b8 (patch) | |
| tree | 722cb345de067f3b62bbe0f849178c74dec657eb /config | |
| parent | 4f4b85e1c7f7a5518f12a6981709cf3ef3f0f653 (diff) | |
| download | gitlab-ce-8aea332821a78e83ce93f5b3bac7de5f95a3c7b8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/dependency_decisions.yml | 6 | ||||
| -rw-r--r-- | config/feature_flags/development/admin_jobs_vue.yml | 8 | ||||
| -rw-r--r-- | config/webpack.vendor.config.js | 1 |
4 files changed, 8 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb index 2d97bb1c0af..c6ecfcc0cb1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -336,7 +336,6 @@ module Gitlab config.assets.precompile << "page_bundles/work_items.css" config.assets.precompile << "page_bundles/xterm.css" config.assets.precompile << "lazy_bundles/cropper.css" - config.assets.precompile << "lazy_bundles/select2.css" config.assets.precompile << "lazy_bundles/gridstack.css" config.assets.precompile << "performance_bar.css" config.assets.precompile << "disable_animations.css" diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 9afa2b6fca3..959d6f23156 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -127,12 +127,6 @@ :versions: [] :when: 2017-01-14 20:50:20.037775000 Z - - :approve - - select2 - - :who: Matt Lee - :why: https://github.com/select2/select2/blob/master/LICENSE.md - :versions: [] - :when: 2017-01-14 20:10:53.909618000 Z -- - :approve - opener - :who: Mike Greiling :why: https://github.com/domenic/opener/blob/1.4.3/LICENSE.txt diff --git a/config/feature_flags/development/admin_jobs_vue.yml b/config/feature_flags/development/admin_jobs_vue.yml new file mode 100644 index 00000000000..3c8402a83f4 --- /dev/null +++ b/config/feature_flags/development/admin_jobs_vue.yml @@ -0,0 +1,8 @@ +--- +name: admin_jobs_vue +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98769 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391194 +milestone: '15.9' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js index 1300bf16e56..a43febe5e25 100644 --- a/config/webpack.vendor.config.js +++ b/config/webpack.vendor.config.js @@ -37,7 +37,6 @@ module.exports = { 'mermaid', 'katex', 'three', - 'select2', 'moment-mini', 'dompurify', 'bootstrap/dist/js/bootstrap.js', |