Automatic merge of gitlab-org/gitlab master

..._ide/settings/extension_marketplace_metadata_generator.rb

lib/web_ide/settings/main.rb

lib/web_ide/settings/settings_initializer.rb

package.json

...mponents/shared/work_item_sidebar_dropdown_widget_spec.js

...rontend/work_items/components/work_item_assignees_spec.js

spec/frontend/work_items/components/work_item_detail_spec.js

spec/frontend/work_items/components/work_item_labels_spec.js

...rontend/work_items/components/work_item_milestone_spec.js

spec/helpers/preferences_helper_spec.rb

spec/lib/web_ide/extension_marketplace_preset_spec.rb

spec/lib/web_ide/extension_marketplace_spec.rb

.../web_ide/settings/extension_marketplace_generator_spec.rb

...settings/extension_marketplace_home_url_generator_spec.rb

...settings/extension_marketplace_metadata_generator_spec.rb

.../web_ide/settings/extension_marketplace_validator_spec.rb

spec/lib/web_ide/settings/main_spec.rb

spec/lib/web_ide/settings/settings_initializer_spec.rb

spec/lib/web_ide/settings/settings_integration_spec.rb

spec/models/hooks/web_hook_log_spec.rb