Add latest changes from gitlab-org/gitlab@master

3 files changed, 18 insertions, 20 deletions

diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml
index b08a549148d..c091a2180c5 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -54,10 +54,10 @@
         - dormant_users_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: dormant_users_help_link }
         = f.gitlab_ui_checkbox_component :deactivate_dormant_users, _('Deactivate dormant users after a period of inactivity'), help_text: _('Users can reactivate their account by signing in. %{link_start}Learn more.%{link_end}').html_safe % { link_start: dormant_users_help_link_start, link_end: '</a>'.html_safe }
         .form-group
-          = f.label :deactivate_dormant_users_period, _('Period of inactivity (days)'), class: 'label-light'
-          = f.number_field :deactivate_dormant_users_period, class: 'form-control gl-form-input', min: '1'
+          = f.label :deactivate_dormant_users_period, _('Days of inactivity before deactivation'), class: 'label-light'
+          = f.number_field :deactivate_dormant_users_period, class: 'form-control gl-form-input', min: '90', step: '1'
           .form-text.text-muted
-            = _('Period of inactivity before deactivation.')
+            = _('Must be 90 days or more.')
 
     .form-group
       = f.label :personal_access_token_prefix, _('Personal Access Token prefix'), class: 'label-light'
diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml
index 28836055e0e..9d4c0f62134 100644
--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
@@ -23,23 +23,21 @@
       %p
         = html_escape(_('Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. "By %{link_open}@johnsmith%{link_close}"). It will also associate and/or assign these issues and comments with the selected user.')) % { link_open: '<a href="#">'.html_safe, link_close: '</a>'.html_safe }
 
-  .table-holder
-    %table.table
-      %thead
+  %table.table
+    %thead
+      %tr
+        %th= _("ID")
+        %th= _("Name")
+        %th= _("Email")
+        %th= _("GitLab User")
+    %tbody
+      - @user_map.each do |id, user|
         %tr
-          %th= _("ID")
-          %th= _("Name")
-          %th= _("Email")
-          %th= _("GitLab User")
-      %tbody
-        - @user_map.each do |id, user|
-          %tr
-            %td= id
-            %td= text_field_tag "users[#{id}][name]", user[:name], class: 'form-control'
-            %td= text_field_tag "users[#{id}][email]", user[:email], class: 'form-control'
-            %td
-              = users_select_tag("users[#{id}][gitlab_user]", class: 'custom-form-control',
-                scope: :all, email_user: true, selected: user[:gitlab_user])
+          %td= id
+          %td= text_field_tag "users[#{id}][name]", user[:name], class: 'form-control gl-form-input'
+          %td= text_field_tag "users[#{id}][email]", user[:email], class: 'form-control gl-form-input'
+          %td
+            .js-gitlab-user{ data: { name: "users[#{id}][gitlab_user]" } }
 
   .form-actions
     = submit_tag _('Continue to the next step'), class: 'gl-button btn btn-confirm'
diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml
index 549436ccabf..c95e63bdc83 100644
--- a/app/views/shared/web_hooks/_form.html.haml
+++ b/app/views/shared/web_hooks/_form.html.haml
@@ -1,7 +1,7 @@
 = form_errors(hook)
 
 - if Feature.enabled?(:webhook_form_mask_url)
-  .js-vue-webhook-form
+  .js-vue-webhook-form{ data: webhook_form_data(hook) }
 - else
   .form-group
     = form.label :url, s_('Webhooks|URL'), class: 'label-bold'