Add latest changes from gitlab-org/gitlab@master

app/views/dashboard/projects/_blank_state_admin_welcome.html.haml

@@ -4,7 +4,7 @@
 
   = link_to new_project_path, class: "blank-state blank-state-link" do
     .blank-state-icon
-      = image_tag("illustrations/welcome/add_new_project")
+      = custom_icon("add_new_project", size: 50)
     .blank-state-body
       %h3.blank-state-title
         Create a project
@@ -14,7 +14,7 @@
   - if current_user.can_create_group?
     = link_to new_group_path, class: "blank-state blank-state-link" do
       .blank-state-icon
-        = image_tag("illustrations/welcome/add_new_group")
+        = custom_icon("add_new_group", size: 50)
       .blank-state-body
         %h3.blank-state-title
           Create a group
@@ -23,7 +23,7 @@
 
     = link_to new_admin_user_path, class: "blank-state blank-state-link" do
       .blank-state-icon
-        = image_tag("illustrations/welcome/add_new_user")
+        = custom_icon("add_new_user", size: 50)
       .blank-state-body
         %h3.blank-state-title
           Add people
@@ -32,7 +32,7 @@
 
   = link_to admin_root_path, class: "blank-state blank-state-link" do
     .blank-state-icon
-      = image_tag("illustrations/welcome/configure_server")
+      = custom_icon("configure_server", size: 50)
     .blank-state-body
       %h3.blank-state-title
         Configure GitLab

app/views/dashboard/projects/_blank_state_welcome.html.haml

@@ -4,7 +4,7 @@
   - if current_user.can_create_project?
     = link_to new_project_path, class: "blank-state blank-state-link" do
       .blank-state-icon
-        = image_tag("illustrations/welcome/add_new_project")
+        = custom_icon("add_new_project", size: 50)
       .blank-state-body
         %h3.blank-state-title
           Create a project
@@ -13,7 +13,7 @@
   - else
     .blank-state
       .blank-state-icon
-        = image_tag("illustrations/welcome/add_new_project")
+        = custom_icon("add_new_project", size: 50)
       .blank-state-body
         %h3.blank-state-title
           Create a project
@@ -23,7 +23,7 @@
   - if current_user.can_create_group?
     = link_to new_group_path, class: "blank-state blank-state-link" do
       .blank-state-icon
-        = image_tag("illustrations/welcome/add_new_group")
+        = custom_icon("add_new_group", size: 50)
       .blank-state-body
         %h3.blank-state-title
           Create a group
@@ -33,7 +33,7 @@
   - if public_project_count > 0
     = link_to trending_explore_projects_path, class: "blank-state blank-state-link" do
       .blank-state-icon
-        = image_tag("illustrations/welcome/globe")
+        = custom_icon("globe", size: 50)
       .blank-state-body
         %h3.blank-state-title
           Explore public projects
@@ -46,7 +46,7 @@
 
   = link_to "https://docs.gitlab.com/", class: "blank-state blank-state-link" do
     .blank-state-icon
-      = image_tag("illustrations/welcome/lightbulb")
+      = custom_icon("lightbulb", size: 50)
     .blank-state-body
       %h3.blank-state-title
         Learn more about GitLab

app/views/projects/mirrors/_authentication_method.html.haml

@@ -3,10 +3,12 @@
 
 .form-group
   = f.label :auth_method, _('Authentication method'), class: 'label-bold'
-  = f.select :auth_method,
+  .select-wrapper
-      options_for_select(auth_options, mirror.auth_method),
+    = f.select :auth_method,
-      {}, { class: "form-control js-mirror-auth-type qa-authentication-method" }
+        options_for_select(auth_options, mirror.auth_method),
-  = f.hidden_field :auth_method, value: "password", class: "js-hidden-mirror-auth-type"
+        {}, { class: "form-control select-control js-mirror-auth-type qa-authentication-method" }
+    = icon('chevron-down')
+    = f.hidden_field :auth_method, value: "password", class: "js-hidden-mirror-auth-type"
 
 .form-group
   .collapse.js-well-changing-auth

app/views/projects/mirrors/_mirror_repos_form.html.haml

@@ -1,5 +1,7 @@
 .form-group
   = label_tag :mirror_direction, _('Mirror direction'), class: 'label-light'
-  = select_tag :mirror_direction, options_for_select([[_('Push'), 'push']]), class: 'form-control js-mirror-direction qa-mirror-direction', disabled: true
+  .select-wrapper
+    = select_tag :mirror_direction, options_for_select([[_('Push'), 'push']]), class: 'form-control select-control js-mirror-direction qa-mirror-direction', disabled: true
+    = icon('chevron-down')
 
 = render partial: "projects/mirrors/mirror_repos_push", locals: { f: f }

changelogs/unreleased/28338-different-dropdown-styles-on-settings-page.yml

@@ -0,0 +1,5 @@
+---
+title: Change selects from default browser style to custom style
+merge_request:
+author:
+type: other

changelogs/unreleased/ph-34768-fixIconsNotLoading.yml

@@ -0,0 +1,5 @@
+---
+title: Fixed welcome screen icons not showing
+merge_request: 19148
+author:
+type: fixed