summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-03-18 09:58:29 +0000
committerDouwe Maan <douwe@gitlab.com>2019-03-18 09:58:29 +0000
commitf696bacba2e09f4f4ea24b6f63fae0913f24d38a (patch)
treef2a595bad820d40a2ed81dc37eeb79eba098b9fa /app
parent0be9362393d60b19b6cea2c173ea247346001cd3 (diff)
parentd8d5c3af5d83069742c46200de8d130b831068cd (diff)
downloadgitlab-ce-f696bacba2e09f4f4ea24b6f63fae0913f24d38a.tar.gz
Merge branch '43297-authorized-application-count' into 'master'
Fix authorized applications count Closes #43297 See merge request gitlab-org/gitlab-ce!25715
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 1f5c70a6c6e..5d85d9e431f 100644
--- a/app/views/doorkeeper/applications/index.html.haml
+++ b/app/views/doorkeeper/applications/index.html.haml
@@ -52,7 +52,7 @@
.oauth-authorized-applications.prepend-top-20.append-bottom-default
- if user_oauth_applications?
%h5
- = _("Authorized applications (%{size})") % { size: @authorized_tokens.size }
+ = _("Authorized applications (%{size})") % { size: @authorized_apps.size + @authorized_anonymous_tokens.size }
- if @authorized_tokens.any?
.table-responsive