Apply changes since nested group changes

3 files changed, 21 insertions, 39 deletions

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 212bbcdddc8..4ca5683b628 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -291,6 +291,10 @@
     i {
       margin: 2px 0;
       font-size: 20px;
+
+      &.private {
+        color: $red-500;
+      }
     }
 
     .option-title {
@@ -303,10 +307,6 @@
       margin-left: 29px;
       color: $project-option-descr-color;
     }
-
-    .private {
-      color: $red-500;
-    }
   }
 }
 
diff --git a/app/views/groups/_group_lfs_settings.html.haml b/app/views/groups/_group_lfs_settings.html.haml
deleted file mode 100644
index 9df36eb5827..00000000000
--- a/app/views/groups/_group_lfs_settings.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-- if current_user.admin?
-  .form-group.col-xs-12
-    .checkbox
-      = f.label :lfs_enabled do
-        = f.check_box :lfs_enabled, checked: @group.lfs_enabled?
-        %strong
-          Allow projects within this group to use Git LFS
-          = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
-        %br/
-        %span.descr This setting can be overridden in each project.
diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml
index 50f432880f9..b364ffe6435 100644
--- a/app/views/shared/_group_form.html.haml
+++ b/app/views/shared/_group_form.html.haml
@@ -6,27 +6,19 @@
 
 .form-group.col-xs-12
   = f.label :path, class: 'label-light' do
-    %span Group path
-  .col-sm-10
-    .input-group.gl-field-error-anchor
-      .group-root-path.input-group-addon.has-tooltip{ title: group_path, :'data-placement' => 'bottom' }
-        %span>= root_url
-        - if parent
-          %strong= parent.full_path + '/'
-      = f.text_field :path, placeholder: 'open-source', class: 'form-control',
-        autofocus: local_assigns[:autofocus] || false, required: true,
-        pattern: Gitlab::Regex::NAMESPACE_REGEX_STR_JS,
-        title: 'Please choose a group path with no special characters.',
-        "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}"
+    Group path
+  .input-group.gl-field-error-anchor
+    .group-root-path.input-group-addon.has-tooltip{ title: group_path, :'data-placement' => 'bottom' }
+      %span>= root_url
       - if parent
         %strong= parent.full_path + '/'
-    = f.text_field :path, placeholder: 'open-source', class: 'form-control',
+    = f.text_field :path, placeholder: 'group-path', class: 'form-control',
       autofocus: local_assigns[:autofocus] || false, required: true,
       pattern: Gitlab::Regex::NAMESPACE_REGEX_STR_JS,
-      title: 'Please choose a group name with no special characters.',
+      title: 'Please choose a group path with no special characters.',
       "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}"
-    - if parent
-      = f.hidden_field :parent_id, value: parent.id
+  - if parent
+    = f.hidden_field :parent_id, value: parent.id
 
   - if @group.persisted?
     .alert.alert-warning.prepend-top-10
@@ -37,15 +29,15 @@
         %li It will change the git path to repositories under this group.
 
 .form-group.group-name-holder.col-xs-12
-  = f.label :name, class: 'control-label' do
+  = f.label :name, class: 'label-light' do
     Group name
-  .col-sm-10
-    = f.text_field :name, class: 'form-control',
-      required: true,
-      title: 'You can choose a descriptive name different from the path.'
+  = f.text_field :name, placeholder: 'Group name', class: 'form-control',
+    required: true,
+    title: 'You can choose a descriptive name different from the path.'
 
 .form-group.group-description-holder.col-xs-12
-  = f.label :description, class: 'control-label'
-  .col-sm-10
-    = f.text_area :description, maxlength: 250,
-        class: 'form-control js-gfm-input', rows: 4
+  = f.label :description, class: 'label-light' do
+    Description
+    %span.hint (optional)
+  = f.text_area :description, maxlength: 250,
+      class: 'form-control js-gfm-input', rows: 4