Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

3 files changed, 35 insertions, 28 deletions

diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index 0c3a4e73e30..14044d6eecb 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -5,14 +5,14 @@
     .col-sm-2.col-form-label
       = f.label :name
     .col-sm-10
-      = f.text_field :name, class: 'form-control'
+      = f.text_field :name, class: 'form-control gl-form-input'
       = doorkeeper_errors_for application, :name
 
   = content_tag :div, class: 'form-group row' do
     .col-sm-2.col-form-label
       = f.label :redirect_uri
     .col-sm-10
-      = f.text_area :redirect_uri, class: 'form-control'
+      = f.text_area :redirect_uri, class: 'form-control gl-form-input'
       = doorkeeper_errors_for application, :redirect_uri
       %span.form-text.text-muted
         Use one line per URI
@@ -23,7 +23,7 @@
     .col-sm-10
       = f.check_box :trusted
       %span.form-text.text-muted
-        Trusted applications are automatically authorized on GitLab OAuth flow.
+        Trusted applications are automatically authorized on GitLab OAuth flow. It's highly recommended for the security of users that trusted applications have the confidential setting set to true.
 
   = content_tag :div, class: 'form-group row' do
     .col-sm-2.col-form-label.pt-0
diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml
index c1c1c2a4cfe..7ac55157f65 100644
--- a/app/views/admin/applications/index.html.haml
+++ b/app/views/admin/applications/index.html.haml
@@ -1,28 +1,35 @@
 - page_title _("Applications")
 %h3.page-title
-  System OAuth applications
+  = _('System OAuth applications')
 %p.light
-  System OAuth applications don't belong to any user and can only be managed by admins
+  = _('System OAuth applications don\'t belong to any user and can only be managed by admins')
 %hr
-%p= link_to 'New application', new_admin_application_path, class: 'gl-button btn btn-success'
-%table.table
-  %thead
-    %tr
-      %th Name
-      %th Callback URL
-      %th Clients
-      %th Trusted
-      %th Confidential
-      %th
-      %th
-  %tbody.oauth-applications
-    - @applications.each do |application|
-      %tr{ :id => "application_#{application.id}" }
-        %td= link_to application.name, admin_application_path(application)
-        %td= application.redirect_uri
-        %td= @application_counts[application.id].to_i
-        %td= application.trusted? ? 'Y': 'N'
-        %td= application.confidential? ? 'Y': 'N'
-        %td= link_to 'Edit', edit_admin_application_path(application), class: 'gl-button btn btn-link'
-        %td= render 'delete_form', application: application
+%p= link_to _('New application'), new_admin_application_path, class: 'gl-button btn btn-success'
+.table-responsive
+  %table.table
+    %thead
+      %tr
+        %th
+          = _('Name')
+        %th
+          = _('Callback URL')
+        %th
+          = _('Clients')
+        %th
+          = _('Trusted')
+        %th
+          = _('Confidential')
+        %th
+        %th
+    %tbody.oauth-applications
+      - @applications.each do |application|
+        %tr{ :id => "application_#{application.id}" }
+          %td= link_to application.name, admin_application_path(application)
+          %td= application.redirect_uri
+          %td= @application_counts[application.id].to_i
+          %td= application.trusted? ? _('Yes'): _('No')
+          %td= application.confidential? ? _('Yes'): _('No')
+          %td= link_to 'Edit', edit_admin_application_path(application), class: 'gl-button btn btn-link'
+          %td= render 'delete_form', application: application
+
 = paginate @applications, theme: 'gitlab'
diff --git a/app/views/admin/applications/show.html.haml b/app/views/admin/applications/show.html.haml
index f029da6b3af..8d643a7a4bc 100644
--- a/app/views/admin/applications/show.html.haml
+++ b/app/views/admin/applications/show.html.haml
@@ -45,5 +45,5 @@
     = render "shared/tokens/scopes_list", token: @application
 
 .form-actions
-  = link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-primary wide float-left'
-  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3'
+  = link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-confirm wide float-left'
+  = render 'delete_form', application: @application, submit_btn_css: 'gl-button btn btn-danger gl-ml-3'