Add latest changes from gitlab-org/gitlab@master

2 files changed, 42 insertions, 9 deletions

diff --git a/app/views/admin/application_settings/appearances/_form.html.haml b/app/views/admin/application_settings/appearances/_form.html.haml
index c20a86b9f9c..6c6334905ca 100644
--- a/app/views/admin/application_settings/appearances/_form.html.haml
+++ b/app/views/admin/application_settings/appearances/_form.html.haml
@@ -10,7 +10,7 @@
 
     .col-lg-8
       .form-group
-        = f.label :header_logo, _('Header logo'), class: 'col-form-label label-bold pt-0'
+        = f.label :header_logo, _('Header logo'), class: 'col-form-label  gl-pt-0'
         %p
           - if @appearance.header_logo?
             = image_tag @appearance.header_logo_path, class: 'appearance-light-logo-preview'
@@ -29,7 +29,7 @@
 
     .col-lg-8
       .form-group
-        = f.label :favicon, _('Favicon'), class: 'col-form-label label-bold pt-0'
+        = f.label :favicon, _('Favicon'), class: 'col-form-label  gl-pt-0'
         %p
           - if @appearance.favicon?
             = image_tag @appearance.favicon_path, class: 'appearance-light-logo-preview'
@@ -53,15 +53,15 @@
 
     .col-lg-8
       .form-group
-        = f.label :title, class: 'col-form-label label-bold'
+        = f.label :title, class: 'col-form-label'
         = f.text_field :title, class: "form-control gl-form-input"
       .form-group
-        = f.label :description, class: 'col-form-label label-bold'
+        = f.label :description, class: 'col-form-label'
         = f.text_area :description, class: "form-control gl-form-input", rows: 10
         .form-text.text-muted
           = parsed_with_gfm
       .form-group
-        = f.label :logo, class: 'col-form-label label-bold pt-0'
+        = f.label :logo, class: 'col-form-label  gl-pt-0'
         %p
           - if @appearance.logo?
             = image_tag @appearance.logo_path, class: 'appearance-logo-preview'
@@ -77,11 +77,42 @@
   %hr
   .row
     .col-lg-4.profile-settings-sidebar
+      %h4.gl-mt-0= _('Progressive Web App (PWA)')
+
+    .col-lg-8
+      .form-group
+        = f.label _("Name"), class: 'col-form-label'
+        = f.text_field :pwa_name, class: "form-control gl-form-input"
+      .form-group
+        = f.label _("Short name"), class: 'col-form-label'
+        = f.text_field :pwa_short_name, class: "form-control gl-form-input"
+      .form-group
+        = f.label _("Description"), class: 'col-form-label'
+        = f.text_area :pwa_description, class: "form-control gl-form-input", rows: 10
+        .form-text.text-muted
+          = parsed_with_gfm
+      .form-group
+        = f.label :pwa_icon, class: 'col-form-label  gl-pt-0'
+        %p
+          - if @appearance.pwa_icon?
+            = image_tag @appearance.pwa_icon_path, class: 'appearance-pwa-icon-preview'
+            - if @appearance.persisted?
+              %br
+              = link_to _('Remove icon'), pwa_icon_admin_application_settings_appearances_path, data: { confirm: _("Icon will be removed. Are you sure?"), confirm_btn_variant: "danger" }, aria: { label: _('Remove icon') }, method: :delete, class: "btn gl-button btn-danger btn-danger-secondary btn-sm remove-logo"
+            %hr
+          = f.hidden_field :pwa_icon_cache
+          = f.file_field :pwa_icon, class: "", accept: 'image/*'
+          .form-text.text-muted
+            = _('Maximum file size is 1MB.')
+
+  %hr
+  .row
+    .col-lg-4.profile-settings-sidebar
       %h4.gl-mt-0= _('New project pages')
 
     .col-lg-8
       .form-group
-        = f.label :new_project_guidelines, class: 'col-form-label label-bold'
+        = f.label :new_project_guidelines, class: 'col-form-label'
         %p
           = f.text_area :new_project_guidelines, class: "form-control gl-form-input", rows: 10
           .form-text.text-muted
@@ -94,7 +125,7 @@
 
     .col-lg-8
       .form-group
-        = f.label :profile_image_guidelines, class: 'col-form-label label-bold'
+        = f.label :profile_image_guidelines, class: 'col-form-label'
         %p
           = f.text_area :profile_image_guidelines, class: "form-control gl-form-input", rows: 10
           .form-text.text-muted
diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml
index ec83782985b..53a1abdff33 100644
--- a/app/views/projects/_new_project_fields.html.haml
+++ b/app/views/projects/_new_project_fields.html.haml
@@ -6,11 +6,13 @@
 
 .row{ id: project_name_id }
   = f.hidden_field :ci_cd_only, value: ci_cd_only
-  .form-group.project-name.col-sm-12
+  .form-group.gl-form-group.project-name.col-sm-12
     = f.label :name, class: 'label-bold' do
       %span= _("Project name")
     = f.text_field :name, placeholder: "My awesome project", class: "form-control gl-form-input input-lg", data: { qa_selector: 'project_name', track_label: "#{track_label}", track_action: "activate_form_input", track_property: "project_name", track_value: "" }, required: true, aria: { required: true }
-    #project_name_error.gl-field-error.hidden
+    %small#js-project-name-description.form-text.text-gl-muted
+      = s_("ProjectsNew|Must start with a lowercase or uppercase letter, digit, emoji, or underscore. Can also contain dots, pluses, dashes, or spaces.")
+    #js-project-name-error.gl-field-error.gl-mt-2.gl-display-none
   .form-group.project-path.col-sm-6.gl-pr-0
     = f.label :namespace_id, class: 'label-bold' do
       %span= _('Project URL')