Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 43 deletions

diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
index cc46484c05b..261f7af7ef1 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -524,36 +524,6 @@ export default {
           />
         </project-setting-row>
         <project-setting-row
-          v-if="registryAvailable"
-          ref="container-registry-settings"
-          :help-path="registryHelpPath"
-          :label="$options.i18n.containerRegistryLabel"
-          :help-text="
-            s__('ProjectSettings|Every project can have its own space to store its Docker images')
-          "
-        >
-          <div v-if="showContainerRegistryPublicNote" class="text-muted">
-            <gl-sprintf
-              :message="
-                s__(
-                  `ProjectSettings|Note: The container registry is always visible when a project is public and the container registry is set to '%{access_level_description}'`,
-                )
-              "
-            >
-              <template #access_level_description>{{
-                featureAccessLevelDescriptions[featureAccessLevel.EVERYONE]
-              }}</template>
-            </gl-sprintf>
-          </div>
-          <project-feature-setting
-            v-model="containerRegistryAccessLevel"
-            :options="repoFeatureAccessLevelOptions"
-            :disabled-input="!repositoryEnabled"
-            :label="$options.i18n.containerRegistryLabel"
-            name="project[project_feature_attributes][container_registry_access_level]"
-          />
-        </project-setting-row>
-        <project-setting-row
           v-if="lfsAvailable"
           ref="git-lfs-settings"
           :help-path="lfsHelpPath"
@@ -606,18 +576,47 @@ export default {
             name="project[packages_enabled]"
           />
         </project-setting-row>
+        <project-setting-row
+          ref="pipeline-settings"
+          :label="$options.i18n.ciCdLabel"
+          :help-text="s__('ProjectSettings|Build, test, and deploy your changes.')"
+        >
+          <project-feature-setting
+            v-model="buildsAccessLevel"
+            :label="$options.i18n.ciCdLabel"
+            :options="repoFeatureAccessLevelOptions"
+            :disabled-input="!repositoryEnabled"
+            name="project[project_feature_attributes][builds_access_level]"
+          />
+        </project-setting-row>
       </div>
       <project-setting-row
-        ref="pipeline-settings"
-        :label="$options.i18n.ciCdLabel"
-        :help-text="s__('ProjectSettings|Build, test, and deploy your changes.')"
+        v-if="registryAvailable"
+        ref="container-registry-settings"
+        :help-path="registryHelpPath"
+        :label="$options.i18n.containerRegistryLabel"
+        :help-text="
+          s__('ProjectSettings|Every project can have its own space to store its Docker images')
+        "
       >
+        <div v-if="showContainerRegistryPublicNote" class="text-muted">
+          <gl-sprintf
+            :message="
+              s__(
+                `ProjectSettings|Note: The container registry is always visible when a project is public and the container registry is set to '%{access_level_description}'`,
+              )
+            "
+          >
+            <template #access_level_description>{{
+              featureAccessLevelDescriptions[featureAccessLevel.EVERYONE]
+            }}</template>
+          </gl-sprintf>
+        </div>
         <project-feature-setting
-          v-model="buildsAccessLevel"
-          :label="$options.i18n.ciCdLabel"
-          :options="repoFeatureAccessLevelOptions"
-          :disabled-input="!repositoryEnabled"
-          name="project[project_feature_attributes][builds_access_level]"
+          v-model="containerRegistryAccessLevel"
+          :options="featureAccessLevelOptions"
+          :label="$options.i18n.containerRegistryLabel"
+          name="project[project_feature_attributes][container_registry_access_level]"
         />
       </project-setting-row>
       <project-setting-row
diff --git a/app/views/groups/settings/_lfs.html.haml b/app/views/groups/settings/_lfs.html.haml
index b16c9faafa4..1255a2901ea 100644
--- a/app/views/groups/settings/_lfs.html.haml
+++ b/app/views/groups/settings/_lfs.html.haml
@@ -6,8 +6,7 @@
 %p= s_('Check the %{docs_link_start}documentation%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe }
 
 .form-group.gl-mb-3
-  .gl-form-checkbox.custom-control.custom-checkbox
-    = f.check_box :lfs_enabled, checked: @group.lfs_enabled?, class: 'custom-control-input', data: { qa_selector: 'lfs_checkbox' }
-    = f.label :lfs_enabled, class: 'custom-control-label' do
-      = _('Allow projects within this group to use Git LFS')
-      %p.help-text= _('This setting can be overridden in each project.')
+  = f.gitlab_ui_checkbox_component :lfs_enabled,
+      _('Allow projects within this group to use Git LFS'),
+      help_text: _('This setting can be overridden in each project.'),
+      checkbox_options: { checked: @group.lfs_enabled?, data: { qa_selector: 'lfs_checkbox' } }