diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 06:09:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 06:09:03 +0000 |
| commit | 99551d44588b9c815df9691c8e619eb8beaa0045 (patch) | |
| tree | e1244297818b544c6837b2eefc58f1fe288b8b90 /config | |
| parent | fe75b57542f67ae643d42e9ab7f317cedb51df71 (diff) | |
| download | gitlab-ce-99551d44588b9c815df9691c8e619eb8beaa0045.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/merge_request_reviewers.yml | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/vue_sidebar_labels.yml | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb index 3934afc11fe..75befc8a248 100644 --- a/config/application.rb +++ b/config/application.rb @@ -191,9 +191,11 @@ module Gitlab config.assets.precompile << "page_bundles/pipeline.css" config.assets.precompile << "page_bundles/pipelines.css" config.assets.precompile << "page_bundles/productivity_analytics.css" + config.assets.precompile << "page_bundles/terminal.css" config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/reports.css" config.assets.precompile << "page_bundles/xterm.css" + config.assets.precompile << "page_bundles/wiki.css" config.assets.precompile << "lazy_bundles/cropper.css" config.assets.precompile << "performance_bar.css" config.assets.precompile << "lib/ace.js" diff --git a/config/feature_flags/development/merge_request_reviewers.yml b/config/feature_flags/development/merge_request_reviewers.yml index 3ee4c1547aa..2180662b9df 100644 --- a/config/feature_flags/development/merge_request_reviewers.yml +++ b/config/feature_flags/development/merge_request_reviewers.yml @@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245190 group: group::source code type: development -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/vue_sidebar_labels.yml b/config/feature_flags/development/vue_sidebar_labels.yml deleted file mode 100644 index 4dbfa7aca73..00000000000 --- a/config/feature_flags/development/vue_sidebar_labels.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -name: vue_sidebar_labels -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41561 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263440 -group: group::project management -type: development -default_enabled: true |