Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 21 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 4ab0ec90735..aa377886edc 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -8,20 +8,20 @@
         = f.label :gravatar_enabled, class: 'form-check-label' do
           = _('Gravatar enabled')
     .form-group
-      = f.label :default_projects_limit, class: 'label-bold'
-      = f.number_field :default_projects_limit, class: 'form-control'
+      = f.label :default_projects_limit, _('Default projects limit'), class: 'label-bold'
+      = f.number_field :default_projects_limit, class: 'form-control', title: _('Maximum number of projects.'), data: { toggle: 'tooltip', container: 'body' }
     .form-group
       = f.label :max_attachment_size, _('Maximum attachment size (MB)'), class: 'label-bold'
-      = f.number_field :max_attachment_size, class: 'form-control'
+      = f.number_field :max_attachment_size, class: 'form-control', title: _('Maximum size of individual attachments in comments.'), data: { toggle: 'tooltip', container: 'body' }
 
     = render_if_exists 'admin/application_settings/repository_size_limit_setting', form: f
 
     .form-group
       = f.label :receive_max_input_size, _('Maximum push size (MB)'), class: 'label-light'
-      = f.number_field :receive_max_input_size, class: 'form-control qa-receive-max-input-size-field'
+      = f.number_field :receive_max_input_size, class: 'form-control qa-receive-max-input-size-field', title: _('Maximum size limit for a single commit.'), data: { toggle: 'tooltip', container: 'body' }
     .form-group
       = f.label :session_expire_delay, _('Session duration (minutes)'), class: 'label-light'
-      = f.number_field :session_expire_delay, class: 'form-control'
+      = f.number_field :session_expire_delay, class: 'form-control', title: _('Maximum duration of a session.'), data: { toggle: 'tooltip', container: 'body' }
       %span.form-text.text-muted#session_expire_delay_help_block= _('GitLab restart is required to apply changes.')
 
     = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f
diff --git a/app/views/admin/application_settings/general.html.haml b/app/views/admin/application_settings/general.html.haml
index b9f49fdc9de..94048060767 100644
--- a/app/views/admin/application_settings/general.html.haml
+++ b/app/views/admin/application_settings/general.html.haml
@@ -20,7 +20,7 @@
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Session expiration, projects limit and attachment size.')
+      = _('Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan.')
   .settings-content
     = render 'account_and_limit'
 
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml
index 33b56655206..9577a2a79df 100644
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
@@ -5,15 +5,14 @@
       = render_broadcast_message(@broadcast_message)
     - else
       Your message here
-- if Feature.enabled?(:broadcast_notification_type)
-  .d-flex.justify-content-center
-    .broadcast-notification-message.preview.js-broadcast-notification-message-preview.mt-2{ class: ('hidden' unless @broadcast_message.notification? ) }
-      = sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top')
-      .js-broadcast-message-preview
-        - if @broadcast_message.message.present?
-          = render_broadcast_message(@broadcast_message)
-        - else
-          Your message here
+.d-flex.justify-content-center
+  .broadcast-notification-message.preview.js-broadcast-notification-message-preview.mt-2{ class: ('hidden' unless @broadcast_message.notification? ) }
+    = sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top')
+    .js-broadcast-message-preview
+      - if @broadcast_message.message.present?
+        = render_broadcast_message(@broadcast_message)
+      - else
+        Your message here
 
 = form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form js-quick-submit js-requires-input'} do |f|
   = form_errors(@broadcast_message)
@@ -26,12 +25,11 @@
         required: true,
         dir: 'auto',
         data: { preview_path: preview_admin_broadcast_messages_path }
-  - if Feature.enabled?(:broadcast_notification_type)
-    .form-group.row
-      .col-sm-2.col-form-label
-        = f.label :broadcast_type, _('Type')
-      .col-sm-10
-        = f.select :broadcast_type, broadcast_type_options, {}, class: 'form-control js-broadcast-message-type'
+  .form-group.row
+    .col-sm-2.col-form-label
+      = f.label :broadcast_type, _('Type')
+    .col-sm-10
+      = f.select :broadcast_type, broadcast_type_options, {}, class: 'form-control js-broadcast-message-type'
   .form-group.row.js-broadcast-message-background-color-form-group{ class: ('hidden' unless @broadcast_message.banner? ) }
     .col-sm-2.col-form-label
       = f.label :color, _("Background color")