diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/views/shared/namespaces | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/views/shared/namespaces')
3 files changed, 6 insertions, 3 deletions
diff --git a/app/views/shared/namespaces/cascading_settings/_enforcement_checkbox.html.haml b/app/views/shared/namespaces/cascading_settings/_enforcement_checkbox.html.haml index ab4d8816ec9..cfa87351689 100644 --- a/app/views/shared/namespaces/cascading_settings/_enforcement_checkbox.html.haml +++ b/app/views/shared/namespaces/cascading_settings/_enforcement_checkbox.html.haml @@ -1,9 +1,10 @@ - attribute = local_assigns.fetch(:attribute, nil) +- group = local_assigns.fetch(:group, nil) - form = local_assigns.fetch(:form, nil) - setting_locked = local_assigns.fetch(:setting_locked, false) - help_text = local_assigns.fetch(:help_text, s_('CascadingSettings|Subgroups cannot change this setting.')) -- return unless attribute && group && form && cascading_namespace_settings_enabled? +- return unless attribute && group && form - return if setting_locked - lock_attribute = "lock_#{attribute}" diff --git a/app/views/shared/namespaces/cascading_settings/_setting_label_checkbox.html.haml b/app/views/shared/namespaces/cascading_settings/_setting_label_checkbox.html.haml index d27b3641637..83d602aba21 100644 --- a/app/views/shared/namespaces/cascading_settings/_setting_label_checkbox.html.haml +++ b/app/views/shared/namespaces/cascading_settings/_setting_label_checkbox.html.haml @@ -1,10 +1,11 @@ - attribute = local_assigns.fetch(:attribute, nil) +- group = local_assigns.fetch(:group, nil) - settings_path_helper = local_assigns.fetch(:settings_path_helper, nil) - form = local_assigns.fetch(:form, nil) - setting_locked = local_assigns.fetch(:setting_locked, false) - help_text = local_assigns.fetch(:help_text, nil) -- return unless attribute && form && settings_path_helper +- return unless attribute && group && form && settings_path_helper = form.label attribute, class: 'custom-control-label', aria: { disabled: setting_locked } do = render 'shared/namespaces/cascading_settings/setting_label_container' do diff --git a/app/views/shared/namespaces/cascading_settings/_setting_label_fieldset.html.haml b/app/views/shared/namespaces/cascading_settings/_setting_label_fieldset.html.haml index 4a2ec9f30fd..66c760b466c 100644 --- a/app/views/shared/namespaces/cascading_settings/_setting_label_fieldset.html.haml +++ b/app/views/shared/namespaces/cascading_settings/_setting_label_fieldset.html.haml @@ -1,9 +1,10 @@ - attribute = local_assigns.fetch(:attribute, nil) +- group = local_assigns.fetch(:group, nil) - settings_path_helper = local_assigns.fetch(:settings_path_helper, nil) - setting_locked = local_assigns.fetch(:setting_locked, false) - help_text = local_assigns.fetch(:help_text, nil) -- return unless attribute && settings_path_helper +- return unless attribute && group && settings_path_helper %legend.h5.gl-border-none.gl-m-0 = render 'shared/namespaces/cascading_settings/setting_label_container' do |