From dfc94207fec2d84314b1a5410cface22e8b369bd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Apr 2023 11:43:17 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-11-stable-ee --- app/views/admin/applications/_form.html.haml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'app/views/admin/applications/_form.html.haml') diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml index 83347034cc5..a8d5a45041d 100644 --- a/app/views/admin/applications/_form.html.haml +++ b/app/views/admin/applications/_form.html.haml @@ -2,39 +2,34 @@ = form_errors(application) = content_tag :div, class: 'form-group row' do - .col-sm-2.col-form-label + .col-12 = f.label :name - .col-sm-10 - = f.text_field :name, class: 'form-control gl-form-input' + = f.text_field :name, class: 'form-control gl-form-input', data: { qa_selector: 'name_field' } = doorkeeper_errors_for application, :name = content_tag :div, class: 'form-group row' do - .col-sm-2.col-form-label + .col-12 = f.label :redirect_uri - .col-sm-10 - = f.text_area :redirect_uri, class: 'form-control gl-form-input' + = f.text_area :redirect_uri, class: 'form-control gl-form-input', data: { qa_selector: 'redirect_uri_field' } = doorkeeper_errors_for application, :redirect_uri %span.form-text.text-muted Use one line per URI = content_tag :div, class: 'form-group row' do - .col-sm-2.col-form-label.pt-0 + .col-12 = f.label :trusted - .col-sm-10 - = f.gitlab_ui_checkbox_component :trusted, _('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.') + = f.gitlab_ui_checkbox_component :trusted, _('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.'), checkbox_options: { data: { qa_selector: 'trusted_checkbox' } } = content_tag :div, class: 'form-group row' do - .col-sm-2.col-form-label.pt-0 + .col-12 = f.label :confidential - .col-sm-10 = f.gitlab_ui_checkbox_component :confidential, _('The application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.') .form-group.row - .col-sm-2.col-form-label.pt-0 + .col-12 = f.label :scopes - .col-sm-10 = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes, f: f - .form-actions - = f.submit _('Save application'), pajamas_button: true + .gl-mt-5 + = f.submit _('Save application'), pajamas_button: true, data: { qa_selector: 'save_application_button' } = link_to _('Cancel'), admin_applications_path, class: "gl-button btn btn-default btn-cancel" -- cgit v1.2.3