Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial

1 files changed, 20 insertions, 0 deletions

diff --git a/app/views/projects/project_members/_new_project_group.html.haml b/app/views/projects/project_members/_new_project_group.html.haml
new file mode 100644
index 00000000000..74570769117
--- /dev/null
+++ b/app/views/projects/project_members/_new_project_group.html.haml
@@ -0,0 +1,20 @@
+.row
+  .col-sm-12
+    = form_tag project_group_links_path(@project), class: 'js-requires-input', method: :post do
+      .form-group
+        = label_tag :link_group_id, _("Select a group to invite"), class: "label-bold"
+        = groups_select_tag(:link_group_id, data: { skip_groups: @skip_groups }, class: "input-clamp", required: true)
+      .form-group
+        = label_tag :link_group_access, _("Max access level"), class: "label-bold"
+        .select-wrapper
+          = select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control select-control"
+          = icon('chevron-down')
+        .form-text.text-muted.append-bottom-10
+          = link_to _("Read more"), help_page_path("user/permissions"), class: "vlink"
+          about role permissions
+      .form-group
+        = label_tag :expires_at, _('Access expiration date'), class: 'label-bold'
+        .clearable-input
+          = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: _('Expiration date'), id: 'expires_at_groups'
+          %i.clear-icon.js-clear-input
+      = submit_tag _("Invite"), class: "btn btn-success"