Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-02 18:10:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-02 18:10:57 +0300
commit426384d091a0c229ff849ed6ba481bfbe700fb6a (patch)
tree2e1cc21f46ee6235984ae072d391ffb15f4a1d1c /app/views/admin/applications
parent2ce2a08284a698742c24d1b50fab5f77aa5c6321 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/applications')
-rw-r--r--app/views/admin/applications/_form.html.haml4
-rw-r--r--app/views/admin/applications/index.html.haml2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index 14044d6eecb..e7e17502da2 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -40,5 +40,5 @@
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
.form-actions
- = f.submit 'Submit', class: "gl-button btn btn-success wide"
- = link_to "Cancel", admin_applications_path, class: "gl-button btn btn-cancel"
+ = f.submit 'Submit', class: "gl-button btn btn-confirm wide"
+ = link_to "Cancel", admin_applications_path, class: "gl-button btn btn-default btn-cancel"
diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml
index 7ac55157f65..28a7bd1820a 100644
--- a/app/views/admin/applications/index.html.haml
+++ b/app/views/admin/applications/index.html.haml
@@ -4,7 +4,7 @@
%p.light
= _('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'
+%p= link_to _('New application'), new_admin_application_path, class: 'gl-button btn btn-confirm'
.table-responsive
%table.table
%thead