diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 21:11:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 21:11:43 +0300 |
| commit | bc75527dca77b2b72331ac6cbd5928d5b8c0c419 (patch) | |
| tree | 000196faadb05f6e2ff60c08865b1a09506e5522 /config | |
| parent | c82ca12a1c5a359325cb45aaf01b483d1fa0efcb (diff) | |
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/async_pages_move_namespace_rename.yml | 7 | ||||
| -rw-r--r-- | config/feature_flags/development/async_pages_move_namespace_transfer.yml | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 3fd9ce39bb9..7b14da08056 100644 --- a/config/application.rb +++ b/config/application.rb @@ -176,7 +176,9 @@ module Gitlab config.assets.precompile << "mailer_client_specific.css" config.assets.precompile << "notify.css" config.assets.precompile << "mailers/*.css" + config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css" config.assets.precompile << "page_bundles/ide.css" + config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/xterm.css" config.assets.precompile << "performance_bar.css" config.assets.precompile << "lib/ace.js" diff --git a/config/feature_flags/development/async_pages_move_namespace_rename.yml b/config/feature_flags/development/async_pages_move_namespace_rename.yml new file mode 100644 index 00000000000..f968710508b --- /dev/null +++ b/config/feature_flags/development/async_pages_move_namespace_rename.yml @@ -0,0 +1,7 @@ +--- +name: async_pages_move_namespace_rename +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40259 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235808 +group: team::Scalability +type: development +default_enabled: false diff --git a/config/feature_flags/development/async_pages_move_namespace_transfer.yml b/config/feature_flags/development/async_pages_move_namespace_transfer.yml new file mode 100644 index 00000000000..2bcb4aca83a --- /dev/null +++ b/config/feature_flags/development/async_pages_move_namespace_transfer.yml @@ -0,0 +1,7 @@ +--- +name: async_pages_move_namespace_transfer +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40259 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235808 +group: team::Scalability +type: development +default_enabled: false |