Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 5 deletions

diff --git a/app/views/projects/mirrors/_authentication_method.html.haml b/app/views/projects/mirrors/_authentication_method.html.haml
index ee82d68d398..a6978cba495 100644
--- a/app/views/projects/mirrors/_authentication_method.html.haml
+++ b/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,
-      options_for_select(auth_options, mirror.auth_method),
-      {}, { class: "form-control js-mirror-auth-type qa-authentication-method" }
-  = f.hidden_field :auth_method, value: "password", class: "js-hidden-mirror-auth-type"
+  .select-wrapper
+    = f.select :auth_method,
+        options_for_select(auth_options, mirror.auth_method),
+        {}, { 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
diff --git a/app/views/projects/mirrors/_mirror_repos_form.html.haml b/app/views/projects/mirrors/_mirror_repos_form.html.haml
index b49f1d9315e..dd794e03f48 100644
--- a/app/views/projects/mirrors/_mirror_repos_form.html.haml
+++ b/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 }