Skip to content
Snippets Groups Projects

Prepare 11.0 RC6 EE release

Merged Alessio Caiazza requested to merge 11-0-stable-ee-prepare-rc6 into 11-0-stable-ee
2 files
+ 6
4
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -36,7 +36,7 @@ def enabled_project_button(project, protocol)
# Return a group of checkboxes that use Bootstrap's button plugin for a
# toggle button effect.
def restricted_level_checkboxes(help_block_id, checkbox_name)
def restricted_level_checkboxes(help_block_id, checkbox_name, options = {})
Gitlab::VisibilityLevel.values.map do |level|
checked = restricted_visibility_levels(true).include?(level)
css_class = checked ? 'active' : ''
@@ -46,6 +46,7 @@ def restricted_level_checkboxes(help_block_id, checkbox_name)
check_box_tag(checkbox_name, level, checked,
autocomplete: 'off',
'aria-describedby' => help_block_id,
'class' => options[:class],
id: tag_name) + visibility_level_icon(level) + visibility_level_label(level)
end
end
@@ -53,7 +54,7 @@ def restricted_level_checkboxes(help_block_id, checkbox_name)
# Return a group of checkboxes that use Bootstrap's button plugin for a
# toggle button effect.
def import_sources_checkboxes(help_block_id)
def import_sources_checkboxes(help_block_id, options = {})
Gitlab::ImportSources.options.map do |name, source|
checked = Gitlab::CurrentSettings.import_sources.include?(source)
css_class = checked ? 'active' : ''
@@ -63,6 +64,7 @@ def import_sources_checkboxes(help_block_id)
check_box_tag(checkbox_name, source, checked,
autocomplete: 'off',
'aria-describedby' => help_block_id,
'class' => options[:class],
id: name.tr(' ', '_')) + name
end
end
Loading