summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-23 18:12:01 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-23 18:12:01 +0000
commit33b1bbba67a097ab90192cb0112284919fc3c8be (patch)
tree3d130167fb3b6f54c901b4e160e3ea14f8a2d6d1 /app
parent0e85a8b816be62b3ef8d854630b015eb4b29398d (diff)
parentc23d9ab4edfd0b9f5d28e81759d48862e3e06b15 (diff)
downloadgitlab-ce-33b1bbba67a097ab90192cb0112284919fc3c8be.tar.gz
Merge branch 'fix-application-settings' into 'master'
Fixed error with applications delete anonymous token form Closes #14509 See merge request !3362
Diffstat (limited to 'app')
-rw-r--r--app/views/doorkeeper/applications/index.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/doorkeeper/applications/index.html.haml b/app/views/doorkeeper/applications/index.html.haml
index ea0b66c932b..55f4a6f287d 100644
--- a/app/views/doorkeeper/applications/index.html.haml
+++ b/app/views/doorkeeper/applications/index.html.haml
@@ -77,7 +77,7 @@
%em Authorization was granted by entering your username and password in the application.
%td= token.created_at
%td= token.scopes
- %td= render 'delete_form', token: token
+ %td= render 'doorkeeper/authorized_applications/delete_form', token: token
- else
.profile-settings-message.text-center
You don't have any authorized applications