diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-23 18:12:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-29 12:16:04 +0200 |
| commit | 5f9595bbd5fb4c7eb3fcf505b6666f9967e7795f (patch) | |
| tree | d0b18e1cda7a12d8ef42cdef6ecb1801c518fad0 | |
| parent | 062b806df0ae7eaece4134f6f77c19a3fd9f2f4c (diff) | |
| download | gitlab-ce-5f9595bbd5fb4c7eb3fcf505b6666f9967e7795f.tar.gz | |
Merge branch 'fix-application-settings' into 'master'
Fixed error with applications delete anonymous token form
Closes #14509
See merge request !3362
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/doorkeeper/applications/index.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 29ce82f1c74..682900f9f59 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 8.6.2 - Fix issuable sidebar overlaps on tablet. !3299 - Make dropdowns pixel perfect. !3337 - Fix bold text in issuable sidebar. !3358 + - Fix error with anonymous token in applications settings. !3362 v 8.6.1 - Add option to reload the schema before restoring a database backup. !2807 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 |