Automatic merge of gitlab-org/gitlab-ce master

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

changelogs/unreleased/43297-authorized-application-count.yml

+---
+title: Fix authorized application count
+merge_request: 25715
+author: moyuru
+type: fixed